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

diff --git a/source/blender/blenkernel/BKE_particle.h b/source/blender/blenkernel/BKE_particle.h
index f072a9422161e64b0edf138f2b3fcd52df36bfd7..3f7523d5264a638844444dca27c0d7ae1bcb691f 100644 (file)
--- a/source/blender/blenkernel/BKE_particle.h
+++ b/source/blender/blenkernel/BKE_particle.h
@@ -312,7 +312,7 @@ void reset_particle(struct ParticleSimulationData *sim, struct ParticleData *pa,
 /* psys_reset */
 #define PSYS_RESET_ALL                 1
 #define PSYS_RESET_DEPSGRAPH   2
-#define PSYS_RESET_CHILDREN    3
+/* #define PSYS_RESET_CHILDREN         3 */ /*UNUSED*/
 #define PSYS_RESET_CACHE_MISS  4
 
 /* index_dmcache */

diff --git a/source/blender/blenkernel/BKE_pointcache.h b/source/blender/blenkernel/BKE_pointcache.h
index c8e967e8a9a96ea7370c19429ca6092f4ea81e22..e4623a31807872d49b4973124a845931dcdc6c10 100644 (file)
--- a/source/blender/blenkernel/BKE_pointcache.h
+++ b/source/blender/blenkernel/BKE_pointcache.h
@@ -45,7 +45,7 @@
 #define PTCACHE_RESET_DEPSGRAPH                0
 #define PTCACHE_RESET_BAKED                    1
 #define PTCACHE_RESET_OUTDATED         2
-#define PTCACHE_RESET_FREE                     3
+/* #define PTCACHE_RESET_FREE                  3 */ /*UNUSED*/
 
 /* Add the blendfile name after blendcache_ */
 #define PTCACHE_EXT ".bphys"

diff --git a/source/blender/blenlib/intern/math_geom.c b/source/blender/blenlib/intern/math_geom.c
index d25aefef5438a29d90c766b1b6f0653cf577aeec..15f696e073ca47cfdc0a787e5bfd3cbfca3cd07a 100644 (file)
--- a/source/blender/blenlib/intern/math_geom.c
+++ b/source/blender/blenlib/intern/math_geom.c
@@ -236,51 +236,39 @@ float dist_to_line_segment_v3(float *v1, float *v2, float *v3)
 /* intersect Line-Line, shorts */
 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;
        
        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;
        
        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) return 1;
-               return 2;
+               if(labda==0.0f || labda==1.0f || mu==0.0f || mu==1.0f) return ISECT_LINE_LINE_EXACT;
+               return ISECT_LINE_LINE_CROSS;
        }
-       return 0;
+       return ISECT_LINE_LINE_NONE;
 }
 
 /* intersect Line-Line, floats */
 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;
        
        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;
        
        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) return 1;
-               return 2;
+               if(labda==0.0 || labda==1.0 || mu==0.0 || mu==1.0) return ISECT_LINE_LINE_EXACT;
+               return ISECT_LINE_LINE_CROSS;
        }
-       return 0;
+       return ISECT_LINE_LINE_NONE;
 }
 
 /* get intersection point of two 2D segments and return intersection type:

diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index c1e5eadee6a727b0d4af3ef866469a204e2a09e0..925b66f84a9d29f04078aa3b564bbf5d67dedc54 100644 (file)
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -2386,6 +2386,10 @@ static void write_global(WriteData *wd, int fileflags, Main *mainvar)
        bScreen *screen;
        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);
 
        /* XXX still remap G */
@@ -2411,7 +2415,6 @@ static void write_global(WriteData *wd, int fileflags, Main *mainvar)
 #else
        fg.revision= 0;
 #endif
-       fg.pads= fg.pad= 0; /* prevent mem checkers from complaining */
        writestruct(wd, GLOB, "FileGlobal", 1, &fg);
 }
 

diff --git a/source/blender/makesdna/DNA_ipo_types.h b/source/blender/makesdna/DNA_ipo_types.h
index b7e15808ff07754c9d917e6cfbe195e5679f53d9..d0554a7aaa529aa2596737bd59f7086c6867b173 100644 (file)
--- a/source/blender/makesdna/DNA_ipo_types.h
+++ b/source/blender/makesdna/DNA_ipo_types.h
@@ -421,10 +421,10 @@ typedef struct Ipo {
 #define PART_TOTNAM            25
 
 #define PART_EMIT_FREQ 1
-#define PART_EMIT_LIFE 2
+/* #define PART_EMIT_LIFE      2 */ /*UNUSED*/
 #define PART_EMIT_VEL  3
 #define PART_EMIT_AVE  4
-#define PART_EMIT_SIZE 5
+/* #define PART_EMIT_SIZE      5 */ /*UNUSED*/
 
 #define PART_AVE               6
 #define PART_SIZE              7

diff --git a/source/blender/makesdna/DNA_lamp_types.h b/source/blender/makesdna/DNA_lamp_types.h
index 5231108a7561b7d1dee89e7e4d509cda33d28259..1028d733c65e77750ca3c6f2351ae74f86592e37 100644 (file)
--- a/source/blender/makesdna/DNA_lamp_types.h
+++ b/source/blender/makesdna/DNA_lamp_types.h
@@ -140,7 +140,7 @@ typedef struct Lamp {
 #define LA_SHAD_RAY            8192
 /* yafray: lamp shadowbuffer flag, softlight */
 /* 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_SHAD_TEX     (1<<16)
 #define LA_SHOW_CONE    (1<<17)

diff --git a/source/blender/makesdna/DNA_object_force.h b/source/blender/makesdna/DNA_object_force.h
index 89d31586f6b144cec4f3029eff31007f244d37d2..7656ae6372b6284f2c33c3d3c0646987b82a6114 100644 (file)
--- a/source/blender/makesdna/DNA_object_force.h
+++ b/source/blender/makesdna/DNA_object_force.h
@@ -339,7 +339,7 @@ typedef struct SoftBody {
 
 /* pd->flag: various settings */
 #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_PLANAR                  8                       /* used for do_versions */
 #define PDEFLE_KILL_PART               16

diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index d1dcd2dd29cb3b3cac30c79528e3bd342d3ffa00..5ccb3e62f7df5b2e59f6ab893352759f681b817e 100644 (file)
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -320,7 +320,7 @@ extern Object workob;
 #define PARSLOW                        16
 
 /* (short) transflag */
-#define OB_OFFS_LOCAL          1
+/*#define OB_OFFS_LOCAL                1*/ /*UNUSED*/
 /* #define OB_QUAT                             2 */ /* never used, free flag */
 #define OB_NEG_SCALE           4
 #define OB_DUPLI                       (8+16+256+512+2048)
@@ -328,7 +328,7 @@ extern Object workob;
 #define OB_DUPLIVERTS          16
 #define OB_DUPLIROT                    32
 #define OB_DUPLINOSPEED                64
-#define OB_POWERTRACK          128
+/*#define OB_POWERTRACK                128*/ /*UNUSED*/
 #define OB_DUPLIGROUP          256
 #define OB_DUPLIFACES          512
 #define OB_DUPLIFACES_SCALE    1024
@@ -341,9 +341,9 @@ extern Object workob;
 #define OB_DRAWKEY                     1
 #define OB_DRAWKEYSEL          2
 #define OB_OFFS_OB                     4
-#define OB_OFFS_MAT                    8
-#define OB_OFFS_VKEY           16
-#define OB_OFFS_PATH           32
+/* #define OB_OFFS_MAT         8 */ /*UNUSED*/
+/* #define OB_OFFS_VKEY                16 */ /*UNUSED*/
+/* #define OB_OFFS_PATH                32 */ /*UNUSED*/
 #define OB_OFFS_PARENT         64
 #define OB_OFFS_PARTICLE       128
        /* 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 */
 #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_PARENT    8192 /* parent of a transformed object */

diff --git a/source/blender/makesdna/DNA_particle_types.h b/source/blender/makesdna/DNA_particle_types.h
index f140d60d3e9821be0d5bbb69b36c034286913a37..f009f3a9eb001b8c6fe48e536ea51dd83d904c7f 100644 (file)
--- a/source/blender/makesdna/DNA_particle_types.h
+++ b/source/blender/makesdna/DNA_particle_types.h
@@ -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_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_SELF_EFFECT       (1<<22)

diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 141a38470dbbef63c5ab7ed5d4a56596196c46db..f214598f6057ce5bb10668297337ae0eeda68131 100644 (file)
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -1170,7 +1170,7 @@ typedef enum SculptFlags {
 
 /* toolsettings->uvcalc_flag */
 #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 */
 
 /* toolsettings->uv_flag */
@@ -1228,10 +1228,10 @@ typedef enum SculptFlags {
 #define RETOPO 1
 #define RETOPO_PAINT 2
 
-/* toolsettings->retopo_paint_tool */
-#define RETOPO_PEN 1
-#define RETOPO_LINE 2
-#define RETOPO_ELLIPSE 4
+/* toolsettings->retopo_paint_tool */ /*UNUSED*/
+/* #define RETOPO_PEN 1 */
+/* #define RETOPO_LINE 2 */
+/* #define RETOPO_ELLIPSE 4 */
 
 /* toolsettings->skgen_options */
 #define SKGEN_FILTER_INTERNAL  (1 << 0)

diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index 0d388066cf26e93d6ee697bf90c2f32a97b52eab..8c681dc87b7abb65bd9c1df3dbbdf79da06eb5dd 100644 (file)
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -842,12 +842,6 @@ enum {
 #define B_IMASELHOME           451
 #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 */
 /* flags (1<<0), (1<<1), and (1<<3) are depreceated flags from old blenders */
        /* draw timing in seconds instead of frames */

diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h
index ab3ca025ed521e9d021b8b99b6686753b0f6fab8..d429f55eb6c526929b98ea5959196bce744dbe8a 100644 (file)
--- a/source/blender/makesdna/DNA_view3d_types.h
+++ b/source/blender/makesdna/DNA_view3d_types.h
@@ -204,7 +204,7 @@ typedef struct View3D {
 
 
 /* View3D->flag (short) */
-#define V3D_DISPIMAGE          1
+/*#define V3D_DISPIMAGE                1*/ /*UNUSED*/
 #define V3D_DISPBGPICS         2
 #define V3D_HIDE_HELPLINES     4
 #define V3D_INVALID_BACKBUF    8
@@ -285,7 +285,7 @@ typedef struct View3D {
    /* USE = user setting, DRAW = based on selection */
 #define V3D_USE_MANIPULATOR            1
 #define V3D_DRAW_MANIPULATOR   2
-#define V3D_CALC_MANIPULATOR   4
+/* #define V3D_CALC_MANIPULATOR        4 */ /*UNUSED*/
 
 /* BGPic->flag */
 /* may want to use 1 for select ?*/

diff --git a/source/gameengine/Expressions/Value.h b/source/gameengine/Expressions/Value.h
index e6ea431ec1c4bada2eb09e345658fe6c021a2f88..b4bb34b0331668d81cf02748313e89d4f036c83e 100644 (file)
--- a/source/gameengine/Expressions/Value.h
+++ b/source/gameengine/Expressions/Value.h
@@ -75,8 +75,6 @@
 #endif //WIN32
 #endif
 
-#define EDITOR_LEVEL_VERSION 0x06
-
 enum VALUE_OPERATOR {
        
        VALUE_MOD_OPERATOR,                     // %