2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r18677:19317

Notes:
* Sequence transform strip uses G.scene global, this is commented
  out now, should be fixed.
* Etch-a-ton code was most difficult to merge. The files already in
  2.5 got merged, but no new files were added. Calls to these files
  are commented out with "XXX etch-a-ton". editarmature.c and
  transform_snap.c were complex to merge. Martin, please check?
* Game engine compiles and links again here for scons/make/cmake
  (player still fails to link).

5 files changed, 44 insertions, 6 deletions

diff --git a/source/blender/makesdna/DNA_curve_types.h b/source/blender/makesdna/DNA_curve_types.h
index d8b5c206ecf..f8ea5f95d65 100644
--- a/source/blender/makesdna/DNA_curve_types.h
+++ b/source/blender/makesdna/DNA_curve_types.h
@@ -263,7 +263,7 @@ typedef struct Curve {
 /* *************** BEZTRIPLE **************** */
 
 /* h1 h2 (beztriple) */
-enum {
+typedef enum eBezTriple_Handle {
 	HD_FREE	= 0,
 	HD_AUTO,
 	HD_VECT,
@@ -272,7 +272,7 @@ enum {
 } eBezTriple_Handle;
 
 /* interpolation modes (used only for BezTriple->ipo) */
-enum {
+typedef enum eBezTriple_Interpolation {
 	BEZT_IPO_CONST = 0,	/* constant interpolation */
 	BEZT_IPO_LIN,		/* linear interpolation */
 	BEZT_IPO_BEZ,		/* bezier interpolation */
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index 6826329627b..64e335fb3ad 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -427,6 +427,12 @@ extern Object workob;
 
 /* ob->gameflag2 */
 #define OB_NEVER_DO_ACTIVITY_CULLING	1
+#define OB_LOCK_RIGID_BODY_X_AXIS	4
+#define OB_LOCK_RIGID_BODY_Y_AXIS	8
+#define OB_LOCK_RIGID_BODY_Z_AXIS	16
+#define OB_LOCK_RIGID_BODY_X_ROT_AXIS	32
+#define OB_LOCK_RIGID_BODY_Y_ROT_AXIS	64
+#define OB_LOCK_RIGID_BODY_Z_ROT_AXIS	128
 
 #define OB_LIFE			(OB_PROP|OB_DYNAMIC|OB_ACTOR|OB_MAINACTOR|OB_CHILD)
 
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 067e3d0c2d0..d5828f7e3a3 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -502,12 +502,21 @@ typedef struct ToolSettings {
 	char  skgen_postpro_passes;
 	char  skgen_subdivisions[3];
 	char  skgen_multi_level;
-	char  skgen_optimisation_method;
-
-	char tpad[2];
-
+	int   skgen_pad;
+	
+	/* Skeleton Sketching */
+	struct Object *skgen_template;
+	char bone_sketching;
+	char bone_sketching_convert;
+	char skgen_subdivision_number;
+	char skgen_retarget_options;
+	char skgen_retarget_roll;
+	char skgen_side_string[8];
+	char skgen_num_string[8];
+	
 	/* Alt+RMB option */
 	char edge_mode;
+	char pad3[2];
 } ToolSettings;
 
 typedef struct bStats {
@@ -775,6 +784,7 @@ typedef struct Scene {
 /* scene->snap_flag */
 #define SCE_SNAP				1
 #define SCE_SNAP_ROTATE			2
+#define SCE_SNAP_PEEL_OBJECT	4
 /* scene->snap_target */
 #define SCE_SNAP_TARGET_CLOSEST	0
 #define SCE_SNAP_TARGET_CENTER	1
@@ -784,6 +794,7 @@ typedef struct Scene {
 #define SCE_SNAP_MODE_VERTEX	0
 #define SCE_SNAP_MODE_EDGE		1
 #define SCE_SNAP_MODE_FACE		2
+#define SCE_SNAP_MODE_VOLUME	3
 
 /* sce->selectmode */
 #define SCE_SELECT_VERTEX	1 /* for mesh */
@@ -933,6 +944,25 @@ typedef enum SculptFlags {
 #define SKGEN_AVERAGE			1
 #define SKGEN_SHARPEN			2
 
+/* toolsettings->bone_sketching */
+#define BONE_SKETCHING			1
+#define BONE_SKETCHING_QUICK	2
+#define BONE_SKETCHING_ADJUST	4
+
+/* toolsettings->bone_sketching_convert */
+#define	SK_CONVERT_CUT_FIXED			0
+#define	SK_CONVERT_CUT_LENGTH			1
+#define	SK_CONVERT_CUT_ADAPTATIVE		2
+#define	SK_CONVERT_RETARGET				3
+
+/* toolsettings->skgen_retarget_options */
+#define	SK_RETARGET_AUTONAME			1
+
+/* toolsettings->skgen_retarget_roll */
+#define	SK_RETARGET_ROLL_VIEW			1
+#define	SK_RETARGET_ROLL_JOINT			2
+
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/source/blender/makesdna/DNA_sensor_types.h b/source/blender/makesdna/DNA_sensor_types.h
index d8a1ffc6c24..2cae2cc8ccb 100644
--- a/source/blender/makesdna/DNA_sensor_types.h
+++ b/source/blender/makesdna/DNA_sensor_types.h
@@ -238,6 +238,7 @@ typedef struct bJoystickSensor {
  * */
 /*  #define SENS_COLLISION_PROPERTY 0  */
 #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_XRAY			2
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index 686119f77fa..d4dffddcdcc 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -580,6 +580,7 @@ typedef struct SpaceImaSel {
 #define SI_SMOOTH_UV	1<<20
 #define SI_DRAW_STRETCH	1<<21
 #define SI_DISPGP		1<<22
+#define SI_DRAW_OTHER	1<<23
 
 /* SpaceIpo->flag (Graph Editor Settings) */
 #define SIPO_LOCK_VIEW			(1<<0)