diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-11-28 01:47:55 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-11-28 01:47:55 +0400 |
| commit | f4c93ae9355be8f5e1b2dbdc5fda0f3bce71d67d (patch) | |
| tree | 895ca441e58709cd64205b0b046efd42c16e2beb /intern/cycles/blender | |
| parent | 390ddd910309ad8274b43439aaaacf7ebbf6b52a (diff) | |
Fix #33328: cycles not rendering dupliframes, needs an exception.
Diffstat (limited to 'intern/cycles/blender')
| -rw-r--r-- | intern/cycles/blender/blender_object.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/intern/cycles/blender/blender_object.cpp b/intern/cycles/blender/blender_object.cpp index e8fa5c0ff3d..95263ebe463 100644 --- a/intern/cycles/blender/blender_object.cpp +++ b/intern/cycles/blender/blender_object.cpp @@ -360,8 +360,9 @@ void BlenderSync::sync_objects(BL::SpaceView3D b_v3d, int motion) bool emitter_hide = false; if(b_dup_ob.is_duplicator()) { - /* duplicators hidden by default */ - emitter_hide = true; + /* duplicators hidden by default, except dupliframes which duplicate self */ + if(b_dup_ob.dupli_type() != BL::Object::dupli_type_FRAMES) + emitter_hide = true; /* check if we should render or hide particle emitter */ BL::Object::particle_systems_iterator b_psys; |