diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2014-10-30 11:34:17 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2014-10-30 11:34:17 +0300 |
commit | 3ea11c1ac8e7e30f986e23f5641ff043ecb6c62e (patch) | |
tree | fc6d8199ffa4a7c1e60def384100ae7a79e210b1 /source/blender/render | |
parent | beaed66f292dda7bebff2aa99193791d58c019cc (diff) |
Fix T42441: Smoke doesn't render in 3DView if domain object's maximum draw type is set to "wire"
Added an exception in convertblender.c's is_object_hidden(), so that an object with active
smoke modifier is never considered hidden.
Diffstat (limited to 'source/blender/render')
-rw-r--r-- | source/blender/render/intern/source/convertblender.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index 69dd9607c3b..ef1478235d8 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -3917,7 +3917,15 @@ static bool is_object_hidden(Render *re, Object *ob) if (re->r.scemode & R_VIEWPORT_PREVIEW) { /* Mesh deform cages and so on mess up the preview. To avoid the problem, * viewport doesn't show mesh object if its draw type is bounding box or wireframe. + * Unless it's an active smoke domain! */ + ModifierData *md = NULL; + + if ((md = modifiers_findByType(ob, eModifierType_Smoke)) && + (modifier_isEnabled(re->scene, md, eModifierMode_Realtime))) + { + return false; + } return ELEM(ob->dt, OB_BOUNDBOX, OB_WIRE); } else { |