Revision: 17958
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17958
Author: blendix
Date: 2008-12-19 20:11:02 +0100 (Fri, 19 Dec 2008)
Log Message:
-----------
2.5: globals cleanup
* G.version removed, use BLENDER_VERSION
* G.order removed, ENDIAN_ORDER
* G.vd, G.sipo, G.buts, G.sima, .. removed.
* G.qual removed
* G.simulf removed (was unused in 2.4x)
* error() and some other unused stubs removed
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/blenkernel/BKE_global.h
branches/blender2.5/blender/source/blender/blenkernel/intern/blender.c
branches/blender2.5/blender/source/blender/blenkernel/intern/exotic.c
branches/blender2.5/blender/source/blender/blenkernel/intern/writeffmpeg.c
branches/blender2.5/blender/source/blender/blenloader/intern/writefile.c
branches/blender2.5/blender/source/blender/editors/include/BIF_glutil.h
branches/blender2.5/blender/source/blender/editors/include/ED_util.h
branches/blender2.5/blender/source/blender/editors/screen/glutil.c
branches/blender2.5/blender/source/blender/editors/screen/stubs.c
branches/blender2.5/blender/source/blender/editors/space_view3d/drawmesh.c
branches/blender2.5/blender/source/blender/editors/space_view3d/drawobject.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_view.c
branches/blender2.5/blender/source/blender/editors/util/ed_markers.c
branches/blender2.5/blender/source/blender/editors/util/ed_util.c
branches/blender2.5/blender/source/blender/gpu/GPU_draw.h
branches/blender2.5/blender/source/blender/gpu/intern/gpu_draw.c
branches/blender2.5/blender/source/blender/imbuf/intern/amiga.c
branches/blender2.5/blender/source/blender/imbuf/intern/anim.c
branches/blender2.5/blender/source/blender/imbuf/intern/tiff.c
branches/blender2.5/blender/source/blender/makesdna/DNA_scene_types.h
branches/blender2.5/blender/source/blender/radiosity/extern/include/radio.h
branches/blender2.5/blender/source/blender/radiosity/intern/source/radpreprocess.c
branches/blender2.5/blender/source/blender/render/extern/include/RE_render_ext.h
branches/blender2.5/blender/source/blender/render/intern/source/convertblender.c
branches/blender2.5/blender/source/blender/yafray/intern/yafray_Render.h
branches/blender2.5/blender/source/creator/creator.c
branches/blender2.5/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
Modified: branches/blender2.5/blender/source/blender/blenkernel/BKE_global.h
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/BKE_global.h
2008-12-19 18:48:41 UTC (rev 17957)
+++ branches/blender2.5/blender/source/blender/blenkernel/BKE_global.h
2008-12-19 19:11:02 UTC (rev 17958)
@@ -66,15 +66,6 @@
typedef struct Global {
/* active pointers */
- struct View3D *vd;
- struct View2D *v2d;
- struct SpaceIpo *sipo;
- struct SpaceButs *buts;
- struct SpaceImage *sima;
- struct SpaceOops *soops;
- struct SpaceSound *ssound;
- struct SpaceAction *saction; /* __NLA */
- struct SpaceNla *snla;
struct Main *main;
struct Scene *scene; /* denk aan file.c */
struct bScreen *curscreen;
@@ -99,14 +90,11 @@
int totvert, totedge, totface, totvertsel, totedgesel, totfacesel;
short afbreek, moving;
- short qual, background;
+ short background;
short winpos, displaymode; /* used to be in Render */
short rendering; /* to indicate render is busy,
prevent renderwindow events etc */
- /**
- * The current version of Blender.
- */
- short version;
- short simulf, order, rt;
+
+ short rt;
int f;
/* Editmode lists */
@@ -235,28 +223,11 @@
#define G_WINDOWSTATE_BORDER 1
#define G_WINDOWSTATE_FULLSCREEN 2
-/* G.simulf */
-#define G_LOADFILE 2
-#define G_RESTART 4
-#define G_QUIT 8
-#define G_SETSCENE 16
-
-/* G.qual */
-#define R_SHIFTKEY 1
-#define L_SHIFTKEY 2
-#define LR_SHIFTKEY 3
-#define R_ALTKEY 4
-#define L_ALTKEY 8
-#define LR_ALTKEY 12
-#define R_CTRLKEY 16
-#define L_CTRLKEY 32
-#define LR_CTRLKEY 48
-#define LR_COMMANDKEY 64
-
-/* G.order: indicates what endianness the platform where the file was
+/* ENDIAN_ORDER: indicates what endianness the platform where the file was
* written had. */
#define L_ENDIAN 1
#define B_ENDIAN 0
+extern short ENDIAN_ORDER;
/* G.moving, signals drawing in (3d) window to denote transform */
#define G_TRANSFORM_OBJ 1
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/blender.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/blender.c
2008-12-19 18:48:41 UTC (rev 17957)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/blender.c
2008-12-19 19:11:02 UTC (rev 17958)
@@ -94,6 +94,7 @@
Global G;
UserDef U;
ListBase WMlist= {NULL, NULL};
+short ENDIAN_ORDER;
char versionstr[48]= "";
@@ -200,15 +201,13 @@
strcpy(G.ima, "//");
- G.version= BLENDER_VERSION;
+ ENDIAN_ORDER= 1;
+ ENDIAN_ORDER= (((char*)&ENDIAN_ORDER)[0])? L_ENDIAN: B_ENDIAN;
- G.order= 1;
- G.order= (((char*)&G.order)[0])?L_ENDIAN:B_ENDIAN;
-
if(BLENDER_SUBVERSION)
- sprintf(versionstr, "www.blender.org %d.%d", G.version,
BLENDER_SUBVERSION);
+ sprintf(versionstr, "www.blender.org %d.%d", BLENDER_VERSION,
BLENDER_SUBVERSION);
else
- sprintf(versionstr, "www.blender.org %d", G.version);
+ sprintf(versionstr, "www.blender.org %d", BLENDER_VERSION);
#ifdef _WIN32 // FULLSCREEN
G.windowstate = G_WINDOWSTATE_USERDEF;
@@ -244,13 +243,6 @@
G.main= NULL;
G.obedit= NULL;
- G.saction= NULL;
- G.buts= NULL;
- G.v2d= NULL;
- G.vd= NULL;
- G.soops= NULL;
- G.sima= NULL;
- G.sipo= NULL;
G.f &= ~(G_WEIGHTPAINT + G_VERTEXPAINT + G_FACESELECT + G_PARTICLEEDIT);
}
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/exotic.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/exotic.c
2008-12-19 18:48:41 UTC (rev 17957)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/exotic.c
2008-12-19 19:11:02 UTC (rev 17958)
@@ -105,6 +105,7 @@
#include "BLI_arithb.h"
#include "BLI_editVert.h"
+#include "BKE_blender.h"
#include "BKE_global.h"
#include "BKE_main.h"
#include "BKE_mesh.h"
@@ -181,7 +182,7 @@
return; \
} \
else { \
- if (G.order==B_ENDIAN) { \
+ if (ENDIAN_ORDER==B_ENDIAN) { \
SWITCH_INT(mvert->co[0]); \
SWITCH_INT(mvert->co[1]); \
SWITCH_INT(mvert->co[2]); \
@@ -250,7 +251,7 @@
fseek(fpSTL, 80, SEEK_SET);
fread(&numfacets, 4*sizeof(char), 1, fpSTL);
- if (G.order==B_ENDIAN) {
+ if (ENDIAN_ORDER==B_ENDIAN) {
SWITCH_INT(numfacets);
}
@@ -2459,7 +2460,7 @@
VECCOPY(vert, verts[(index)].co);
Mat4MulVecfl(ob->obmat, vert);
- if (G.order==B_ENDIAN) {
+ if (ENDIAN_ORDER==B_ENDIAN) {
SWITCH_INT(vert[0]);
SWITCH_INT(vert[1]);
SWITCH_INT(vert[2]);
@@ -2564,7 +2565,7 @@
*/
fseek(fpSTL, 80, SEEK_SET);
- if (G.order==B_ENDIAN) {
+ if (ENDIAN_ORDER==B_ENDIAN) {
SWITCH_INT(numfacets);
}
fwrite(&numfacets, 4*sizeof(char), 1, fpSTL);
@@ -2605,7 +2606,7 @@
cp[1]= (unsigned char) (255.0*ma->b);
cp[2]= (unsigned char) (255.0*ma->g);
cp[3]= (unsigned char) (255.0*ma->r);
- if(G.order==L_ENDIAN) SWITCH_INT(kleur[a]);
+ if(ENDIAN_ORDER==L_ENDIAN) SWITCH_INT(kleur[a]);
}
else kleur[a]= 0x00C0C0C0;
@@ -3026,7 +3027,7 @@
/* FIRST: write all the datablocks */
- fprintf(fp, "#VRML V1.0 ascii\n\n# Blender V%d\n\n# 'Switch' is used as
a hack, to ensure it is not part of the drawing\n\n", G.version);
+ fprintf(fp, "#VRML V1.0 ascii\n\n# Blender V%d\n\n# 'Switch' is used as
a hack, to ensure it is not part of the drawing\n\n", BLENDER_VERSION);
fprintf(fp, "Separator {\n");
fprintf(fp, "Switch {\n");
Modified:
branches/blender2.5/blender/source/blender/blenkernel/intern/writeffmpeg.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/writeffmpeg.c
2008-12-19 18:48:41 UTC (rev 17957)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/writeffmpeg.c
2008-12-19 19:11:02 UTC (rev 17958)
@@ -302,7 +302,7 @@
/* Do RGBA-conversion and flipping in one step depending
on CPU-Endianess */
- if (G.order == L_ENDIAN) {
+ if (ENDIAN_ORDER == L_ENDIAN) {
int y;
for (y = 0; y < height; y++) {
uint8_t* target = rgb_frame->data[0]
Modified:
branches/blender2.5/blender/source/blender/blenloader/intern/writefile.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenloader/intern/writefile.c
2008-12-19 18:48:41 UTC (rev 17957)
+++ branches/blender2.5/blender/source/blender/blenloader/intern/writefile.c
2008-12-19 19:11:02 UTC (rev 17958)
@@ -2071,7 +2071,7 @@
wd= bgnwrite(handle, compare, current, write_flags);
- sprintf(buf, "BLENDER%c%c%.3d", (sizeof(void*)==8)?'-':'_',
(G.order==B_ENDIAN)?'V':'v', G.version);
+ sprintf(buf, "BLENDER%c%c%.3d", (sizeof(void*)==8)?'-':'_',
(ENDIAN_ORDER==B_ENDIAN)?'V':'v', BLENDER_VERSION);
mywrite(wd, buf, 12);
write_renderinfo(wd, mainvar);
Modified:
branches/blender2.5/blender/source/blender/editors/include/BIF_glutil.h
===================================================================
--- branches/blender2.5/blender/source/blender/editors/include/BIF_glutil.h
2008-12-19 18:48:41 UTC (rev 17957)
+++ branches/blender2.5/blender/source/blender/editors/include/BIF_glutil.h
2008-12-19 19:11:02 UTC (rev 17958)
@@ -210,7 +210,7 @@
/* own working polygon offset */
-void bglPolygonOffset(float dist);
+void bglPolygonOffset(float viewdist, float dist);
/* For caching opengl matrices (gluProject/gluUnProject) */
typedef struct bglMats {
Modified: branches/blender2.5/blender/source/blender/editors/include/ED_util.h
===================================================================
--- branches/blender2.5/blender/source/blender/editors/include/ED_util.h
2008-12-19 18:48:41 UTC (rev 17957)
+++ branches/blender2.5/blender/source/blender/editors/include/ED_util.h
2008-12-19 19:11:02 UTC (rev 17958)
@@ -30,7 +30,7 @@
/* ************** XXX OLD CRUFT WARNING ************* */
-void apply_keyb_grid(float *val, float fac1, float fac2, float fac3, int
invert);
+void apply_keyb_grid(int shift, int ctrl, float *val, float fac1, float fac2,
float fac3, int invert);
int GetButStringLength(char *str);
#endif /* ED_UTIL_H */
Modified: branches/blender2.5/blender/source/blender/editors/screen/glutil.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/screen/glutil.c
2008-12-19 18:48:41 UTC (rev 17957)
+++ branches/blender2.5/blender/source/blender/editors/screen/glutil.c
2008-12-19 19:11:02 UTC (rev 17958)
@@ -739,12 +739,8 @@
/* *************** glPolygonOffset hack ************* */
-// both temporal, so here for now (ton)
-#include "BKE_global.h"
-#include "DNA_view3d_types.h"
-
/* dist is only for ortho now... */
-void bglPolygonOffset(float dist)
+void bglPolygonOffset(float viewdist, float dist)
{
static float winmat[16], offset=0.0;
@@ -760,7 +756,7 @@
/* dist is from camera to center point */
- if(winmat[15]>0.5) offs= 0.00001*dist*G.vd->dist; // ortho
tweaking
+ if(winmat[15]>0.5) offs= 0.00001*dist*viewdist; // ortho
tweaking
else offs= 0.0005*dist; // should be clipping value or so...
winmat[14]-= offs;
Modified: branches/blender2.5/blender/source/blender/editors/screen/stubs.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/screen/stubs.c
2008-12-19 18:48:41 UTC (rev 17957)
+++ branches/blender2.5/blender/source/blender/editors/screen/stubs.c
2008-12-19 19:11:02 UTC (rev 17958)
@@ -29,14 +29,8 @@
#include <string.h>
/* various UI stuff */
-void blender_test_break() {}
-void error() {}
void set_timecursor() {}
-void waitcursor() {}
void mainqenter() {}
-void saveover() {}
-void BIF_icons_free() {}
-void BIF_icons_init() {}
char texstr[20][12];
Modified:
branches/blender2.5/blender/source/blender/editors/space_view3d/drawmesh.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_view3d/drawmesh.c
2008-12-19 18:48:41 UTC (rev 17957)
+++ branches/blender2.5/blender/source/blender/editors/space_view3d/drawmesh.c
2008-12-19 19:11:02 UTC (rev 17958)
@@ -194,7 +194,7 @@
else
return 0;
}
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
