diff options
Diffstat (limited to 'source/blender/makesdna/DNA_scene_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 49f8b3cd4d0..9ac506696ad 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -849,7 +849,7 @@ typedef struct ImagePaintSettings { struct Image *clone; /* clone layer for image mode for projective texture painting */ struct Image *canvas; /* canvas when the explicit system is used for painting */ float stencil_col[3]; - float pad1; + float dither; /* dither amount used when painting on byte images */ } ImagePaintSettings; /* ------------------------------------------- */ @@ -882,6 +882,7 @@ typedef struct ParticleEditSettings { struct Scene *scene; struct Object *object; + struct Object *shape_object; } ParticleEditSettings; /* ------------------------------------------- */ @@ -1216,6 +1217,21 @@ typedef struct PhysicsSettings { int flag, quick_cache_step, rt; } PhysicsSettings; +/* ------------------------------------------- */ +/* Safe Area options used in Camera View & VSE + */ +typedef struct DisplaySafeAreas { + /* each value represents the (x,y) margins as a multiplier. + * 'center' in this context is just the name for a different kind of safe-area */ + + float title[2]; /* Title Safe */ + float action[2]; /* Image/Graphics Safe */ + + /* use for alternate aspect ratio */ + float title_center[2]; + float action_center[2]; +} DisplaySafeAreas; + /* *************************************************************** */ /* Scene ID-Block */ @@ -1251,6 +1267,7 @@ typedef struct Scene { struct ToolSettings *toolsettings; /* default allocated now */ struct SceneStats *stats; /* default allocated now */ + struct DisplaySafeAreas safe_areas; /* migrate or replace? depends on some internal things... */ /* no, is on the right place (ton) */ @@ -1608,7 +1625,8 @@ extern const char *RE_engine_id_CYCLES; #define PROP_LIN 4 #define PROP_CONST 5 #define PROP_RANDOM 6 -#define PROP_MODE_MAX 7 +#define PROP_INVSQUARE 7 +#define PROP_MODE_MAX 8 /* toolsettings->proportional */ #define PROP_EDIT_OFF 0 |