diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-08-08 22:37:06 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-08-08 22:37:06 +0400 |
| commit | f0951f58ca2ffb1a7574beaac3217d3729e706c0 (patch) | |
| tree | 083fa0fec7f5acc563902584b8c3c015f852bbcb /source/blender/blenkernel/intern/object.c | |
| parent | 0b5a995cfdca70c844186a3af9b2a01fed5e5d3f (diff) | |
code cleanup: rename G.afbreek --> is_break, G.rendering --> is_rendering
Diffstat (limited to 'source/blender/blenkernel/intern/object.c')
| -rw-r--r-- | source/blender/blenkernel/intern/object.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index baf216b95e9..4f4ee3f8433 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -2643,7 +2643,7 @@ void BKE_object_handle_update(Scene *scene, Object *ob) while (psys) { if (psys_check_enabled(ob, psys)) { /* check use of dupli objects here */ - if (psys->part && (psys->part->draw_as == PART_DRAW_REND || G.rendering) && + if (psys->part && (psys->part->draw_as == PART_DRAW_REND || G.is_rendering) && ((psys->part->ren_as == PART_DRAW_OB && psys->part->dup_ob) || (psys->part->ren_as == PART_DRAW_GR && psys->part->dup_group))) { @@ -2663,7 +2663,7 @@ void BKE_object_handle_update(Scene *scene, Object *ob) psys = psys->next; } - if (G.rendering && ob->transflag & OB_DUPLIPARTS) { + if (G.is_rendering && ob->transflag & OB_DUPLIPARTS) { /* this is to make sure we get render level duplis in groups: * the derivedmesh must be created before init_render_mesh, * since object_duplilist does dupliparticles before that */ |