[Bf-blender-cvs] [e7ac87a] master: Fix T37869: vertex paint + wireframe draw mode + smoke domain did not draw correct.

[Brecht Van Lommel]

Commit: e7ac87a254fcd4f893a31cd2622ebdaad8e2a8b0
Author: Brecht Van Lommel
Date:   Thu Dec 19 18:52:26 2013 +0100
http://developer.blender.org/rBe7ac87a254fcd4f893a31cd2622ebdaad8e2a8b0

Fix T37869: vertex paint + wireframe draw mode + smoke domain did not draw correct.

===================================================================

M	source/blender/editors/space_view3d/drawvolume.c
M	source/blender/modifiers/intern/MOD_smoke.c

===================================================================

diff --git a/source/blender/editors/space_view3d/drawvolume.c b/source/blender/editors/space_view3d/drawvolume.c
index 6ee1df4..6ce38e6 100644
--- a/source/blender/editors/space_view3d/drawvolume.c
+++ b/source/blender/editors/space_view3d/drawvolume.c
@@ -535,8 +535,9 @@ void draw_smoke_volume(SmokeDomainSettings *sds, Object *ob,
 
 	if (gl_depth) {
 		glEnable(GL_DEPTH_TEST);
-		glDepthMask(GL_TRUE);
 	}
+
+	glDepthMask(GL_TRUE);
 }
 
 #ifdef SMOKE_DEBUG_VELOCITY
diff --git a/source/blender/modifiers/intern/MOD_smoke.c b/source/blender/modifiers/intern/MOD_smoke.c
index 0fff0b3..22a4c87 100644
--- a/source/blender/modifiers/intern/MOD_smoke.c
+++ b/source/blender/modifiers/intern/MOD_smoke.c
@@ -105,7 +105,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
 {
 	SmokeModifierData *smd = (SmokeModifierData *) md;
 
-	if(flag & MOD_APPLY_ORCO)
+	if (flag & MOD_APPLY_ORCO)
 		return dm;
 
 	return smokeModifier_do(smd, md->scene, ob, dm);