Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/makesdna/DNA_object_types.h')
-rw-r--r--source/blender/makesdna/DNA_object_types.h15
1 files changed, 10 insertions, 5 deletions
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index 3be057959b6..4fe1072b673 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -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
@@ -169,7 +170,7 @@ typedef struct Object {
float mass, damping, inertia;
/* The form factor k is introduced to give the user more control
* and to fix incompatibility problems.
- * For rotational symmetric objects, the inertia value can be
+ * For rotational symmetric objects, the inertia value can be
* expressed as: Theta = k * m * r^2
* where m = Mass, r = Radius
* For a Sphere, the form factor is by default = 0.4
@@ -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