diff options
Diffstat (limited to 'source/blender/makesdna/DNA_scene_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 3ac11eabe54..cc5d256615e 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -36,12 +36,12 @@ extern "C" { #endif -#include "DNA_brush_types.h" #include "DNA_vec_types.h" #include "DNA_listBase.h" #include "DNA_ID.h" struct Object; +struct Brush; struct World; struct Scene; struct Image; @@ -345,7 +345,7 @@ typedef struct RenderData { short bake_normal_space, bake_quad_split; float bake_maxdist, bake_biasdist, bake_pad; - /* paths to backbufffer, output, ftype */ + /* paths to backbufffer, output */ char backbuf[160], pic[160]; /* stamps flags. */ @@ -507,9 +507,7 @@ typedef struct TimeMarker { } TimeMarker; typedef struct Paint { - /* Array of brushes selected for use in this paint mode */ - Brush **brushes; - int active_brush_index, brush_count; + struct Brush *brush; /* WM Paint cursor */ void *paint_cursor; @@ -724,8 +722,16 @@ typedef struct ToolSettings { /* Transform */ short snap_mode, snap_flag, snap_target; short proportional, prop_mode; + char proportional_objects; /* proportional edit, object mode */ + char pad[3]; - int auto_normalize, intpad; /*auto normalizing mode in wpaint*/ + int auto_normalize; /*auto normalizing mode in wpaint*/ + + short sculpt_paint_settings; /* user preferences for sculpt and paint */ + short pad1; + int sculpt_paint_unified_size; /* unified radius of brush in pixels */ + float sculpt_paint_unified_unprojected_radius;/* unified radius of brush in Blender units */ + float sculpt_paint_unified_alpha; /* unified strength of brush */ } ToolSettings; typedef struct bStats { @@ -789,6 +795,7 @@ typedef struct Scene { void *sound_scene; void *sound_scene_handle; + void *sound_scrub_handle; void *fps_info; /* (runtime) info/cache used for presenting playback framerate info to the user */ @@ -953,8 +960,8 @@ typedef struct Scene { /* imtype */ #define R_TARGA 0 #define R_IRIS 1 -#define R_HAMX 2 -#define R_FTYPE 3 /* ftype is nomore */ +/* #define R_HAMX 2 */ /* hamx is nomore */ +/* #define R_FTYPE 3 */ /* ftype is nomore */ #define R_JPEG90 4 #define R_MOVIE 5 #define R_IRIZ 7 @@ -1141,6 +1148,13 @@ typedef enum SculptFlags { SCULPT_USE_OPENMP = (1<<7), } SculptFlags; +/* sculpt_paint_settings */ +#define SCULPT_PAINT_USE_UNIFIED_SIZE (1<<0) +#define SCULPT_PAINT_USE_UNIFIED_ALPHA (1<<1) +#define SCULPT_PAINT_UNIFIED_LOCK_BRUSH_SIZE (1<<2) +#define SCULPT_PAINT_UNIFIED_SIZE_PRESSURE (1<<3) +#define SCULPT_PAINT_UNIFIED_ALPHA_PRESSURE (1<<4) + /* ImagePaintSettings.flag */ #define IMAGEPAINT_DRAWING 1 #define IMAGEPAINT_DRAW_TOOL 2 |