diff options
Diffstat (limited to 'source/blender/makesdna/DNA_scene_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 40 |
1 files changed, 13 insertions, 27 deletions
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 73afc3d1a53..4a3d555ca33 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -47,8 +47,6 @@ struct Text; struct bNodeTree; struct AnimData; struct Editing; -struct SceneStats; -struct bGPdata; typedef struct Base { struct Base *next, *prev; @@ -456,11 +454,8 @@ typedef struct Paint { Brush **brushes; int active_brush_index, brush_count; - /* WM Paint cursor */ + /* WM handle */ void *paint_cursor; - unsigned char paint_cursor_col[4]; - - int pad; } Paint; typedef struct ImagePaintSettings { @@ -488,15 +483,10 @@ typedef struct ParticleEditSettings { ParticleBrushData brush[7]; /* 7 = PE_TOT_BRUSH */ void *paintcursor; /* runtime */ - float emitterdist, rt; - - int selectmode; - int edittype; + float emitterdist; + int draw_timed; - int draw_step, fade_frames; - - struct Scene *scene; - struct Object *object; + int selectmode, pad; } ParticleEditSettings; typedef struct TransformOrientation { @@ -507,6 +497,9 @@ typedef struct TransformOrientation { typedef struct Sculpt { Paint paint; + + /* WM handle */ + void *cursor; /* For rotating around a pivot point */ float pivot[3]; @@ -724,9 +717,7 @@ typedef struct Scene { /* Units */ struct UnitSettings unit; - - /* Grease Pencil */ - struct bGPdata *gpd; + } Scene; @@ -1047,10 +1038,9 @@ typedef enum SculptFlags { #define PE_LOCK_FIRST 2 #define PE_DEFLECT_EMITTER 4 #define PE_INTERPOLATE_ADDED 8 -#define PE_DRAW_PART 16 +#define PE_SHOW_CHILD 16 +#define PE_SHOW_TIME 32 #define PE_X_MIRROR 64 -#define PE_FADE_TIME 128 -#define PE_AUTO_VELOCITY 256 /* toolsetting->particle brushtype */ #define PE_BRUSH_NONE -1 @@ -1059,15 +1049,11 @@ typedef enum SculptFlags { #define PE_BRUSH_LENGTH 2 #define PE_BRUSH_PUFF 3 #define PE_BRUSH_ADD 4 -#define PE_BRUSH_SMOOTH 5 +#define PE_BRUSH_WEIGHT 5 +#define PE_BRUSH_SMOOTH 6 /* this must equal ParticleEditSettings.brush array size */ -#define PE_TOT_BRUSH 6 - -/* tooksettings->particle edittype */ -#define PE_TYPE_PARTICLES 0 -#define PE_TYPE_SOFTBODY 1 -#define PE_TYPE_CLOTH 2 +#define PE_TOT_BRUSH 7 /* toolsettings->retopo_mode */ #define RETOPO 1 |