Merged changes in the trunk up to revision 28600.

7 files changed, 26 insertions, 1 deletions

diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h
index 18b3c1095cc..181ab6f0afa 100644
--- a/source/blender/makesdna/DNA_action_types.h
+++ b/source/blender/makesdna/DNA_action_types.h
@@ -344,6 +344,7 @@ typedef struct bPose {
 	void *ikparam;				/* IK solver parameters, structure depends on iksolver */ 
 	
 	bAnimVizSettings avs;		/* settings for visualisation of bone animation */
+	char proxy_act_bone[32];           /*proxy active bone name*/
 } bPose;
 
 
diff --git a/source/blender/makesdna/DNA_actuator_types.h b/source/blender/makesdna/DNA_actuator_types.h
index a59b748945f..e4b17d33dac 100644
--- a/source/blender/makesdna/DNA_actuator_types.h
+++ b/source/blender/makesdna/DNA_actuator_types.h
@@ -95,7 +95,7 @@ typedef struct bSceneActuator {
 typedef struct bPropertyActuator {
 	int pad, type;
 	char name[32], value[32];
-	struct Object *ob; // not in use anymore
+	struct Object *ob;
 } bPropertyActuator;
 
 typedef struct bObjectActuator {
diff --git a/source/blender/makesdna/DNA_controller_types.h b/source/blender/makesdna/DNA_controller_types.h
index 026f2a489fc..fcd5587b14b 100644
--- a/source/blender/makesdna/DNA_controller_types.h
+++ b/source/blender/makesdna/DNA_controller_types.h
@@ -84,5 +84,9 @@ typedef struct bController {
 /* pyctrl->flag */
 #define CONT_PY_DEBUG	1
 
+/* pyctrl->mode */
+#define CONT_PY_SCRIPT	0
+#define CONT_PY_MODULE	1
+
 #endif
 
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index 15be298f134..51f23ef210f 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -83,6 +83,7 @@ typedef struct ModifierData {
 	struct ModifierData *next, *prev;
 
 	int type, mode;
+	int stackindex, pad;
 	char name[32];
 	
 	/* XXX for timing info set by caller... solve later? (ton) */
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index b572c50a4ae..698492e6715 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 
@@ -436,6 +437,8 @@ extern Object workob;
 #define OB_RECALC_TIME		4
 #define OB_RECALC			7
 
+/* controller state */
+#define OB_MAX_STATES		30
 
 /* ob->gameflag */
 #define OB_DYNAMIC		1
diff --git a/source/blender/makesdna/DNA_sensor_types.h b/source/blender/makesdna/DNA_sensor_types.h
index 3bbcb128f07..6f4b191419e 100644
--- a/source/blender/makesdna/DNA_sensor_types.h
+++ b/source/blender/makesdna/DNA_sensor_types.h
@@ -261,10 +261,14 @@ typedef struct bJoystickSensor {
  * and have a proper default value for this thing.
  * */
 /*  #define SENS_COLLISION_PROPERTY 0  */
+#define SENS_COLLISION_PROPERTY 0 // uncommenting to use with RNA/UI. will check if it's working/fix it later - dfelinto
 #define SENS_COLLISION_MATERIAL 1
 #define SENS_COLLISION_PULSE 2
+
 /* ray specific mode */
 /* X-Ray means that the ray will traverse objects that don't have the property/material */
+#define SENS_RAY_PROPERTY		0
+#define SENS_RAY_MATERIAL		1
 #define SENS_RAY_XRAY			2
 
 /* Some stuff for the mouse sensor Type: */
@@ -277,6 +281,7 @@ typedef struct bJoystickSensor {
 #define BL_SENS_MOUSE_MOUSEOVER      16
 #define BL_SENS_MOUSE_MOUSEOVER_ANY	 32
 
+/* Joystick sensor - sorted by axis types */
 #define SENS_JOY_ANY_EVENT		1
 
 #define SENS_JOY_BUTTON		0			/* axis type */
@@ -292,6 +297,16 @@ typedef struct bJoystickSensor {
 
 #define SENS_JOY_HAT			2		/* axis type */
 #define SENS_JOY_HAT_DIR		0
+#define SENS_JOY_HAT_UP			1
+#define SENS_JOY_HAT_RIGHT		2
+#define SENS_JOY_HAT_DOWN		4
+#define SENS_JOY_HAT_LEFT		8
+
+#define SENS_JOY_HAT_UP_RIGHT	SENS_JOY_HAT_UP | SENS_JOY_HAT_RIGHT
+#define SENS_JOY_HAT_DOWN_RIGHT	SENS_JOY_HAT_DOWN | SENS_JOY_HAT_RIGHT
+#define SENS_JOY_HAT_UP_LEFT	SENS_JOY_HAT_UP | SENS_JOY_HAT_LEFT
+#define SENS_JOY_HAT_DOWN_LEFT	SENS_JOY_HAT_DOWN | SENS_JOY_HAT_LEFT
+
 
 #define SENS_JOY_AXIS_SINGLE	3		/* axis type */
 
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index e7ee04b2328..70419b6a662 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -628,6 +628,7 @@ typedef struct SpaceUserPref {
 #define BUTS_ACT_LINK		256
 #define BUTS_SENS_STATE		512
 #define BUTS_ACT_STATE		1024
+#define BUTS_CONT_INIT_STATE	2048
 
 /* FileSelectParams.display */
 enum FileDisplayTypeE {