merge trunk 17122:17213

[blender-staging.git] / source / blender / makesdna / DNA_scene_types.h

diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index c1c164f136f4427708581acfaa031be5be1af20a..b5e588ee7470de668086d0a21ac8a70a0716dcf8 100644 (file)
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -445,8 +445,13 @@ typedef struct ToolSettings {
        
        char tpad[6];
        
+       /* Skeleton Sketching */
+       char bone_sketching;
+       char skgen_subdivision_number;
+       
        /* Alt+RMB option */
        char edge_mode;
+       char pad3[6];
 } ToolSettings;
 
 /* Used by all brushes to store their properties, which can be directly set
@@ -858,6 +863,7 @@ typedef struct Scene {
 #define SKGEN_DISP_ORIG                        (1 << 12)
 #define SKGEN_DISP_EMBED               (1 << 13)
 #define SKGEN_DISP_INDEX               (1 << 14)
+#define        SKGEN_CUT_FIXED                 64
 
 #define        SKGEN_SUB_LENGTH                0
 #define        SKGEN_SUB_ANGLE                 1
@@ -869,6 +875,10 @@ typedef struct Scene {
 #define SKGEN_AVERAGE                  1
 #define SKGEN_SHARPEN                  2
 
+/* toolsettings->bone_sketching */
+#define BONE_SKETCHING                 1
+#define BONE_SKETCHING_QUICK   2
+
 #ifdef __cplusplus
 }
 #endif