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

Changeset View

Standalone View

View Options

source/blender/makesdna/DNA_scene_types.h

Context not available.
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;
Context not available.
Paint paint; Paint paint;
} UvSculpt; } UvSculpt;
/* grease pencil drawing brushes */
typedef struct GpPaint {
Paint paint;
} GpPaint;
/* ------------------------------------------- */ /* ------------------------------------------- */
/* Vertex Paint */ /* Vertex Paint */
Context not available.
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,
mont29Unsubmitted
Not Done
Inline Actions

Why the reordering here?

mont29: Why the reordering here?
/* add any sculpt brush above this value */
GP_EDITBRUSH_TYPE_WEIGHT = 11,
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…
/* 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
Context not available.
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 */
Context not available.
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 */
int brushtype; /* eGP_EditBrush_Types */ int brushtype; /* eGP_EditBrush_Types (sculpt) */
int flag; /* eGP_BrushEdit_SettingsFlag */ int flag; /* eGP_BrushEdit_SettingsFlag */
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 */
Context not available.
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;
campbellbartonUnsubmitted
Not Done
Inline Actions

Use DNA_DEPRECATED.

campbellbarton: Use `DNA_DEPRECATED`.
Context not available.
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 */
Context not available.
/* 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 */
short gpencil_simplify; /* simplify flags for grease pencil */
char pad6[6];
/* 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;
Context not available.
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;
Context not available.
/* 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 */ /* toolsettings->gpencil_simplify */
typedef enum eGPencil_Source_3D { typedef enum eGPencil_SimplifyFlags {
GP_TOOL_SOURCE_SCENE = 0, /* Simplify */
GP_TOOL_SOURCE_OBJECT = 1 GP_TOOL_FLAG_SIMPLIFY = (1 << 0),
} eGPencil_Source_3d; /* Simplify on play */
GP_TOOL_FLAG_SIMPLIFY_ON_PLAY = (1 << 1),
/* Simplify fill on viewport */
GP_TOOL_FLAG_SIMPLIFY_VIEW_FILL = (1 << 2),
/* Simplify modifier on viewport */
GP_TOOL_FLAG_SIMPLIFY_VIEW_MODIF = (1 << 3),
/* Simplify vfx modifier on viewport */
GP_TOOL_FLAG_SIMPLIFY_VIEW_VFX = (1 << 4),
/* Remove fill external line */
GP_TOOL_FLAG_SIMPLIFY_REMOVE_LINE = (1 << 8),
/* Disable fast drawing */
GP_TOOL_FLAG_DISABLE_FAST_DRAWING = (1 << 9),
} 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 {
Context not available.
/* "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 */
Context not available.