[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49716] trunk/blender/source: code cleanup : rename G.rt to G.debug_value
Campbell Barton
ideasman42 at gmail.com
Wed Aug 8 20:21:54 CEST 2012
Revision: 49716
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49716
Author: campbellbarton
Date: 2012-08-08 18:21:54 +0000 (Wed, 08 Aug 2012)
Log Message:
-----------
code cleanup: rename G.rt to G.debug_value
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_global.h
trunk/blender/source/blender/blenkernel/intern/cloth.c
trunk/blender/source/blender/blenkernel/intern/implicit.c
trunk/blender/source/blender/blenkernel/intern/softbody.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/editors/mesh/editface.c
trunk/blender/source/blender/editors/render/render_internal.c
trunk/blender/source/blender/editors/screen/area.c
trunk/blender/source/blender/editors/screen/screen_edit.c
trunk/blender/source/blender/editors/space_logic/logic_window.c
trunk/blender/source/blender/editors/space_node/node_buttons.c
trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
trunk/blender/source/blender/editors/transform/transform_manipulator.c
trunk/blender/source/blender/modifiers/intern/MOD_cloth.c
trunk/blender/source/blender/modifiers/intern/MOD_collision.c
trunk/blender/source/blender/modifiers/intern/MOD_meshdeform.c
trunk/blender/source/blender/nodes/composite/node_composite_tree.c
trunk/blender/source/blender/python/intern/bpy_app.c
trunk/blender/source/blender/windowmanager/intern/wm_operators.c
trunk/blender/source/creator/creator.c
Modified: trunk/blender/source/blender/blenkernel/BKE_global.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_global.h 2012-08-08 18:10:13 UTC (rev 49715)
+++ trunk/blender/source/blender/blenkernel/BKE_global.h 2012-08-08 18:21:54 UTC (rev 49716)
@@ -60,20 +60,26 @@
/* strings of recent opened files */
struct ListBase recent_files;
-
+
short afbreek, 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 */
- short rt;
+ /* debug value, can be set from the UI and python, used for testing nonstandard features */
+ short debug_value;
+
+ /* saved to the blend file as FileGlobal.globalf,
+ * however this is now only used for runtime options */
int f;
+
+ /* debug flag, G_DEBUG, G_DEBUG_PYTHON & friends, set python or command line args */
int debug;
/* Used for BMesh transformations */
struct BME_Glob *editBMesh;
-
+
/* Frank's variables */
int save_over;
@@ -88,7 +94,7 @@
/* this variable is written to / read from FileGlobal->fileflags */
int fileflags;
-
+
/* save the allowed windowstate of blender when using -W or -w */
int windowstate;
} Global;
Modified: trunk/blender/source/blender/blenkernel/intern/cloth.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cloth.c 2012-08-08 18:10:13 UTC (rev 49715)
+++ trunk/blender/source/blender/blenkernel/intern/cloth.c 2012-08-08 18:21:54 UTC (rev 49716)
@@ -662,7 +662,7 @@
void cloth_free_modifier_extern(ClothModifierData *clmd )
{
Cloth *cloth = NULL;
- if (G.rt > 0)
+ if (G.debug_value > 0)
printf("cloth_free_modifier_extern\n");
if ( !clmd )
@@ -671,7 +671,7 @@
cloth = clmd->clothObject;
if ( cloth ) {
- if (G.rt > 0)
+ if (G.debug_value > 0)
printf("cloth_free_modifier_extern in\n");
// If our solver provides a free function, call it
@@ -852,7 +852,7 @@
// If we have a clothObject, free it.
if ( clmd->clothObject != NULL ) {
cloth_free_modifier ( clmd );
- if (G.rt > 0)
+ if (G.debug_value > 0)
printf("cloth_free_modifier cloth_from_object\n");
}
@@ -1278,7 +1278,7 @@
cloth->edgehash = edgehash;
- if (G.rt > 0)
+ if (G.debug_value > 0)
printf("avg_len: %f\n", clmd->sim_parms->avg_spring_len);
return 1;
Modified: trunk/blender/source/blender/blenkernel/intern/implicit.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/implicit.c 2012-08-08 18:10:13 UTC (rev 49715)
+++ trunk/blender/source/blender/blenkernel/intern/implicit.c 2012-08-08 18:21:54 UTC (rev 49716)
@@ -710,7 +710,7 @@
Implicit_Data *id = NULL;
LinkNode *search = NULL;
- if (G.rt > 0)
+ if (G.debug_value > 0)
printf("implicit_init\n");
// init memory guard
@@ -1918,7 +1918,7 @@
copy_v3_v3(id->X[i], verts[i].x);
copy_v3_v3(id->V[i], verts[i].v);
}
- if (G.rt > 0)
+ if (G.debug_value > 0)
printf("implicit_set_positions\n");
}
Modified: trunk/blender/source/blender/blenkernel/intern/softbody.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/softbody.c 2012-08-08 18:10:13 UTC (rev 49715)
+++ trunk/blender/source/blender/blenkernel/intern/softbody.c 2012-08-08 18:21:54 UTC (rev 49716)
@@ -1941,7 +1941,7 @@
}
}
- if ((deflected < 2)&& (G.rt != 444)) { /* we did not hit a face until now */
+ if ((deflected < 2)&& (G.debug_value != 444)) { /* we did not hit a face until now */
/* see if 'outer' hits an edge */
float dist;
@@ -2493,7 +2493,7 @@
static void softbody_calc_forces(Scene *scene, Object *ob, float forcetime, float timenow, int nl_flags)
{
/* redirection to the new threaded Version */
- if (!(G.rt & 0x10)) { // 16
+ if (!(G.debug_value & 0x10)) { // 16
softbody_calc_forcesEx(scene, ob, forcetime, timenow, nl_flags);
return;
}
@@ -2504,7 +2504,7 @@
/*backward compatibility note:
fixing bug [17428] which forces adaptive step size to tiny steps
in some situations
- .. keeping G.rt==17 0x11 option for old files 'needing' the bug*/
+ .. keeping G.debug_value==17 0x11 option for old files 'needing' the bug*/
/* rule we never alter free variables :bp->vec bp->pos in here !
* this will ruin adaptive stepsize AKA heun! (BM)
@@ -2756,9 +2756,9 @@
if (sb_deflect_face(ob, bp->pos, facenormal, defforce, &cf, timenow, vel, &intrusion)) {
if ((!nl_flags)&&(intrusion < 0.0f)) {
- if (G.rt & 0x01) { // 17 we did check for bit 0x10 before
+ if (G.debug_value & 0x01) { // 17 we did check for bit 0x10 before
/*fixing bug [17428] this forces adaptive step size to tiny steps
- in some situations .. keeping G.rt==17 option for old files 'needing' the bug
+ in some situations .. keeping G.debug_value==17 option for old files 'needing' the bug
*/
/*bjornmose: uugh.. what an evil hack
violation of the 'don't touch bp->pos in here' rule
@@ -2837,7 +2837,7 @@
nlEnd(NL_MATRIX);
nlEnd(NL_SYSTEM);
- if ((G.rt == 32) && (nl_flags & NLF_BUILD)) {
+ if ((G.debug_value == 32) && (nl_flags & NLF_BUILD)) {
printf("####MEE#####\n");
nlPrintMatrix();
}
@@ -2849,7 +2849,7 @@
float f;
int index =0;
/* for debug purpose .. anyhow cropping B vector looks like working */
- if (G.rt ==32)
+ if (G.debug_value ==32)
for (a=2*sb->totpoint, bp= sb->bpoint; a>0; a--, bp++) {
f=nlGetVariable(0, index);
printf("(%f ", f);index++;
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2012-08-08 18:10:13 UTC (rev 49715)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2012-08-08 18:21:54 UTC (rev 49716)
@@ -9430,7 +9430,7 @@
fd = blo_openblenderfile(mainptr->curlib->filepath, basefd->reports);
/* allow typing in a new lib path */
- if (G.rt == -666) {
+ if (G.debug_value == -666) {
while (fd == NULL) {
char newlib_path[FILE_MAX] = {0};
printf("Missing library...'\n");
Modified: trunk/blender/source/blender/editors/mesh/editface.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editface.c 2012-08-08 18:10:13 UTC (rev 49715)
+++ trunk/blender/source/blender/editors/mesh/editface.c 2012-08-08 18:21:54 UTC (rev 49716)
@@ -502,7 +502,7 @@
BLI_edgehash_free(ehash2, NULL);
}
-// XXX if (G.rt == 8)
+// XXX if (G.debug_value == 8)
// unwrap_lscm(1);
me->drawflag |= ME_DRAWSEAMS;
Modified: trunk/blender/source/blender/editors/render/render_internal.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_internal.c 2012-08-08 18:10:13 UTC (rev 49715)
+++ trunk/blender/source/blender/editors/render/render_internal.c 2012-08-08 18:21:54 UTC (rev 49716)
@@ -505,7 +505,7 @@
WM_jobs_stop_all(CTX_wm_manager(C));
/* get main */
- if (G.rt == 101) {
+ if (G.debug_value == 101) {
/* thread-safety experiment, copy main from the undo buffer */
mainp = BKE_undo_get_main(&scene);
}
Modified: trunk/blender/source/blender/editors/screen/area.c
===================================================================
--- trunk/blender/source/blender/editors/screen/area.c 2012-08-08 18:10:13 UTC (rev 49715)
+++ trunk/blender/source/blender/editors/screen/area.c 2012-08-08 18:21:54 UTC (rev 49716)
@@ -372,11 +372,11 @@
if (az->ar) {
/* only display tab or icons when the region is hidden */
if (az->ar->flag & (RGN_FLAG_HIDDEN | RGN_FLAG_TOO_SMALL)) {
- if (G.rt == 3)
+ if (G.debug_value == 3)
region_draw_azone_icon(az);
- else if (G.rt == 2)
+ else if (G.debug_value == 2)
region_draw_azone_tria(az);
- else if (G.rt == 1)
+ else if (G.debug_value == 1)
region_draw_azone_tab(az);
else
region_draw_azone_tab_plus(az);
@@ -858,11 +858,11 @@
az->edge = edge;
if (ar->flag & (RGN_FLAG_HIDDEN | RGN_FLAG_TOO_SMALL)) {
- if (G.rt == 3)
+ if (G.debug_value == 3)
region_azone_icon(sa, az, ar);
- else if (G.rt == 2)
+ else if (G.debug_value == 2)
region_azone_tria(sa, az, ar);
- else if (G.rt == 1)
+ else if (G.debug_value == 1)
region_azone_tab(sa, az, ar);
else
region_azone_tab_plus(sa, az, ar);
@@ -1113,7 +1113,7 @@
static void area_calc_totrct(ScrArea *sa, int sizex, int sizey)
{
- short rt = 0; // CLAMPIS(G.rt, 0, 16);
+ short rt = 0; // CLAMPIS(G.debug_value, 0, 16);
if (sa->v1->vec.x > 0) sa->totrct.xmin = sa->v1->vec.x + 1 + rt;
else sa->totrct.xmin = sa->v1->vec.x;
Modified: trunk/blender/source/blender/editors/screen/screen_edit.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_edit.c 2012-08-08 18:10:13 UTC (rev 49715)
+++ trunk/blender/source/blender/editors/screen/screen_edit.c 2012-08-08 18:21:54 UTC (rev 49716)
@@ -913,7 +913,7 @@
short y2 = sa->v3->vec.y;
short a, rt;
- rt = 0; // CLAMPIS(G.rt, 0, 16);
+ rt = 0; // CLAMPIS(G.debug_value, 0, 16);
if (center == 0) {
cpack(0x505050);
Modified: trunk/blender/source/blender/editors/space_logic/logic_window.c
===================================================================
--- trunk/blender/source/blender/editors/space_logic/logic_window.c 2012-08-08 18:10:13 UTC (rev 49715)
+++ trunk/blender/source/blender/editors/space_logic/logic_window.c 2012-08-08 18:21:54 UTC (rev 49716)
@@ -4783,7 +4783,7 @@
* pin so changing states dosnt hide the logic brick */
char pin;
- if (G.rt == 0) {
+ if (G.debug_value == 0) {
logic_buttons_new(C, ar);
return;
}
Modified: trunk/blender/source/blender/editors/space_node/node_buttons.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_buttons.c 2012-08-08 18:10:13 UTC (rev 49715)
+++ trunk/blender/source/blender/editors/space_node/node_buttons.c 2012-08-08 18:21:54 UTC (rev 49716)
@@ -136,7 +136,7 @@
{
SpaceNode *snode = CTX_wm_space_node(C);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list