Merge from Harmonic Skeleton branch

This code adds a basic and simple skeleton generator.

Examples and links are in the wiki, docs will come eventually: http://wiki.blender.org/index.php/User:Theeth/skeletor

In a nutshell, select a vertex at the top of the head and press "Generate Skeleton". UI Panel is in the Editing buttons in Edit Mode, tooltips and semi-useful.

1 files changed, 34 insertions, 2 deletions

diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index f9418d1fc85..2dfe0ac43b6 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -364,7 +364,7 @@ typedef struct ToolSettings {
 	short uvcalc_flag;
 
 	short pad2;
-	
+
 	/* Image Paint (8 byte aligned please!) */
 	struct ImagePaintSettings imapaint;
 
@@ -385,7 +385,21 @@ typedef struct ToolSettings {
 	/* Multires */
 	char multires_subdiv_type;
 	
-	char  pad4[2];
+	/* Skeleton generation */
+	short skgen_resolution;
+	float skgen_threshold_internal;
+	float skgen_threshold_external;
+	float skgen_length_ratio;
+	float skgen_length_limit;
+	float skgen_angle_limit;
+	float skgen_correlation_limit;
+	float skgen_symmetry_limit;
+	short skgen_options;
+	char  skgen_postpro;
+	char  skgen_postpro_passes;
+	char  skgen_subdivisions[3];
+	
+	char pad3[5];
 } ToolSettings;
 
 /* Used by all brushes to store their properties, which can be directly set
@@ -723,6 +737,24 @@ typedef struct Scene {
 #define RETOPO_LINE 2
 #define RETOPO_ELLIPSE 4
 
+/* toolsettings->skgen_options */
+#define SKGEN_FILTER_INTERNAL	1
+#define SKGEN_FILTER_EXTERNAL	2
+#define	SKGEN_SYMMETRY			4
+#define	SKGEN_CUT_LENGTH		8
+#define	SKGEN_CUT_ANGLE			16
+#define	SKGEN_CUT_CORRELATION	32
+
+#define	SKGEN_SUB_LENGTH		0
+#define	SKGEN_SUB_ANGLE			1
+#define	SKGEN_SUB_CORRELATION	2
+#define	SKGEN_SUB_TOTAL			3
+
+/* toolsettings->skgen_postpro */
+#define SKGEN_SMOOTH			0
+#define SKGEN_AVERAGE			1
+#define SKGEN_SHARPEN			2
+
 #ifdef __cplusplus
 }
 #endif