diff options
| author | Thomas Dinges <blender@dingto.org> | 2014-08-06 02:45:13 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2014-08-06 02:45:13 +0400 |
| commit | c689a2ea8c016d3dffda73fc5916ad2717ffc2e1 (patch) | |
| tree | b76bacbe6f109671415e1744abb9dadb929a56b1 /source/blender/editors/space_view3d/drawobject.c | |
| parent | 2c331302773bfbd725c1a9a102b7e637a46a2a2f (diff) | |
| parent | 4cf531f7a05434a9bbd6144a7ec0314e60aaff40 (diff) | |
Merge remote-tracking branch 'origin/master' into soc-2014-cyclessoc-2014-cycles
Diffstat (limited to 'source/blender/editors/space_view3d/drawobject.c')
| -rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 8d39632e210..13e010d2f97 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; } } |