diff options
Diffstat (limited to 'source/blender/makesdna/DNA_object_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index b572c50a4ae..273b885f407 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -35,7 +35,7 @@ #include "DNA_listBase.h" #include "DNA_ID.h" -#include "DNA_action_types.h" +#include "DNA_action_types.h" /* bAnimVizSettings */ #ifdef __cplusplus extern "C" { @@ -62,6 +62,7 @@ typedef struct bDeformGroup { struct bDeformGroup *next, *prev; char name[32]; } bDeformGroup; +#define MAX_VGROUP_NAME 32 /** * The following illustrates the orientation of the @@ -300,7 +301,7 @@ extern Object workob; #define OB_LAMP 10 #define OB_CAMERA 11 -#define OB_WAVE 21 +// #define OB_WAVE 21 #define OB_LATTICE 22 /* 23 and 24 are for life and sector (old file compat.) */ @@ -411,14 +412,15 @@ extern Object workob; #define BA_HAS_RECALC_OB 4 #define BA_HAS_RECALC_DATA 8 - // XXX DEPRECEATED SETTING... -#define BA_DO_IPO 32 + /* 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_TRANSFORM_CHILD 256 /* child of a transformed object */ #define BA_TRANSFORM_PARENT 8192 /* parent of a transformed object */ + /* an initial attempt as making selection more specific! */ #define BA_DESELECT 0 #define BA_SELECT 1 @@ -434,8 +436,10 @@ extern Object workob; #define OB_RECALC_DATA 2 /* time flag is set when time changes need recalc, so baked systems can ignore it */ #define OB_RECALC_TIME 4 -#define OB_RECALC 7 +#define OB_RECALC_ALL 7 +/* controller state */ +#define OB_MAX_STATES 30 /* ob->gameflag */ #define OB_DYNAMIC 1 @@ -493,9 +497,10 @@ extern Object workob; #define OB_ADDCONT 512 #define OB_ADDACT 1024 #define OB_SHOWCONT 2048 -#define OB_SETSTBIT 4096 +#define OB_ALLSTATE 4096 #define OB_INITSTBIT 8192 #define OB_DEBUGSTATE 16384 +#define OB_SHOWSTATE 32768 /* ob->restrictflag */ #define OB_RESTRICT_VIEW 1 @@ -551,6 +556,8 @@ typedef enum ObjectMode { OB_MODE_POSE = 64 } ObjectMode; +#define MAX_DUPLI_RECUR 8 + #ifdef __cplusplus } #endif |