sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

remove/comment unused defines, also zero FileGlobal.filename to quiet valgrind.

Browse Source
This commit is contained in:
Campbell Barton 2011-01-16 21:12:38 +00:00
parent 26ee86b20d
commit fd448bcfc7
13 changed files with 32 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/BKE_particle.h
View File

@ -312,7 +312,7 @@ void reset_particle(struct ParticleSimulationData *sim, struct ParticleData *pa,
/* psys_reset */ /* psys_reset */
#define PSYS_RESET_ALL 1 #define PSYS_RESET_ALL 1
#define PSYS_RESET_DEPSGRAPH 2 #define PSYS_RESET_DEPSGRAPH 2
#define PSYS_RESET_CHILDREN 3 /* #define PSYS_RESET_CHILDREN 3 */ /*UNUSED*/
#define PSYS_RESET_CACHE_MISS 4 #define PSYS_RESET_CACHE_MISS 4
/* index_dmcache */ /* index_dmcache */

2
source/blender/blenkernel/BKE_pointcache.h
View File

@ -45,7 +45,7 @@
#define PTCACHE_RESET_DEPSGRAPH 0 #define PTCACHE_RESET_DEPSGRAPH 0
#define PTCACHE_RESET_BAKED 1 #define PTCACHE_RESET_BAKED 1
#define PTCACHE_RESET_OUTDATED 2 #define PTCACHE_RESET_OUTDATED 2
#define PTCACHE_RESET_FREE 3 /* #define PTCACHE_RESET_FREE 3 */ /*UNUSED*/
/* Add the blendfile name after blendcache_ */ /* Add the blendfile name after blendcache_ */
#define PTCACHE_EXT ".bphys" #define PTCACHE_EXT ".bphys"

28
source/blender/blenlib/intern/math_geom.c
View File

@ -236,51 +236,39 @@ float dist_to_line_segment_v3(float *v1, float *v2, float *v3)
/* intersect Line-Line, shorts */ /* intersect Line-Line, shorts */
int isect_line_line_v2_short(const short *v1, const short *v2, const short *v3, const short *v4) int isect_line_line_v2_short(const short *v1, const short *v2, const short *v3, const short *v4)
{ {
/* return:
-1: colliniar
0: no intersection of segments
1: exact intersection of segments
2: cross-intersection of segments
*/
float div, labda, mu; float div, labda, mu;
div= (float)((v2[0]-v1[0])*(v4[1]-v3[1])-(v2[1]-v1[1])*(v4[0]-v3[0])); div= (float)((v2[0]-v1[0])*(v4[1]-v3[1])-(v2[1]-v1[1])*(v4[0]-v3[0]));
if(div==0.0f) return -1; if(div==0.0f) return ISECT_LINE_LINE_COLINEAR;
labda= ((float)(v1[1]-v3[1])*(v4[0]-v3[0])-(v1[0]-v3[0])*(v4[1]-v3[1]))/div; labda= ((float)(v1[1]-v3[1])*(v4[0]-v3[0])-(v1[0]-v3[0])*(v4[1]-v3[1]))/div;
mu= ((float)(v1[1]-v3[1])*(v2[0]-v1[0])-(v1[0]-v3[0])*(v2[1]-v1[1]))/div; mu= ((float)(v1[1]-v3[1])*(v2[0]-v1[0])-(v1[0]-v3[0])*(v2[1]-v1[1]))/div;
if(labda>=0.0f && labda<=1.0f && mu>=0.0f && mu<=1.0f) { if(labda>=0.0f && labda<=1.0f && mu>=0.0f && mu<=1.0f) {
if(labda==0.0f || labda==1.0f || mu==0.0f || mu==1.0f) return 1; if(labda==0.0f || labda==1.0f || mu==0.0f || mu==1.0f) return ISECT_LINE_LINE_EXACT;
return 2; return ISECT_LINE_LINE_CROSS;
} }
return 0; return ISECT_LINE_LINE_NONE;
} }
/* intersect Line-Line, floats */ /* intersect Line-Line, floats */
int isect_line_line_v2(const float *v1, const float *v2, const float *v3, const float *v4) int isect_line_line_v2(const float *v1, const float *v2, const float *v3, const float *v4)
{ {
/* return:
-1: colliniar
0: no intersection of segments
1: exact intersection of segments
2: cross-intersection of segments
*/
float div, labda, mu; float div, labda, mu;
div= (v2[0]-v1[0])*(v4[1]-v3[1])-(v2[1]-v1[1])*(v4[0]-v3[0]); div= (v2[0]-v1[0])*(v4[1]-v3[1])-(v2[1]-v1[1])*(v4[0]-v3[0]);
if(div==0.0) return -1; if(div==0.0) return ISECT_LINE_LINE_COLINEAR;
labda= ((float)(v1[1]-v3[1])*(v4[0]-v3[0])-(v1[0]-v3[0])*(v4[1]-v3[1]))/div; labda= ((float)(v1[1]-v3[1])*(v4[0]-v3[0])-(v1[0]-v3[0])*(v4[1]-v3[1]))/div;
mu= ((float)(v1[1]-v3[1])*(v2[0]-v1[0])-(v1[0]-v3[0])*(v2[1]-v1[1]))/div; mu= ((float)(v1[1]-v3[1])*(v2[0]-v1[0])-(v1[0]-v3[0])*(v2[1]-v1[1]))/div;
if(labda>=0.0 && labda<=1.0 && mu>=0.0 && mu<=1.0) { if(labda>=0.0 && labda<=1.0 && mu>=0.0 && mu<=1.0) {
if(labda==0.0 || labda==1.0 || mu==0.0 || mu==1.0) return 1; if(labda==0.0 || labda==1.0 || mu==0.0 || mu==1.0) return ISECT_LINE_LINE_EXACT;
return 2; return ISECT_LINE_LINE_CROSS;
} }
return 0; return ISECT_LINE_LINE_NONE;
} }
/* get intersection point of two 2D segments and return intersection type: /* get intersection point of two 2D segments and return intersection type:

5
source/blender/blenloader/intern/writefile.c
View File

@ -2386,6 +2386,10 @@ static void write_global(WriteData *wd, int fileflags, Main *mainvar)
bScreen *screen; bScreen *screen;
char subvstr[8]; char subvstr[8];
/* prevent mem checkers from complaining */
fg.pads= fg.pad= 0;
memset(fg.filename, 0, sizeof(fg.filename));
current_screen_compat(mainvar, &screen); current_screen_compat(mainvar, &screen);
/* XXX still remap G */ /* XXX still remap G */
@ -2411,7 +2415,6 @@ static void write_global(WriteData *wd, int fileflags, Main *mainvar)
#else #else
fg.revision= 0; fg.revision= 0;
#endif #endif
fg.pads= fg.pad= 0; /* prevent mem checkers from complaining */
writestruct(wd, GLOB, "FileGlobal", 1, &fg); writestruct(wd, GLOB, "FileGlobal", 1, &fg);
} }

4
source/blender/makesdna/DNA_ipo_types.h
View File

@ -421,10 +421,10 @@ typedef struct Ipo {
#define PART_TOTNAM 25 #define PART_TOTNAM 25
#define PART_EMIT_FREQ 1 #define PART_EMIT_FREQ 1
#define PART_EMIT_LIFE 2 /* #define PART_EMIT_LIFE 2 */ /*UNUSED*/
#define PART_EMIT_VEL 3 #define PART_EMIT_VEL 3
#define PART_EMIT_AVE 4 #define PART_EMIT_AVE 4
#define PART_EMIT_SIZE 5 /* #define PART_EMIT_SIZE 5 */ /*UNUSED*/
#define PART_AVE 6 #define PART_AVE 6
#define PART_SIZE 7 #define PART_SIZE 7

2
source/blender/makesdna/DNA_lamp_types.h
View File

@ -140,7 +140,7 @@ typedef struct Lamp {
#define LA_SHAD_RAY 8192 #define LA_SHAD_RAY 8192
/* yafray: lamp shadowbuffer flag, softlight */ /* yafray: lamp shadowbuffer flag, softlight */
/* Since it is used with LOCAL lamp, can't use LA_SHAD */ /* Since it is used with LOCAL lamp, can't use LA_SHAD */
#define LA_YF_SOFT 16384 /* #define LA_YF_SOFT 16384 */ /* no longer used */
#define LA_LAYER_SHADOW 32768 #define LA_LAYER_SHADOW 32768
#define LA_SHAD_TEX (1<<16) #define LA_SHAD_TEX (1<<16)
#define LA_SHOW_CONE (1<<17) #define LA_SHOW_CONE (1<<17)

2
source/blender/makesdna/DNA_object_force.h
View File

@ -339,7 +339,7 @@ typedef struct SoftBody {
/* pd->flag: various settings */ /* pd->flag: various settings */
#define PFIELD_USEMAX 1 #define PFIELD_USEMAX 1
#define PDEFLE_DEFORM 2 /*#define PDEFLE_DEFORM 2*/ /*UNUSED*/
#define PFIELD_GUIDE_PATH_ADD 4 /* TODO: do_versions for below */ #define PFIELD_GUIDE_PATH_ADD 4 /* TODO: do_versions for below */
#define PFIELD_PLANAR 8 /* used for do_versions */ #define PFIELD_PLANAR 8 /* used for do_versions */
#define PDEFLE_KILL_PART 16 #define PDEFLE_KILL_PART 16

12
source/blender/makesdna/DNA_object_types.h
View File

@ -320,7 +320,7 @@ extern Object workob;
#define PARSLOW 16 #define PARSLOW 16
/* (short) transflag */ /* (short) transflag */
#define OB_OFFS_LOCAL 1 /*#define OB_OFFS_LOCAL 1*/ /*UNUSED*/
/* #define OB_QUAT 2 */ /* never used, free flag */ /* #define OB_QUAT 2 */ /* never used, free flag */
#define OB_NEG_SCALE 4 #define OB_NEG_SCALE 4
#define OB_DUPLI (8+16+256+512+2048) #define OB_DUPLI (8+16+256+512+2048)
@ -328,7 +328,7 @@ extern Object workob;
#define OB_DUPLIVERTS 16 #define OB_DUPLIVERTS 16
#define OB_DUPLIROT 32 #define OB_DUPLIROT 32
#define OB_DUPLINOSPEED 64 #define OB_DUPLINOSPEED 64
#define OB_POWERTRACK 128 /*#define OB_POWERTRACK 128*/ /*UNUSED*/
#define OB_DUPLIGROUP 256 #define OB_DUPLIGROUP 256
#define OB_DUPLIFACES 512 #define OB_DUPLIFACES 512
#define OB_DUPLIFACES_SCALE 1024 #define OB_DUPLIFACES_SCALE 1024
@ -341,9 +341,9 @@ extern Object workob;
#define OB_DRAWKEY 1 #define OB_DRAWKEY 1
#define OB_DRAWKEYSEL 2 #define OB_DRAWKEYSEL 2
#define OB_OFFS_OB 4 #define OB_OFFS_OB 4
#define OB_OFFS_MAT 8 /* #define OB_OFFS_MAT 8 */ /*UNUSED*/
#define OB_OFFS_VKEY 16 /* #define OB_OFFS_VKEY 16 */ /*UNUSED*/
#define OB_OFFS_PATH 32 /* #define OB_OFFS_PATH 32 */ /*UNUSED*/
#define OB_OFFS_PARENT 64 #define OB_OFFS_PARENT 64
#define OB_OFFS_PARTICLE 128 #define OB_OFFS_PARTICLE 128
/* get ipo from from action or not? */ /* get ipo from from action or not? */
@ -415,7 +415,7 @@ extern Object workob;
/* NOTE: this was used as a proper setting in past, so nullify before using */ /* NOTE: this was used as a proper setting in past, so nullify before using */
#define BA_TEMP_TAG 32 #define BA_TEMP_TAG 32
#define BA_FROMSET 128 /* #define BA_FROMSET 128 */ /*UNUSED*/
#define BA_TRANSFORM_CHILD 256 /* child of a transformed object */ #define BA_TRANSFORM_CHILD 256 /* child of a transformed object */
#define BA_TRANSFORM_PARENT 8192 /* parent of a transformed object */ #define BA_TRANSFORM_PARENT 8192 /* parent of a transformed object */

2
source/blender/makesdna/DNA_particle_types.h
View File

@ -321,7 +321,7 @@ typedef struct ParticleSystem{ /* note, make sure all (runtime) are NULL's in
#define PART_CHILD_EFFECT (1<<27) #define PART_CHILD_EFFECT (1<<27)
#define PART_CHILD_LONG_HAIR (1<<28) #define PART_CHILD_LONG_HAIR (1<<28)
#define PART_CHILD_RENDER (1<<29) /* #define PART_CHILD_RENDER (1<<29) */ /*UNUSED*/
#define PART_CHILD_GUIDE (1<<30) #define PART_CHILD_GUIDE (1<<30)
#define PART_SELF_EFFECT (1<<22) #define PART_SELF_EFFECT (1<<22)

10
source/blender/makesdna/DNA_scene_types.h
View File

@ -1170,7 +1170,7 @@ typedef enum SculptFlags {
/* toolsettings->uvcalc_flag */ /* toolsettings->uvcalc_flag */
#define UVCALC_FILLHOLES 1 #define UVCALC_FILLHOLES 1
#define UVCALC_NO_ASPECT_CORRECT 2 /* would call this UVCALC_ASPECT_CORRECT, except it should be default with old file */ /*#define UVCALC_NO_ASPECT_CORRECT 2*/ /* would call this UVCALC_ASPECT_CORRECT, except it should be default with old file */
#define UVCALC_TRANSFORM_CORRECT 4 /* adjust UV's while transforming to avoid distortion */ #define UVCALC_TRANSFORM_CORRECT 4 /* adjust UV's while transforming to avoid distortion */
/* toolsettings->uv_flag */ /* toolsettings->uv_flag */
@ -1228,10 +1228,10 @@ typedef enum SculptFlags {
#define RETOPO 1 #define RETOPO 1
#define RETOPO_PAINT 2 #define RETOPO_PAINT 2
/* toolsettings->retopo_paint_tool */ /* toolsettings->retopo_paint_tool */ /*UNUSED*/
#define RETOPO_PEN 1 /* #define RETOPO_PEN 1 */
#define RETOPO_LINE 2 /* #define RETOPO_LINE 2 */
#define RETOPO_ELLIPSE 4 /* #define RETOPO_ELLIPSE 4 */
/* toolsettings->skgen_options */ /* toolsettings->skgen_options */
#define SKGEN_FILTER_INTERNAL (1 << 0) #define SKGEN_FILTER_INTERNAL (1 << 0)

6
source/blender/makesdna/DNA_space_types.h
View File

@ -842,12 +842,6 @@ enum {
#define B_IMASELHOME 451 #define B_IMASELHOME 451
#define B_IMASELREMOVEBIP 452 #define B_IMASELREMOVEBIP 452
#define C_BACK 0xBAAAAA
#define C_DARK 0x665656
#define C_DERK 0x766666
#define C_HI 0xCBBBBB
#define C_LO 0x544444
/* nla->flag */ /* nla->flag */
/* flags (1<<0), (1<<1), and (1<<3) are depreceated flags from old blenders */ /* flags (1<<0), (1<<1), and (1<<3) are depreceated flags from old blenders */
/* draw timing in seconds instead of frames */ /* draw timing in seconds instead of frames */

4
source/blender/makesdna/DNA_view3d_types.h
View File

@ -204,7 +204,7 @@ typedef struct View3D {
/* View3D->flag (short) */ /* View3D->flag (short) */
#define V3D_DISPIMAGE 1 /*#define V3D_DISPIMAGE 1*/ /*UNUSED*/
#define V3D_DISPBGPICS 2 #define V3D_DISPBGPICS 2
#define V3D_HIDE_HELPLINES 4 #define V3D_HIDE_HELPLINES 4
#define V3D_INVALID_BACKBUF 8 #define V3D_INVALID_BACKBUF 8
@ -285,7 +285,7 @@ typedef struct View3D {
/* USE = user setting, DRAW = based on selection */ /* USE = user setting, DRAW = based on selection */
#define V3D_USE_MANIPULATOR 1 #define V3D_USE_MANIPULATOR 1
#define V3D_DRAW_MANIPULATOR 2 #define V3D_DRAW_MANIPULATOR 2
#define V3D_CALC_MANIPULATOR 4 /* #define V3D_CALC_MANIPULATOR 4 */ /*UNUSED*/
/* BGPic->flag */ /* BGPic->flag */
/* may want to use 1 for select ?*/ /* may want to use 1 for select ?*/

2
source/gameengine/Expressions/Value.h
View File

@ -75,8 +75,6 @@
#endif //WIN32 #endif //WIN32
#endif #endif
#define EDITOR_LEVEL_VERSION 0x06
enum VALUE_OPERATOR { enum VALUE_OPERATOR {
VALUE_MOD_OPERATOR, // % VALUE_MOD_OPERATOR, // %