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/physics | |
| parent | 0b5a995cfdca70c844186a3af9b2a01fed5e5d3f (diff) | |
code cleanup: rename G.afbreek --> is_break, G.rendering --> is_rendering
Diffstat (limited to 'source/blender/editors/physics')
| -rw-r--r-- | source/blender/editors/physics/dynamicpaint_ops.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/physics/physics_fluid.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/physics/physics_pointcache.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/physics/dynamicpaint_ops.c b/source/blender/editors/physics/dynamicpaint_ops.c index ea8718f0e66..bc09df734a6 100644 --- a/source/blender/editors/physics/dynamicpaint_ops.c +++ b/source/blender/editors/physics/dynamicpaint_ops.c @@ -369,7 +369,7 @@ static int dynamicPaint_initBake(struct bContext *C, struct wmOperator *op) /* Set state to baking and init surface */ canvas->error[0] = '\0'; canvas->flags |= MOD_DPAINT_BAKING; - G.afbreek= 0; /* reset blender_test_break*/ + G.is_break = FALSE; /* reset blender_test_break*/ /* Bake Dynamic Paint */ status = dynamicPaint_bakeImageSequence(C, surface, ob); diff --git a/source/blender/editors/physics/physics_fluid.c b/source/blender/editors/physics/physics_fluid.c index dc2f70189e7..1c4a4314d45 100644 --- a/source/blender/editors/physics/physics_fluid.c +++ b/source/blender/editors/physics/physics_fluid.c @@ -745,7 +745,7 @@ static int fluidbake_breakjob(void *customdata) /* this is not nice yet, need to make the jobs list template better * for identifying/acting upon various different jobs */ /* but for now we'll reuse the render break... */ - return (G.afbreek); + return (G.is_break); } /* called by fluidbake, wmJob sends notifier */ @@ -765,7 +765,7 @@ static void fluidbake_startjob(void *customdata, short *stop, short *do_update, fb->do_update = do_update; fb->progress = progress; - G.afbreek= 0; /* XXX shared with render - replace with job 'stop' switch */ + G.is_break = FALSE; /* XXX shared with render - replace with job 'stop' switch */ elbeemSimulate(); *do_update = TRUE; diff --git a/source/blender/editors/physics/physics_pointcache.c b/source/blender/editors/physics/physics_pointcache.c index c935cb7da82..6e772f66a6a 100644 --- a/source/blender/editors/physics/physics_pointcache.c +++ b/source/blender/editors/physics/physics_pointcache.c @@ -61,7 +61,7 @@ static int cache_break_test(void *UNUSED(cbd)) { - return G.afbreek==1; + return (G.is_break == TRUE); } static int ptcache_bake_all_poll(bContext *C) { |