Page MenuHome
Differential D2889 Diff 11194 source/blender/makesdna/DNA_scene_types.h

Changeset View

Standalone View

View Options

source/blender/makesdna/DNA_scene_types.h

Show First 20 Lines • Show All 60 Lines • ▼ Show 20 Lines
struct Image; struct Image;
struct Collection; struct Collection;
struct Text; struct Text;
struct bNodeTree; struct bNodeTree;
struct AnimData; struct AnimData;
struct Editing; struct Editing;
struct SceneStats; struct SceneStats;
struct bGPdata; struct bGPdata;
struct bGPDbrush;
struct MovieClip; struct MovieClip;
struct ColorSpace; struct ColorSpace;
struct SceneCollection; struct SceneCollection;
/* ************************************************************* */ /* ************************************************************* */
/* Scene Data */ /* Scene Data */
/* ************************************************************* */ /* ************************************************************* */
▲ Show 20 Lines • Show All 603 Lines • ▼ Show 20 Linestypedef struct RenderData {
char seq_prev_type; char seq_prev_type;
char seq_rend_type; /* UNUSED! */ char seq_rend_type; /* UNUSED! */
char seq_flag; /* flag use for sequence render/draw */ char seq_flag; /* flag use for sequence render/draw */
char pad5[5]; char pad5[5];
/* render simplify */ /* render simplify */
short simplify_subsurf; short simplify_subsurf;
short simplify_subsurf_render; short simplify_subsurf_render;
short pad9, pad10; short simplify_gpencil;
short pad10;
float simplify_particles; float simplify_particles;
float simplify_particles_render; float simplify_particles_render;
/* Freestyle line thickness options */ /* Freestyle line thickness options */
int line_thickness_mode; int line_thickness_mode;
float unit_line_thickness; /* in pixels */ float unit_line_thickness; /* in pixels */
/* render engine */ /* render engine */
▲ Show 20 Lines • Show All 202 Lines • ▼ Show 20 Linestypedef struct Sculpt {
struct Object *gravity_object; struct Object *gravity_object;
} Sculpt; } Sculpt;
typedef struct UvSculpt { typedef struct UvSculpt {
Paint paint; Paint paint;
} UvSculpt; } UvSculpt;
/* grease pencil drawing brushes */
typedef struct GpPaint {
Paint paint;
} GpPaint;
/* ------------------------------------------- */ /* ------------------------------------------- */
/* Vertex Paint */ /* Vertex Paint */
/* Vertex Paint */ /* Vertex Paint */
typedef struct VPaint { typedef struct VPaint {
Paint paint; Paint paint;
char flag; char flag;
char pad[3]; char pad[3];
int radial_symm[3]; /* For mirrored painting */ int radial_symm[3]; /* For mirrored painting */
} VPaint; } VPaint;
/* VPaint.flag */ /* VPaint.flag */
enum { enum {
/* weight paint only */ /* weight paint only */
VP_FLAG_VGROUP_RESTRICT = (1 << 7) VP_FLAG_VGROUP_RESTRICT = (1 << 7)
}; };
/* ------------------------------------------- */ /* ------------------------------------------- */
/* GPencil Stroke Sculpting */ /* GPencil Stroke Sculpting */
/* GP_BrushEdit_Settings.brushtype */ /* GP_BrushEdit_Settings.brushtype */
typedef enum eGP_EditBrush_Types { typedef enum eGP_EditBrush_Types {
GP_EDITBRUSH_TYPE_SMOOTH = 0, GP_EDITBRUSH_TYPE_SMOOTH = 0,
GP_EDITBRUSH_TYPE_THICKNESS = 1, GP_EDITBRUSH_TYPE_THICKNESS = 1,
GP_EDITBRUSH_TYPE_GRAB = 2, GP_EDITBRUSH_TYPE_STRENGTH = 2,
GP_EDITBRUSH_TYPE_PUSH = 3, GP_EDITBRUSH_TYPE_GRAB = 3,
GP_EDITBRUSH_TYPE_TWIST = 4, GP_EDITBRUSH_TYPE_PUSH = 4,
GP_EDITBRUSH_TYPE_PINCH = 5, GP_EDITBRUSH_TYPE_TWIST = 5,
GP_EDITBRUSH_TYPE_RANDOMIZE = 6, GP_EDITBRUSH_TYPE_PINCH = 6,
GP_EDITBRUSH_TYPE_SUBDIVIDE = 7, GP_EDITBRUSH_TYPE_RANDOMIZE = 7,
GP_EDITBRUSH_TYPE_SIMPLIFY = 8, GP_EDITBRUSH_TYPE_CLONE = 8,
GP_EDITBRUSH_TYPE_CLONE = 9, GP_EDITBRUSH_TYPE_SUBDIVIDE = 9,
GP_EDITBRUSH_TYPE_STRENGTH = 10, GP_EDITBRUSH_TYPE_SIMPLIFY = 10,
/* add any sculpt brush above this value */
GP_EDITBRUSH_TYPE_WEIGHT = 11,
/* add any weight paint brush below this value. Do no mix brushes */
/* !!! Update GP_EditBrush_Data brush[###]; below !!! */ /* !!! Update GP_EditBrush_Data brush[###]; below !!! */
TOT_GP_EDITBRUSH_TYPES TOT_GP_EDITBRUSH_TYPES
} eGP_EditBrush_Types; } eGP_EditBrush_Types;
/* GP_BrushEdit_Settings.lock_axis */ /* GP_BrushEdit_Settings.lock_axis */
typedef enum eGP_Lockaxis_Types { typedef enum eGP_Lockaxis_Types {
GP_LOCKAXIS_NONE = 0, GP_LOCKAXIS_NONE = 0,
GP_LOCKAXIS_X = 1, GP_LOCKAXIS_X = 1,
GP_LOCKAXIS_Y = 2, GP_LOCKAXIS_Y = 2,
GP_LOCKAXIS_Z = 3 GP_LOCKAXIS_Z = 3
} eGP_Lockaxis_Types; } eGP_Lockaxis_Types;
/* Settings for a GPencil Stroke Sculpting Brush */ /* Settings for a GPencil Stroke Sculpting Brush */
typedef struct GP_EditBrush_Data { typedef struct GP_EditBrush_Data {
short size; /* radius of brush */ short size; /* radius of brush */
short flag; /* eGP_EditBrush_Flag */ short flag; /* eGP_EditBrush_Flag */
float strength; /* strength of effect */ float strength; /* strength of effect */
float curcolor_add[3]; /* cursor color for add */
float curcolor_sub[3]; /* cursor color for sub */
} GP_EditBrush_Data; } GP_EditBrush_Data;
/* GP_EditBrush_Data.flag */ /* GP_EditBrush_Data.flag */
typedef enum eGP_EditBrush_Flag { typedef enum eGP_EditBrush_Flag {
/* invert the effect of the brush */ /* invert the effect of the brush */
GP_EDITBRUSH_FLAG_INVERT = (1 << 0), GP_EDITBRUSH_FLAG_INVERT = (1 << 0),
/* adjust strength using pen pressure */ /* adjust strength using pen pressure */
GP_EDITBRUSH_FLAG_USE_PRESSURE = (1 << 1), GP_EDITBRUSH_FLAG_USE_PRESSURE = (1 << 1),
/* strength of brush falls off with distance from cursor */ /* strength of brush falls off with distance from cursor */
GP_EDITBRUSH_FLAG_USE_FALLOFF = (1 << 2), GP_EDITBRUSH_FLAG_USE_FALLOFF = (1 << 2),
/* smooth brush affects pressure values as well */ /* smooth brush affects pressure values as well */
GP_EDITBRUSH_FLAG_SMOOTH_PRESSURE = (1 << 3) GP_EDITBRUSH_FLAG_SMOOTH_PRESSURE = (1 << 3),
/* enable screen cursor */
GP_EDITBRUSH_FLAG_ENABLE_CURSOR = (1 << 4),
/* temporary invert action */
GP_EDITBRUSH_FLAG_TMP_INVERT = (1 << 5),
} eGP_EditBrush_Flag; } eGP_EditBrush_Flag;
/* GPencil Stroke Sculpting Settings */ /* GPencil Stroke Sculpting Settings */
typedef struct GP_BrushEdit_Settings { typedef struct GP_BrushEdit_Settings {
GP_EditBrush_Data brush[11]; /* TOT_GP_EDITBRUSH_TYPES */ GP_EditBrush_Data brush[12]; /* TOT_GP_EDITBRUSH_TYPES */
void *paintcursor; /* runtime */ void *paintcursor; /* runtime */
mont29Unsubmitted
Not Done
Inline Actions

Why the reordering here?

mont29: Why the reordering here?
int brushtype; /* eGP_EditBrush_Types */ int brushtype; /* eGP_EditBrush_Types (sculpt) */
int flag; /* eGP_BrushEdit_SettingsFlag */ int flag; /* eGP_BrushEdit_SettingsFlag */
mont29Unsubmitted
Not Done
Inline Actions

This is very weak? Means every type you add a new sculpt brush you shift all you weight ones?

Also, why put them in same enum, since they are used in two different modes... and even assigned to two different variables!

mont29: This is very weak? Means every type you add a new sculpt brush you shift all you weight ones?
antoniovAuthorUnsubmitted
Not Done
Inline Actions

I think there are some misunderstanding here:

  1. The user cannot add new brushes or delete existing ones. These are predefined tools, not like paint or sculpt brushes. This is the original sculpt tools implementation since version 2.7x. The brushes are predefined in an array and depending of the index a different tools is called.
  1. The reason to reuse is because the weight paint is only a sculpt brush that reuse the same tool management and code loops. The reason to put at the end is only to manage the UI and keymaps.
antoniov: I think there are some misunderstanding here: 1) The user cannot add new brushes or delete…
int lock_axis; /* eGP_Lockaxis_Types lock drawing to one axis */ int lock_axis; /* eGP_Lockaxis_Types lock drawing to one axis */
float alpha; /* alpha factor for selection color */ float alpha; /* alpha factor for selection color */
/* weight paint is a submode of sculpt but use its own index. All weight paint
* brushes must be defined at the end of the brush array.
*/
int weighttype; /* eGP_EditBrush_Types (weight paint) */
char pad[4];
struct CurveMapping *cur_falloff; /* multiframe edit falloff effect by frame */
} GP_BrushEdit_Settings; } GP_BrushEdit_Settings;
/* GP_BrushEdit_Settings.flag */ /* GP_BrushEdit_Settings.flag */
typedef enum eGP_BrushEdit_SettingsFlag { typedef enum eGP_BrushEdit_SettingsFlag {
/* only affect selected points */ /* only affect selected points */
GP_BRUSHEDIT_FLAG_SELECT_MASK = (1 << 0), GP_BRUSHEDIT_FLAG_SELECT_MASK = (1 << 0),
/* apply brush to position */ /* apply brush to position */
GP_BRUSHEDIT_FLAG_APPLY_POSITION = (1 << 1), GP_BRUSHEDIT_FLAG_APPLY_POSITION = (1 << 1),
/* apply brush to strength */ /* apply brush to strength */
GP_BRUSHEDIT_FLAG_APPLY_STRENGTH = (1 << 2), GP_BRUSHEDIT_FLAG_APPLY_STRENGTH = (1 << 2),
/* apply brush to thickness */ /* apply brush to thickness */
GP_BRUSHEDIT_FLAG_APPLY_THICKNESS = (1 << 3), GP_BRUSHEDIT_FLAG_APPLY_THICKNESS = (1 << 3),
/* apply brush to thickness */
GP_BRUSHEDIT_FLAG_WEIGHT_MODE = (1 << 4),
/* enable falloff for multiframe editing */
GP_BRUSHEDIT_FLAG_FRAME_FALLOFF = (1 << 5),
/* apply brush to uv data */
GP_BRUSHEDIT_FLAG_APPLY_UV = (1 << 6),
} eGP_BrushEdit_SettingsFlag; } eGP_BrushEdit_SettingsFlag;
/* Settings for GP Interpolation Operators */ /* Settings for GP Interpolation Operators */
typedef struct GP_Interpolate_Settings { typedef struct GP_Interpolate_Settings {
short flag; /* eGP_Interpolate_SettingsFlag */ short flag; /* eGP_Interpolate_SettingsFlag */
char type; /* eGP_Interpolate_Type - Interpolation Mode */ char type; /* eGP_Interpolate_Type - Interpolation Mode */
▲ Show 20 Lines • Show All 202 Lines • ▼ Show 20 Lines
/* *************************************************************** */ /* *************************************************************** */
/* Tool Settings */ /* Tool Settings */
typedef struct ToolSettings { typedef struct ToolSettings {
VPaint *vpaint; /* vertex paint */ VPaint *vpaint; /* vertex paint */
VPaint *wpaint; /* weight paint */ VPaint *wpaint; /* weight paint */
Sculpt *sculpt; Sculpt *sculpt;
UvSculpt *uvsculpt; /* uv smooth */ UvSculpt *uvsculpt; /* uv smooth */
GpPaint *gp_paint; /* gpencil paint */
/* Vertex group weight - used only for editmode, not weight /* Vertex group weight - used only for editmode, not weight
* paint */ * paint */
float vgroup_weight; float vgroup_weight;
float doublimit; /* remove doubles limit */ float doublimit; /* remove doubles limit */
short automerge; short automerge;
/* Selection Mode for Mesh */ /* Selection Mode for Mesh */
short selectmode; short selectmode;
/* UV Calculation */ /* UV Calculation */
char unwrapper; char unwrapper;
char uvcalc_flag; char uvcalc_flag;
char uv_flag; char uv_flag;
char uv_selectmode; char uv_selectmode;
float uvcalc_margin; float uvcalc_margin;
/* Auto-IK */ /* Auto-IK */
short autoik_chainlen; /* runtime only */ short autoik_chainlen; /* runtime only */
/* Grease Pencil */ /* Grease Pencil */
char gpencil_flags; /* flags/options for how the tool works */ char gpencil_flags; /* flags/options for how the tool works */
char gpencil_src; /* for main 3D view Grease Pencil, where data comes from */ char gpencil_src; /* for main 3D view Grease Pencil, where data comes from */ /* DEPRECATED */
char gpencil_v3d_align; /* stroke placement settings: 3D View */ char gpencil_v3d_align; /* stroke placement settings: 3D View */
char gpencil_v2d_align; /* : General 2D Editor */ char gpencil_v2d_align; /* : General 2D Editor */
char gpencil_seq_align; /* : Sequencer Preview */ char gpencil_seq_align; /* : Sequencer Preview */
char gpencil_ima_align; /* : Image Editor */ char gpencil_ima_align; /* : Image Editor */
campbellbartonUnsubmitted
Not Done
Inline Actions

Use DNA_DEPRECATED.

campbellbarton: Use `DNA_DEPRECATED`.
char _pad3[4]; char pad6[4];
/* Grease Pencil Sculpt */ /* Grease Pencil Sculpt */
struct GP_BrushEdit_Settings gp_sculpt; struct GP_BrushEdit_Settings gp_sculpt;
/* Grease Pencil Interpolation Tool(s) */ /* Grease Pencil Interpolation Tool(s) */
struct GP_Interpolate_Settings gp_interpolate; struct GP_Interpolate_Settings gp_interpolate;
/* Grease Pencil Drawing Brushes (bGPDbrush) */ /* Grease Pencil Drawing Brushes */
ListBase gp_brushes; ListBase gp_brushes; /* Deprecated*/
/* Image Paint (8 byttse aligned please!) */ /* Image Paint (8 byttse aligned please!) */
struct ImagePaintSettings imapaint; struct ImagePaintSettings imapaint;
/* Particle Editing */ /* Particle Editing */
struct ParticleEditSettings particle; struct ParticleEditSettings particle;
/* Transform Proportional Area of Effect */ /* Transform Proportional Area of Effect */
▲ Show 20 Lines • Show All 229 Lines • ▼ Show 20 Linestypedef struct Scene {
/* User-Defined KeyingSets */ /* User-Defined KeyingSets */
int active_keyingset; /* index of the active KeyingSet. first KeyingSet has index 1, 'none' active is 0, 'add new' is -1 */ int active_keyingset; /* index of the active KeyingSet. first KeyingSet has index 1, 'none' active is 0, 'add new' is -1 */
ListBase keyingsets; /* KeyingSets for this scene */ ListBase keyingsets; /* KeyingSets for this scene */
/* Units */ /* Units */
struct UnitSettings unit; struct UnitSettings unit;
/* Grease Pencil */ /* Grease Pencil */
struct bGPdata *gpd; struct bGPdata *gpd DNA_DEPRECATED;
/* Movie Tracking */ /* Movie Tracking */
struct MovieClip *clip; /* active movie clip */ struct MovieClip *clip; /* active movie clip */
/* Physics simulation settings */ /* Physics simulation settings */
struct PhysicsSettings physics_settings; struct PhysicsSettings physics_settings;
uint64_t customdata_mask; /* XXX. runtime flag for drawing, actually belongs in the window, only used by BKE_object_handle_update() */ uint64_t customdata_mask; /* XXX. runtime flag for drawing, actually belongs in the window, only used by BKE_object_handle_update() */
uint64_t customdata_mask_modal; /* XXX. same as above but for temp operator use (gl renders) */ uint64_t customdata_mask_modal; /* XXX. same as above but for temp operator use (gl renders) */
struct Object *gp_object; /* default GP object for annotations */
/* Color Management */ /* Color Management */
ColorManagedViewSettings view_settings; ColorManagedViewSettings view_settings;
ColorManagedDisplaySettings display_settings; ColorManagedDisplaySettings display_settings;
ColorManagedColorspaceSettings sequencer_colorspace_settings; ColorManagedColorspaceSettings sequencer_colorspace_settings;
/* RigidBody simulation world+settings */ /* RigidBody simulation world+settings */
struct RigidBodyWorld *rigidbody_world; struct RigidBodyWorld *rigidbody_world;
▲ Show 20 Lines • Show All 484 Lines • ▼ Show 20 Lines
/* ToolSettings.gpencil_flags */ /* ToolSettings.gpencil_flags */
typedef enum eGPencil_Flags { typedef enum eGPencil_Flags {
/* "Continuous Drawing" - The drawing operator enters a mode where multiple strokes can be drawn */ /* "Continuous Drawing" - The drawing operator enters a mode where multiple strokes can be drawn */
GP_TOOL_FLAG_PAINTSESSIONS_ON = (1 << 0), GP_TOOL_FLAG_PAINTSESSIONS_ON = (1 << 0),
/* When creating new frames, the last frame gets used as the basis for the new one */ /* When creating new frames, the last frame gets used as the basis for the new one */
GP_TOOL_FLAG_RETAIN_LAST = (1 << 1), GP_TOOL_FLAG_RETAIN_LAST = (1 << 1),
/* Add the strokes below all strokes in the layer */ /* Add the strokes below all strokes in the layer */
GP_TOOL_FLAG_PAINT_ONBACK = (1 << 2) GP_TOOL_FLAG_PAINT_ONBACK = (1 << 2),
} eGPencil_Flags; } eGPencil_Flags;
/* ToolSettings.gpencil_src */ /* scene->r.simplify_gpencil */
typedef enum eGPencil_Source_3D { typedef enum eGPencil_SimplifyFlags {
GP_TOOL_SOURCE_SCENE = 0, /* Simplify */
GP_TOOL_SOURCE_OBJECT = 1 SIMPLIFY_GPENCIL_ENABLE = (1 << 0),
} eGPencil_Source_3d; /* Simplify on play */
SIMPLIFY_GPENCIL_ON_PLAY = (1 << 1),
/* Simplify fill on viewport */
SIMPLIFY_GPENCIL_FILL = (1 << 2),
/* Simplify modifier on viewport */
SIMPLIFY_GPENCIL_MODIFIER = (1 << 3),
/* Remove fill external line */
SIMPLIFY_GPENCIL_REMOVE_FILL_LINE = (1 << 4)
} eGPencil_SimplifyFlags;
/* ToolSettings.gpencil_*_align - Stroke Placement mode flags */ /* ToolSettings.gpencil_*_align - Stroke Placement mode flags */
typedef enum eGPencil_Placement_Flags { typedef enum eGPencil_Placement_Flags {
/* New strokes are added in viewport/data space (i.e. not screen space) */ /* New strokes are added in viewport/data space (i.e. not screen space) */
GP_PROJECT_VIEWSPACE = (1 << 0), GP_PROJECT_VIEWSPACE = (1 << 0),
/* Viewport space, but relative to render canvas (Sequencer Preview Only) */ /* Viewport space, but relative to render canvas (Sequencer Preview Only) */
GP_PROJECT_CANVAS = (1 << 1), GP_PROJECT_CANVAS = (1 << 1),
/* Project into the screen's Z values */ /* Project into the screen's Z values */
GP_PROJECT_DEPTH_VIEW = (1 << 2), GP_PROJECT_DEPTH_VIEW = (1 << 2),
GP_PROJECT_DEPTH_STROKE = (1 << 3), GP_PROJECT_DEPTH_STROKE = (1 << 3),
/* "Use Endpoints" */ /* "Use Endpoints" */
GP_PROJECT_DEPTH_STROKE_ENDPOINTS = (1 << 4), GP_PROJECT_DEPTH_STROKE_ENDPOINTS = (1 << 4),
GP_PROJECT_CURSOR = (1 << 5),
} eGPencil_Placement_Flags; } eGPencil_Placement_Flags;
/* ToolSettings.particle flag */ /* ToolSettings.particle flag */
#define PE_KEEP_LENGTHS 1 #define PE_KEEP_LENGTHS 1
#define PE_LOCK_FIRST 2 #define PE_LOCK_FIRST 2
#define PE_DEFLECT_EMITTER 4 #define PE_DEFLECT_EMITTER 4
#define PE_INTERPOLATE_ADDED 8 #define PE_INTERPOLATE_ADDED 8
#define PE_DRAW_PART 16 #define PE_DRAW_PART 16
▲ Show 20 Lines • Show All 68 Lines • Show Last 20 Lines