[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41741] trunk/blender/intern/cycles/ blender: Cycles: fix missing particle panels and show emitter option not being respected.
Brecht Van Lommel
brechtvanlommel at pandora.be
Thu Nov 10 17:02:47 CET 2011
Revision: 41741
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41741
Author: blendix
Date: 2011-11-10 16:02:46 +0000 (Thu, 10 Nov 2011)
Log Message:
-----------
Cycles: fix missing particle panels and show emitter option not being respected.
Modified Paths:
--------------
trunk/blender/intern/cycles/blender/addon/ui.py
trunk/blender/intern/cycles/blender/blender_object.cpp
Modified: trunk/blender/intern/cycles/blender/addon/ui.py
===================================================================
--- trunk/blender/intern/cycles/blender/addon/ui.py 2011-11-10 15:40:36 UTC (rev 41740)
+++ trunk/blender/intern/cycles/blender/addon/ui.py 2011-11-10 16:02:46 UTC (rev 41741)
@@ -735,7 +735,22 @@
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)
Modified: trunk/blender/intern/cycles/blender/blender_object.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_object.cpp 2011-11-10 15:40:36 UTC (rev 41740)
+++ trunk/blender/intern/cycles/blender/blender_object.cpp 2011-11-10 16:02:46 UTC (rev 41741)
@@ -229,8 +229,17 @@
}
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);
More information about the Bf-blender-cvs
mailing list