diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-10 20:02:46 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-10 20:02:46 +0400 |
commit | 7d110c2923c1dcd458c1a772b486c3c17caa5e65 (patch) | |
tree | 144ccdd6b7fcd8c8b8850683ea77fee0b47211d4 /intern | |
parent | 9dcf4bf0a6887b625678311a0c3b72ab6a7d311c (diff) |
Cycles: fix missing particle panels and show emitter option not being respected.
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/blender/addon/ui.py | 17 | ||||
-rw-r--r-- | intern/cycles/blender/blender_object.cpp | 11 |
2 files changed, 26 insertions, 2 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index 01b358869ec..7c7d4c81b89 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -735,7 +735,22 @@ def get_panels(): bpy.types.TEXTURE_PT_distortednoise, bpy.types.TEXTURE_PT_voxeldata, bpy.types.TEXTURE_PT_pointdensity, - bpy.types.TEXTURE_PT_pointdensity_turbulence] + bpy.types.TEXTURE_PT_pointdensity_turbulence, + bpy.types.PARTICLE_PT_context_particles, + bpy.types.PARTICLE_PT_emission, + bpy.types.PARTICLE_PT_hair_dynamics, + bpy.types.PARTICLE_PT_cache, + bpy.types.PARTICLE_PT_velocity, + bpy.types.PARTICLE_PT_rotation, + bpy.types.PARTICLE_PT_physics, + bpy.types.PARTICLE_PT_boidbrain, + bpy.types.PARTICLE_PT_render, + bpy.types.PARTICLE_PT_draw, + bpy.types.PARTICLE_PT_children, + bpy.types.PARTICLE_PT_field_weights, + bpy.types.PARTICLE_PT_force_fields, + bpy.types.PARTICLE_PT_vertexgroups, + bpy.types.PARTICLE_PT_custom_props] def register(): bpy.types.RENDER_PT_render.append(draw_device) diff --git a/intern/cycles/blender/blender_object.cpp b/intern/cycles/blender/blender_object.cpp index 1095a3ee026..0edac820e94 100644 --- a/intern/cycles/blender/blender_object.cpp +++ b/intern/cycles/blender/blender_object.cpp @@ -229,8 +229,17 @@ void BlenderSync::sync_objects(BL::SpaceView3D b_v3d) } object_free_duplilist(*b_ob); + + /* check if we should render duplicator */ + hide = true; + BL::Object::particle_systems_iterator b_psys; + + for(b_ob->particle_systems.begin(b_psys); b_psys != b_ob->particle_systems.end(); ++b_psys) + if(b_psys->settings().use_render_emitter()) + hide = false; } - else { + + if(!hide) { /* object itself */ Transform tfm = get_transform(b_ob->matrix_world()); sync_object(*b_ob, 0, *b_ob, tfm, visibility); |