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

Fix #29695: cycles particle emitter not being properly hidden.

Browse Source
This commit is contained in:
Brecht Van Lommel 2012-01-02 19:44:13 +00:00
parent 1e96b5f284
commit 84437bb5e9
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -234,13 +234,20 @@ 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; 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) /* check if we should render or hide particle emitter */
if(b_psys->settings().use_render_emitter()) BL::Object::particle_systems_iterator b_psys;
bool render_emitter = false;
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; hide = false;
render_emitter = true;
}
else if(!render_emitter)
hide = true;
} }
if(!hide) { if(!hide) {