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/editors/animation | |
| parent | 0b5a995cfdca70c844186a3af9b2a01fed5e5d3f (diff) | |
code cleanup: rename G.afbreek --> is_break, G.rendering --> is_rendering
Diffstat (limited to 'source/blender/editors/animation')
| -rw-r--r-- | source/blender/editors/animation/anim_draw.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/animation/anim_ops.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/animation/anim_draw.c b/source/blender/editors/animation/anim_draw.c index 9c9d7f8e34a..620f5de9db7 100644 --- a/source/blender/editors/animation/anim_draw.c +++ b/source/blender/editors/animation/anim_draw.c @@ -283,7 +283,7 @@ AnimData *ANIM_nla_mapping_get(bAnimContext *ac, bAnimListElem *ale) return NULL; /* abort if rendering - we may get some race condition issues... */ - if (G.rendering) return NULL; + if (G.is_rendering) return NULL; /* handling depends on the type of animation-context we've got */ if (ale) @@ -422,7 +422,7 @@ void ANIM_unit_mapping_apply_fcurve(Scene *scene, ID *id, FCurve *fcu, short fla float fac; /* abort if rendering - we may get some race condition issues... */ - if (G.rendering) return; + if (G.is_rendering) return; /* calculate mapping factor, and abort if nothing to change */ fac = ANIM_unit_mapping_get_factor(scene, id, fcu, (flag & ANIM_UNITCONV_RESTORE)); diff --git a/source/blender/editors/animation/anim_ops.c b/source/blender/editors/animation/anim_ops.c index 13741a99d99..1ab6247728a 100644 --- a/source/blender/editors/animation/anim_ops.c +++ b/source/blender/editors/animation/anim_ops.c @@ -65,7 +65,7 @@ static int change_frame_poll(bContext *C) ScrArea *curarea = CTX_wm_area(C); /* XXX temp? prevent changes during render */ - if (G.rendering) return 0; + if (G.is_rendering) return 0; /* as long as there is an active area, and it isn't a Graph Editor * (since the Graph Editor has its own version which does extra stuff), |