[Bf-blender-cvs] [04c2e5d] master: Fix T40543: Duplicators draw with 'Render Only'

[Campbell Barton]

Commit: 04c2e5d5931976a7029b4dcc8d8e745a0cb8d85a
Author: Campbell Barton
Date:   Mon Jun 9 15:55:18 2014 +1000
https://developer.blender.org/rB04c2e5d5931976a7029b4dcc8d8e745a0cb8d85a

Fix T40543: Duplicators draw with 'Render Only'

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

M       source/blender/editors/space_view3d/drawobject.c

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

diff --git a/source/blender/editors/space_view3d/drawobject.c 
b/source/blender/editors/space_view3d/drawobject.c
index 2f3c416..0510ecd 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -6924,7 +6924,9 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, 
Base *base, const short
                if (ob->restrictflag & OB_RESTRICT_VIEW) {
                        return;
                }
-               else if ((ob->restrictflag & OB_RESTRICT_RENDER) && 
render_override) {
+               else if (render_override && ((ob->restrictflag & 
OB_RESTRICT_RENDER) ||
+                                            (ob->transflag & OB_DUPLI)))
+               {
                        return;
                }
        }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs