[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49717] trunk/blender: code cleanup: rename G.afbreek --> is_break, G.rendering --> is_rendering
Campbell Barton
ideasman42 at gmail.com
Wed Aug 8 20:37:07 CEST 2012
Revision: 49717
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49717
Author: campbellbarton
Date: 2012-08-08 18:37:06 +0000 (Wed, 08 Aug 2012)
Log Message:
-----------
code cleanup: rename G.afbreek --> is_break, G.rendering --> is_rendering
Modified Paths:
--------------
trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm
trunk/blender/source/blender/blenkernel/BKE_global.h
trunk/blender/source/blender/blenkernel/intern/anim.c
trunk/blender/source/blender/blenkernel/intern/blender.c
trunk/blender/source/blender/blenkernel/intern/curve.c
trunk/blender/source/blender/blenkernel/intern/displist.c
trunk/blender/source/blender/blenkernel/intern/image.c
trunk/blender/source/blender/blenkernel/intern/mball.c
trunk/blender/source/blender/blenkernel/intern/object.c
trunk/blender/source/blender/blenkernel/intern/particle.c
trunk/blender/source/blender/blenkernel/intern/particle_system.c
trunk/blender/source/blender/blenkernel/intern/pointcache.c
trunk/blender/source/blender/blenkernel/intern/sequencer.c
trunk/blender/source/blender/blenkernel/intern/writeframeserver.c
trunk/blender/source/blender/editors/animation/anim_draw.c
trunk/blender/source/blender/editors/animation/anim_ops.c
trunk/blender/source/blender/editors/interface/interface_templates.c
trunk/blender/source/blender/editors/object/object_bake.c
trunk/blender/source/blender/editors/object/object_modifier.c
trunk/blender/source/blender/editors/physics/dynamicpaint_ops.c
trunk/blender/source/blender/editors/physics/physics_fluid.c
trunk/blender/source/blender/editors/physics/physics_pointcache.c
trunk/blender/source/blender/editors/render/render_internal.c
trunk/blender/source/blender/editors/render/render_preview.c
trunk/blender/source/blender/editors/render/render_view.c
trunk/blender/source/blender/editors/screen/screen_ops.c
trunk/blender/source/blender/editors/space_clip/clip_ops.c
trunk/blender/source/blender/editors/space_clip/tracking_ops.c
trunk/blender/source/blender/editors/space_image/image_buttons.c
trunk/blender/source/blender/editors/space_node/node_edit.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
trunk/blender/source/blender/editors/space_view3d/drawobject.c
trunk/blender/source/blender/makesrna/intern/rna_object_api.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_outputFile.c
trunk/blender/source/blender/render/intern/source/convertblender.c
trunk/blender/source/blender/render/intern/source/external_engine.c
trunk/blender/source/blender/render/intern/source/pipeline.c
trunk/blender/source/blender/render/intern/source/render_texture.c
trunk/blender/source/blender/render/intern/source/shadbuf.c
trunk/blender/source/blender/render/intern/source/texture_ocean.c
trunk/blender/source/blender/render/intern/source/zbuf.c
trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c
trunk/blender/source/creator/creator.c
Modified: trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm 2012-08-08 18:21:54 UTC (rev 49716)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm 2012-08-08 18:37:06 UTC (rev 49717)
@@ -527,7 +527,7 @@
// So WM_exit needs to be called directly, as the event loop will never run before termination
- (void)applicationWillTerminate:(NSNotification *)aNotification
{
- /*G.afbreek = 0; //Let Cocoa perform the termination at the end
+ /*G.is_break = FALSE; //Let Cocoa perform the termination at the end
WM_exit(C);*/
}
Modified: trunk/blender/source/blender/blenkernel/BKE_global.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_global.h 2012-08-08 18:21:54 UTC (rev 49716)
+++ trunk/blender/source/blender/blenkernel/BKE_global.h 2012-08-08 18:37:06 UTC (rev 49717)
@@ -61,12 +61,17 @@
/* 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 @@
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 */
Modified: trunk/blender/source/blender/blenkernel/intern/anim.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/anim.c 2012-08-08 18:21:54 UTC (rev 49716)
+++ trunk/blender/source/blender/blenkernel/intern/anim.c 2012-08-08 18:37:06 UTC (rev 49717)
@@ -755,8 +755,8 @@
/* 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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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;
}
Modified: trunk/blender/source/blender/blenkernel/intern/blender.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/blender.c 2012-08-08 18:21:54 UTC (rev 49716)
+++ trunk/blender/source/blender/blenkernel/intern/blender.c 2012-08-08 18:37:06 UTC (rev 49717)
@@ -457,7 +457,7 @@
blender_test_break_cb();
}
- return (G.afbreek == 1);
+ return (G.is_break == TRUE);
}
Modified: trunk/blender/source/blender/blenkernel/intern/curve.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/curve.c 2012-08-08 18:21:54 UTC (rev 49716)
+++ trunk/blender/source/blender/blenkernel/intern/curve.c 2012-08-08 18:37:06 UTC (rev 49717)
@@ -2222,7 +2222,7 @@
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;
Modified: trunk/blender/source/blender/blenkernel/intern/displist.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/displist.c 2012-08-08 18:21:54 UTC (rev 49716)
+++ trunk/blender/source/blender/blenkernel/intern/displist.c 2012-08-08 18:37:06 UTC (rev 49717)
@@ -677,7 +677,7 @@
/* 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));
Modified: trunk/blender/source/blender/blenkernel/intern/image.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/image.c 2012-08-08 18:21:54 UTC (rev 49716)
+++ trunk/blender/source/blender/blenkernel/intern/image.c 2012-08-08 18:37:06 UTC (rev 49717)
@@ -741,7 +741,7 @@
return;
/* of course not! */
- if (G.rendering)
+ if (G.is_rendering)
return;
lasttime = ctime;
Modified: trunk/blender/source/blender/blenkernel/intern/mball.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mball.c 2012-08-08 18:21:54 UTC (rev 49716)
+++ trunk/blender/source/blender/blenkernel/intern/mball.c 2012-08-08 18:37:06 UTC (rev 49717)
@@ -2288,7 +2288,7 @@
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 @@
}
/* 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;
Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/object.c 2012-08-08 18:21:54 UTC (rev 49716)
+++ trunk/blender/source/blender/blenkernel/intern/object.c 2012-08-08 18:37:06 UTC (rev 49717)
@@ -2643,7 +2643,7 @@
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 @@
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 */
Modified: trunk/blender/source/blender/blenkernel/intern/particle.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle.c 2012-08-08 18:21:54 UTC (rev 49716)
+++ trunk/blender/source/blender/blenkernel/intern/particle.c 2012-08-08 18:37:06 UTC (rev 49717)
@@ -276,7 +276,7 @@
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 @@
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 @@
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 @@
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 */
Modified: trunk/blender/source/blender/blenkernel/intern/particle_system.c
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list