diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2013-12-19 21:52:26 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2013-12-19 21:52:26 +0400 |
| commit | e7ac87a254fcd4f893a31cd2622ebdaad8e2a8b0 (patch) | |
| tree | 0d3701768760b6c71f6a0620ba2e7b3da9fc065d | |
| parent | 19c0c7992a890590914809ac47179c61ce956abd (diff) | |
Fix T37869: vertex paint + wireframe draw mode + smoke domain did not draw correct.
| -rw-r--r-- | source/blender/editors/space_view3d/drawvolume.c | 3 | ||||
| -rw-r--r-- | source/blender/modifiers/intern/MOD_smoke.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/editors/space_view3d/drawvolume.c b/source/blender/editors/space_view3d/drawvolume.c index 6ee1df4e131..6ce38e661a2 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 0fff0b3c67b..22a4c8753d8 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); |