[Bf-blender-cvs] [e6957bc] master: Correct change to dupli-drawing

[Campbell Barton]

Commit: e6957bc1d4d70215ab10e9358d83e6d59e8dd652
Author: Campbell Barton
Date:   Wed Aug 6 04:56:18 2014 +1000
Branches: master
https://developer.blender.org/rBe6957bc1d4d70215ab10e9358d83e6d59e8dd652

Correct change to dupli-drawing

Need exceptions so dupli-frames objects draw in render-only mode.

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

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 8d39632..13e010d 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -7183,7 +7183,7 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, const short
 			if (ob->restrictflag & OB_RESTRICT_RENDER)
 				return;
 			
-			if (!has_particles && (ob->transflag & OB_DUPLI))
+			if (!has_particles && (ob->transflag & (OB_DUPLI & ~OB_DUPLIFRAMES)))
 				return;
 		}
 	}