Commit: 3ea11c1ac8e7e30f986e23f5641ff043ecb6c62e
Author: Bastien Montagne
Date: Thu Oct 30 09:34:17 2014 +0100
Branches: master
https://developer.blender.org/rB3ea11c1ac8e7e30f986e23f5641ff043ecb6c62e
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.
===================================================================
M source/blender/render/intern/source/convertblender.c
===================================================================
diff --git a/source/blender/render/intern/source/convertblender.c
b/source/blender/render/intern/source/convertblender.c
index 69dd960..ef14782 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 {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
