kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cycles: fix missing particle panels and show emitter option not being respected.

Browse Source
This commit is contained in:
Brecht Van Lommel 2011-11-10 16:02:46 +00:00
parent 9dcf4bf0a6
commit 7d110c2923
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
intern/cycles/blender/addon/ui.py
View File

@ -735,7 +735,22 @@ def get_panels():
bpy.types.TEXTURE_PT_distortednoise, bpy.types.TEXTURE_PT_distortednoise,
bpy.types.TEXTURE_PT_voxeldata, bpy.types.TEXTURE_PT_voxeldata,
bpy.types.TEXTURE_PT_pointdensity, 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(): def register():
bpy.types.RENDER_PT_render.append(draw_device) bpy.types.RENDER_PT_render.append(draw_device)

11
intern/cycles/blender/blender_object.cpp
View File

@ -229,8 +229,17 @@ void BlenderSync::sync_objects(BL::SpaceView3D b_v3d)
} }
object_free_duplilist(*b_ob); 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 */ /* object itself */
Transform tfm = get_transform(b_ob->matrix_world()); Transform tfm = get_transform(b_ob->matrix_world());
sync_object(*b_ob, 0, *b_ob, tfm, visibility); sync_object(*b_ob, 0, *b_ob, tfm, visibility);