- replaced AUTOSPACE define with {ME_,CU_,MB_}AUTOSPACE,
authorDaniel Dunbar <daniel@zuster.org>
Sun, 14 Mar 2004 16:59:48 +0000 (16:59 +0000)
committerDaniel Dunbar <daniel@zuster.org>
Sun, 14 Mar 2004 16:59:48 +0000 (16:59 +0000)
  different objects shouldn't share flags this way (still sharing of
  other mesh flags in renderer... ickity pickity, but I'm not fixing now)
 - removed some unnecessary uses of DNA_mesh_types.h

17 files changed:
source/blender/blenkernel/intern/curve.c
source/blender/blenkernel/intern/mball.c
source/blender/blenkernel/intern/mesh.c
source/blender/blenkernel/intern/scene.c
source/blender/blenkernel/intern/texture.c
source/blender/makesdna/DNA_curve_types.h
source/blender/makesdna/DNA_lattice_types.h
source/blender/makesdna/DNA_mesh_types.h
source/blender/makesdna/DNA_meta_types.h
source/blender/render/intern/source/pixelshading.c
source/blender/render/intern/source/ray.c
source/blender/src/buttons_logic.c
source/blender/src/buttons_script.c
source/blender/src/drawaction.c
source/blender/src/drawoops.c
source/blender/src/editobject.c
source/blender/src/usiblender.c

index 9101e8aeb9d815696a6f645703dc11d4bd06b90d..886728763b1593208966b7ce29b0a498dac6c1ca 100644 (file)
@@ -53,7 +53,6 @@
 #include "DNA_object_types.h"  
 #include "DNA_curve_types.h"  
 #include "DNA_material_types.h"  
-#include "DNA_mesh_types.h"
 
 /* for dereferencing pointers */
 #include "DNA_ID.h"  
@@ -171,7 +170,7 @@ Curve *add_curve(int type)
        cu->width= 1.0;
        cu->spacing= cu->linedist= 1.0;
        cu->fsize= 1.0;
-       cu->texflag= AUTOSPACE;
+       cu->texflag= CU_AUTOSPACE;
        
        cu->bb= unit_boundbox();
        
@@ -339,7 +338,7 @@ void tex_space_curve(Curve *cu)
        bb->vec[0][2]=bb->vec[3][2]=bb->vec[4][2]=bb->vec[7][2]= loc[2]-size[2];
        bb->vec[1][2]=bb->vec[2][2]=bb->vec[5][2]=bb->vec[6][2]= loc[2]+size[2];
 
-       if(cu->texflag & AUTOSPACE) {
+       if(cu->texflag & CU_AUTOSPACE) {
                VECCOPY(cu->loc, loc);
                VECCOPY(cu->size, size);
                cu->rot[0]= cu->rot[1]= cu->rot[2]= 0.0;
index 393d8e296e8010418d41ffc59c15127f5b949ed8..7657908087d740b7c9c1500590cf63f0221f6b8a 100644 (file)
@@ -48,7 +48,6 @@
 #include "DNA_object_types.h"
 #include "DNA_meta_types.h"
 #include "DNA_scene_types.h"
-#include "DNA_mesh_types.h"
 
 
 #include "BLI_blenlib.h"
@@ -104,7 +103,7 @@ MetaBall *add_mball()
        mb= alloc_libblock(&G.main->mball, ID_MB, "Meta");
        
        mb->size[0]= mb->size[1]= mb->size[2]= 1.0;
-       mb->texflag= AUTOSPACE;
+       mb->texflag= MB_AUTOSPACE;
        
        mb->wiresize= 0.4f;
        mb->rendersize= 0.2f;
index 8313c4bbf939ea5591175b63eebaef33dfe7ae71..99a3574a6177a2f98f595cc4c7e1d34a652c2b64 100644 (file)
@@ -216,7 +216,7 @@ Mesh *add_mesh()
        
        me->size[0]= me->size[1]= me->size[2]= 1.0;
        me->smoothresh= 30;
-       me->texflag= AUTOSPACE;
+       me->texflag= ME_AUTOSPACE;
        me->flag= ME_TWOSIDED;
        me->subdiv= 1;
        me->subdivr = 1;
@@ -397,7 +397,7 @@ void tex_space_mesh(Mesh *me)
 
        boundbox_mesh(me, loc, size);
 
-       if(me->texflag & AUTOSPACE) {
+       if(me->texflag & ME_AUTOSPACE) {
                if(me->key) {
                        kb= me->key->refkey;
                        if (kb) {
index 3dd9ad2180c40703a09c895bb608d1ddbaff1a02..8b21e6b5e78082c1b807cb15b2b4451e1deea4d4 100644 (file)
@@ -62,7 +62,6 @@
 #include "DNA_ika_types.h"
 #include "DNA_lamp_types.h"
 #include "DNA_material_types.h"
-#include "DNA_mesh_types.h"
 #include "DNA_group_types.h"
 #include "DNA_curve_types.h"
 #include "DNA_userdef_types.h"
index ef9431c843b54fb59674045da1a33da1018da082..3bd2b26fb8947c55c1213165bf37d51b73e5823a 100644 (file)
@@ -57,7 +57,6 @@
 
 #include "DNA_texture_types.h"
 #include "DNA_key_types.h"
-#include "DNA_mesh_types.h"
 #include "DNA_object_types.h"
 #include "DNA_lamp_types.h"
 #include "DNA_material_types.h"
index b7bc03364ba172a533d7038a024a3129fab2bed1..7d0f606b81129cd748587595b359c3b5c6d2ba9e 100644 (file)
@@ -162,6 +162,9 @@ typedef struct IpoCurve {
 
 /* **************** CURVE ********************* */
 
+/* texflag */
+#define CU_AUTOSPACE   1
+
 /* flag */
 #define CU_3D                  1
 #define CU_FRONT               2
index 43649467b96de8d96e0ac0bb4c2909bd0402fd69..fc71982fb0e2f4fb19b133d2a5b5135b20a35541 100644 (file)
@@ -1,8 +1,4 @@
 /**
- * blenlib/DNA_mesh_types.h (mar-2001 nzc)
- *
- * Mesh stuff.
- *
  * $Id$ 
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
index 6a4f5260b580b1fd0917e94ef64356d7563ca075..55ab0f14cdd1057727167957348fe7b0c1c056d1 100644 (file)
@@ -1,8 +1,4 @@
 /**
- * blenlib/DNA_mesh_types.h (mar-2001 nzc)
- *
- * Mesh stuff.
- *
  * $Id$ 
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
@@ -154,7 +150,7 @@ typedef struct Mesh {
 /* **************** MESH ********************* */
 
 /* texflag */
-#define AUTOSPACE              1
+#define ME_AUTOSPACE   1
 
 /* me->flag */
 #define ME_ISDONE              1
index 6b1c7e976011ab09798f40a93d88ceae191c78af..9501aac82f687b34016edbcab6c40fd12403915c 100644 (file)
@@ -82,6 +82,9 @@ typedef struct MetaBall {
 
 #define MB_MAXELEM             1024
 
+/* texflag */
+#define MB_AUTOSPACE   1
+
 /* mb->flag */
 #define MB_UPDATE_ALWAYS       0
 #define MB_UPDATE_HALFRES      1
index 425cb44fb3741344602730d69854e4a2281369f5..4b06027299363c17af2e928c3bb7c54fdd35b362 100644 (file)
@@ -46,7 +46,6 @@
 
 #include "DNA_camera_types.h"
 #include "DNA_object_types.h"
-#include "DNA_mesh_types.h"
 #include "DNA_image_types.h"
 #include "DNA_texture_types.h"
 #include "DNA_lamp_types.h"
index 9d9b358a4ea635aca4749ff855572cdfd69b2f45..00bb576aea886ea175de341f6700a2ba5b6c673f 100644 (file)
@@ -37,7 +37,6 @@
 
 #include "DNA_material_types.h"
 #include "DNA_lamp_types.h"
-#include "DNA_mesh_types.h"
 
 #include "BKE_utildefines.h"
 
index 024b164f524f9c9e8406fc64e244ec877a69c8df..9781d3ea1f84b0aa8afbb8dd3d2dff2a72f03fe4 100644 (file)
@@ -63,7 +63,6 @@
 #include "DNA_sound_types.h"
 #include "DNA_text_types.h"
 #include "DNA_view3d_types.h"
-#include "DNA_mesh_types.h"
 
 #include "BKE_library.h"
 #include "BKE_global.h"
index 33040d00708a21fac4574be7221516fa06c0925a..9d769b9d395b7b86e965a999911fa79ad52c6624 100644 (file)
@@ -58,7 +58,6 @@
 #include "DNA_lattice_types.h"
 #include "DNA_material_types.h"
 #include "DNA_meta_types.h"
-#include "DNA_mesh_types.h"
 #include "DNA_object_types.h"
 #include "DNA_radio_types.h"
 #include "DNA_screen_types.h"
index ff94e60c5514898fb3b850641e66ae0c8f58418c..13c2e24f3699882634e27c55f8804178867250c2 100644 (file)
@@ -60,7 +60,6 @@
 #include "DNA_scene_types.h"
 #include "DNA_space_types.h"
 #include "DNA_constraint_types.h"
-#include "DNA_mesh_types.h"
 #include "DNA_key_types.h"
 
 #include "BKE_action.h"
index e96360f45eac23128891ae62a6fa9a0ad3f53714..0ebc6ff443ec6572cb2a005ac6ef56fc4b0042e9 100644 (file)
@@ -48,7 +48,6 @@
 #include "BLI_arithb.h"
 
 #include "DNA_ID.h"
-#include "DNA_mesh_types.h"
 #include "DNA_object_types.h"
 #include "DNA_oops_types.h"
 #include "DNA_scene_types.h"
index 4e40782565744191e0983a09c64a3edbdc4b4cb0..e60efb6aa1e528c2a04ce87b6b71a69a3c186210 100644 (file)
@@ -3228,21 +3228,21 @@ void ob_to_tex_transob(Object *ob, TransOb *tob)
        if(id==0);
        else if( GS(id->name)==ID_ME) {
                me= ob->data;
-               me->texflag &= ~AUTOSPACE;
+               me->texflag &= ~ME_AUTOSPACE;
                tob->loc= me->loc;
                tob->rot= me->rot;
                tob->size= me->size;
        }
        else if( GS(id->name)==ID_CU) {
                cu= ob->data;
-               cu->texflag &= ~AUTOSPACE;
+               cu->texflag &= ~CU_AUTOSPACE;
                tob->loc= cu->loc;
                tob->rot= cu->rot;
                tob->size= cu->size;
        }
        else if( GS(id->name)==ID_MB) {
                mb= ob->data;
-               mb->texflag &= ~AUTOSPACE;
+               mb->texflag &= ~MB_AUTOSPACE;
                tob->loc= mb->loc;
                tob->rot= mb->rot;
                tob->size= mb->size;
index b76753d44b447158b4063e6bd9f3b35d38f6e95b..873847edcd9164a07ec760a4b4c3eeff2eed1085 100644 (file)
@@ -65,7 +65,6 @@
 #include "DNA_object_types.h"
 #include "DNA_space_types.h"
 #include "DNA_userdef_types.h"
-#include "DNA_mesh_types.h"
 
 #include "BKE_blender.h"
 #include "BKE_curve.h"