From e517e75d0984b16f94c03bd90869032aa3925447 Mon Sep 17 00:00:00 2001 From: scrawl Date: Sat, 7 Jul 2012 01:25:14 +0200 Subject: [PATCH] update --- components/nifogre/ogre_nif_loader.cpp | 2 +- extern/shiny | 2 +- files/materials/objects.mat | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/components/nifogre/ogre_nif_loader.cpp b/components/nifogre/ogre_nif_loader.cpp index 76562256f9..d12a781142 100644 --- a/components/nifogre/ogre_nif_loader.cpp +++ b/components/nifogre/ogre_nif_loader.cpp @@ -270,7 +270,7 @@ void NIFLoader::createMaterial(const String &name, { // Enable transparency instance->setProperty("scene_blend", sh::makeProperty(new sh::StringValue("alpha_blend"))); - instance->setProperty("depth_write", sh::makeProperty(new sh::BooleanValue(false))); + instance->setProperty("depth_write", sh::makeProperty(new sh::StringValue("off"))); } } else diff --git a/extern/shiny b/extern/shiny index 1d689a23fa..88a192a67d 160000 --- a/extern/shiny +++ b/extern/shiny @@ -1 +1 @@ -Subproject commit 1d689a23fa685ab680351219c32953a3bed7ac0c +Subproject commit 88a192a67d7dff636be4540be4a8654ad33f106a diff --git a/files/materials/objects.mat b/files/materials/objects.mat index 6dfe9db7cb..58c9a17bc4 100644 --- a/files/materials/objects.mat +++ b/files/materials/objects.mat @@ -12,6 +12,7 @@ material openmw_objects_base is_transparent false // real transparency, alpha rejection doesn't count here scene_blend default + depth_write default alpha_rejection default pass @@ -34,6 +35,7 @@ material openmw_objects_base emissive $emissive scene_blend $scene_blend alpha_rejection $alpha_rejection + depth_write $depth_write ffp_vertex_colour_ambient $has_vertex_colour