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 | |
parent | 0b5a995cfdca70c844186a3af9b2a01fed5e5d3f (diff) |
code cleanup: rename G.afbreek --> is_break, G.rendering --> is_rendering
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_global.h | 11 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/anim.c | 18 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/blender.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/curve.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/displist.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/image.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/mball.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/object.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/particle.c | 8 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/particle_system.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/pointcache.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/sequencer.c | 10 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/writeframeserver.c | 2 |
13 files changed, 37 insertions, 32 deletions
diff --git a/source/blender/blenkernel/BKE_global.h b/source/blender/blenkernel/BKE_global.h index f71f82eca17..2656495a918 100644 --- a/source/blender/blenkernel/BKE_global.h +++ b/source/blender/blenkernel/BKE_global.h @@ -61,11 +61,16 @@ typedef struct Global { /* strings of recent opened files */ struct ListBase recent_files; - short afbreek, moving, file_loaded; + /* has escape been pressed or Ctrl+C pressed in background mode, used for render quit */ + short is_break; + + short moving, file_loaded; char background; char factory_startup; short winpos, displaymode; /* used to be in Render */ - short rendering; /* to indicate render is busy, prevent renderwindow events etc */ + + /* to indicate render is busy, prevent renderwindow events etc */ + short is_rendering; /* debug value, can be set from the UI and python, used for testing nonstandard features */ short debug_value; @@ -129,7 +134,7 @@ enum { G_DEBUG_JOBS = (1 << 5) /* jobs time profiling */ }; -#define G_DEBUG_ALL (G_DEBUG | G_DEBUG_FFMPEG | G_DEBUG_PYTHON | G_DEBUG_EVENTS | G_DEBUG_WM) +#define G_DEBUG_ALL (G_DEBUG | G_DEBUG_FFMPEG | G_DEBUG_PYTHON | G_DEBUG_EVENTS | G_DEBUG_WM | G_DEBUG_JOBS) /* G.fileflags */ diff --git a/source/blender/blenkernel/intern/anim.c b/source/blender/blenkernel/intern/anim.c index a52e37d5034..111ac68b345 100644 --- a/source/blender/blenkernel/intern/anim.c +++ b/source/blender/blenkernel/intern/anim.c @@ -755,8 +755,8 @@ static void group_duplilist(ListBase *lb, Scene *scene, Object *ob, int par_inde /* check the group instance and object layers match, also that the object visible flags are ok. */ if ((dob->origlay & group->layer) == 0 || - (G.rendering == 0 && dob->ob->restrictflag & OB_RESTRICT_VIEW) || - (G.rendering && dob->ob->restrictflag & OB_RESTRICT_RENDER)) + ((G.is_rendering == FALSE) && dob->ob->restrictflag & OB_RESTRICT_VIEW) || + ((G.is_rendering == TRUE) && dob->ob->restrictflag & OB_RESTRICT_RENDER)) { dob->no_draw = TRUE; } @@ -934,7 +934,7 @@ static void vertex_duplilist(ListBase *lb, ID *id, Scene *scene, Object *par, fl else dm = mesh_get_derived_deform(scene, par, CD_MASK_BAREMESH); - if (G.rendering) { + if (G.is_rendering) { vdd.orco = (float(*)[3])BKE_mesh_orco_verts_get(par); BKE_mesh_orco_verts_transform(me, vdd.orco, me->totvert, 0); } @@ -1066,7 +1066,7 @@ static void face_duplilist(ListBase *lb, ID *id, Scene *scene, Object *par, floa mloop = dm->getLoopArray(dm); mvert = dm->getVertArray(dm); - if (G.rendering) { + if (G.is_rendering) { orco = (float(*)[3])BKE_mesh_orco_verts_get(par); BKE_mesh_orco_verts_transform(me, orco, me->totvert, 0); @@ -1177,7 +1177,7 @@ static void face_duplilist(ListBase *lb, ID *id, Scene *scene, Object *par, floa mul_m4_m4m3(obmat, tmat, mat); dob = new_dupli_object(lb, ob, obmat, par->lay, a, par_index, OB_DUPLIFACES, animated); - if (G.rendering) { + if (G.is_rendering) { w = 1.0f / (float)mp->totloop; if (orco) { @@ -1251,7 +1251,7 @@ static void new_particle_duplilist(ListBase *lb, ID *id, Scene *scene, Object *p if (!psys_check_enabled(par, psys)) return; - if (G.rendering == 0) + if (G.is_rendering == FALSE) no_draw_flag |= PARS_NO_DISP; ctime = BKE_scene_frame_get(scene); /* NOTE: in old animsys, used parent object's timeoffset... */ @@ -1445,7 +1445,7 @@ static void new_particle_duplilist(ListBase *lb, ID *id, Scene *scene, Object *p dob = new_dupli_object(lb, go->ob, mat, par->lay, counter, index, OB_DUPLIPARTS, animated); copy_m4_m4(dob->omat, obcopylist[b].obmat); - if (G.rendering) + if (G.is_rendering) psys_get_dupli_texture(psys, part, sim.psmd, pa, cpa, dob->uv, dob->orco); } } @@ -1493,7 +1493,7 @@ static void new_particle_duplilist(ListBase *lb, ID *id, Scene *scene, Object *p dob = new_dupli_object(lb, ob, mat, ob->lay, counter, index, GS(id->name) == ID_GR ? OB_DUPLIGROUP : OB_DUPLIPARTS, animated); copy_m4_m4(dob->omat, oldobmat); - if (G.rendering) + if (G.is_rendering) psys_get_dupli_texture(psys, part, sim.psmd, pa, cpa, dob->uv, dob->orco); } @@ -1599,7 +1599,7 @@ static void object_duplilist_recursive(ID *id, Scene *scene, Object *ob, ListBas return; /* Should the dupli's be generated for this object? - Respect restrict flags */ - if (G.rendering) { + if (G.is_rendering) { if (ob->restrictflag & OB_RESTRICT_RENDER) { return; } diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c index c098056eb5e..0b5d0d90c67 100644 --- a/source/blender/blenkernel/intern/blender.c +++ b/source/blender/blenkernel/intern/blender.c @@ -457,7 +457,7 @@ int blender_test_break(void) blender_test_break_cb(); } - return (G.afbreek == 1); + return (G.is_break == TRUE); } diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c index e7dc825accd..e2bb1aaa2c7 100644 --- a/source/blender/blenkernel/intern/curve.c +++ b/source/blender/blenkernel/intern/curve.c @@ -2222,7 +2222,7 @@ void BKE_curve_bevelList_make(Object *ob) bl->nr = 0; } else { - if (G.rendering && cu->resolu_ren != 0) + if (G.is_rendering && cu->resolu_ren != 0) resolu = cu->resolu_ren; else resolu = nu->resolu; diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c index 00a76e87d83..64959fd3aa1 100644 --- a/source/blender/blenkernel/intern/displist.c +++ b/source/blender/blenkernel/intern/displist.c @@ -677,7 +677,7 @@ void BKE_displist_make_mball(Scene *scene, Object *ob) /* XXX: mball stuff uses plenty of global variables * while this is unchanged updating during render is unsafe */ - if (G.rendering) + if (G.is_rendering) return; BKE_displist_free(&(ob->disp)); diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index 936ef973128..fbcd943e13f 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -741,7 +741,7 @@ void free_old_images(void) return; /* of course not! */ - if (G.rendering) + if (G.is_rendering) return; lasttime = ctime; diff --git a/source/blender/blenkernel/intern/mball.c b/source/blender/blenkernel/intern/mball.c index f897543db18..fa5304b081a 100644 --- a/source/blender/blenkernel/intern/mball.c +++ b/source/blender/blenkernel/intern/mball.c @@ -2288,7 +2288,7 @@ void BKE_mball_polygonize(Scene *scene, Object *ob, ListBase *dispbase) mb = ob->data; if (totelem == 0) return; - if (!(G.rendering) && (mb->flag == MB_UPDATE_NEVER)) return; + if ((G.is_rendering == FALSE) && (mb->flag == MB_UPDATE_NEVER)) return; if (G.moving && mb->flag == MB_UPDATE_FAST) return; curindex = totindex = 0; @@ -2335,7 +2335,7 @@ void BKE_mball_polygonize(Scene *scene, Object *ob, ListBase *dispbase) } /* width is size per polygonize cube */ - if (G.rendering) width = mb->rendersize; + if (G.is_rendering) width = mb->rendersize; else { width = mb->wiresize; if (G.moving && mb->flag == MB_UPDATE_HALFRES) width *= 2; 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 */ diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index ac0625d1bad..26952db8fba 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -276,7 +276,7 @@ int psys_check_enabled(Object *ob, ParticleSystem *psys) return 0; psmd = psys_get_modifier(ob, psys); - if (psys->renderdata || G.rendering) { + if (psys->renderdata || G.is_rendering) { if (!(psmd->modifier.mode & eModifierMode_Render)) return 0; } @@ -681,7 +681,7 @@ void psys_render_set(Object *ob, ParticleSystem *psys, float viewmat[][4], float ParticleRenderData *data; ParticleSystemModifierData *psmd = psys_get_modifier(ob, psys); - if (!G.rendering) + if (G.is_rendering == FALSE) return; if (psys->renderdata) return; @@ -2356,7 +2356,7 @@ void psys_find_parents(ParticleSimulationData *sim) int from = PART_FROM_FACE; totparent = (int)(totchild * part->parents * 0.3f); - if (G.rendering && part->child_nbr && part->ren_child_nbr) + if (G.is_rendering && part->child_nbr && part->ren_child_nbr) totparent *= (float)part->child_nbr / (float)part->ren_child_nbr; tree = BLI_kdtree_new(totparent); @@ -2433,7 +2433,7 @@ static int psys_threads_init_path(ParticleThread *threads, Scene *scene, float c if (totchild && part->childtype == PART_CHILD_FACES) { totparent = (int)(totchild * part->parents * 0.3f); - if (G.rendering && part->child_nbr && part->ren_child_nbr) + if (G.is_rendering && part->child_nbr && part->ren_child_nbr) totparent *= (float)part->child_nbr / (float)part->ren_child_nbr; /* part->parents could still be 0 so we can't test with totparent */ diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index 0b3131f0a1c..bae8efa758e 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -4104,7 +4104,7 @@ static void particles_fluid_step(ParticleSimulationData *sim, int UNUSED(cfra)) } gzread(gzf, &totpart, sizeof(totpart)); - totpart = (G.rendering)?totpart:(part->disp*totpart)/100; + totpart = (G.is_rendering)?totpart:(part->disp*totpart) / 100; part->totpart= totpart; part->sta=part->end = 1.0f; diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c index 101f53fe94f..e990f461d4c 100644 --- a/source/blender/blenkernel/intern/pointcache.c +++ b/source/blender/blenkernel/intern/pointcache.c @@ -2807,7 +2807,7 @@ void BKE_ptcache_bake(PTCacheBaker* baker) thread_data.scene = baker->scene; thread_data.main = baker->main; - G.afbreek = 0; + G.is_break = FALSE; /* set caches to baking mode and figure out start frame */ if (pid) { diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index 1882318f3ea..59f178973ad 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -1329,7 +1329,7 @@ void BKE_sequencer_proxy_rebuild(SeqIndexBuildContext *context, short *stop, sho *progress = (float) cfra / (seq->enddisp - seq->endstill - seq->startdisp + seq->startstill); *do_update = TRUE; - if (*stop || G.afbreek) + if (*stop || G.is_break) break; } } @@ -2127,7 +2127,7 @@ static ImBuf *seq_render_scene_strip(SeqRenderData context, Sequence *seq, float * for display in render/imagewindow * * Hmm, don't see, why we can't do that all the time, - * and since G.rendering is uhm, gone... (Peter) + * and since G.is_rendering is uhm, gone... (Peter) */ /* New info: @@ -2148,9 +2148,9 @@ static ImBuf *seq_render_scene_strip(SeqRenderData context, Sequence *seq, float * -jahka */ - int rendering = G.rendering; + int rendering = G.is_rendering; int doseq; - int doseq_gl = G.rendering ? /*(scene->r.seq_flag & R_SEQ_GL_REND)*/ 0 : /*(scene->r.seq_flag & R_SEQ_GL_PREV)*/ 1; + int doseq_gl = G.is_rendering ? /*(scene->r.seq_flag & R_SEQ_GL_REND)*/ 0 : /*(scene->r.seq_flag & R_SEQ_GL_PREV)*/ 1; int have_seq = FALSE; Scene *scene; @@ -2218,7 +2218,7 @@ static ImBuf *seq_render_scene_strip(SeqRenderData context, Sequence *seq, float RE_BlenderFrame(re, context.bmain, scene, NULL, camera, scene->lay, frame, FALSE); /* restore previous state after it was toggled on & off by RE_BlenderFrame */ - G.rendering = rendering; + G.is_rendering = rendering; } RE_AcquireResultImage(re, &rres); diff --git a/source/blender/blenkernel/intern/writeframeserver.c b/source/blender/blenkernel/intern/writeframeserver.c index a0f367961d2..d8fddb9851a 100644 --- a/source/blender/blenkernel/intern/writeframeserver.c +++ b/source/blender/blenkernel/intern/writeframeserver.c @@ -252,7 +252,7 @@ static int handle_request(RenderData *rd, char *req) } if (strcmp(path, "/close.txt") == 0) { safe_puts(good_bye); - G.afbreek = 1; /* Abort render */ + G.is_break = TRUE; /* Abort render */ return -1; } return -1; |