Merge branch 'master' into filebrowser_redesign

4 files changed, 84 insertions, 13 deletions

diff --git a/source/blender/makesdna/DNA_gpencil_modifier_types.h b/source/blender/makesdna/DNA_gpencil_modifier_types.h
index 83ee8be7f68..bb6457ee5b8 100644
--- a/source/blender/makesdna/DNA_gpencil_modifier_types.h
+++ b/source/blender/makesdna/DNA_gpencil_modifier_types.h
@@ -80,6 +80,8 @@ typedef struct NoiseGpencilModifierData {
   GpencilModifierData modifier;
   /** Layer name. */
   char layername[64];
+  /** Material name. */
+  char materialname[64];
   /** Optional vertexgroup name, MAX_VGROUP_NAME. */
   char vgname[64];
   /** Custom index for passes. */
@@ -108,12 +110,15 @@ typedef enum eNoiseGpencil_Flag {
   GP_NOISE_INVERT_VGROUP = (1 << 8),
   GP_NOISE_MOD_UV = (1 << 9),
   GP_NOISE_INVERT_LAYERPASS = (1 << 10),
+  GP_NOISE_INVERT_MATERIAL = (1 << 11),
 } eNoiseGpencil_Flag;
 
 typedef struct SubdivGpencilModifierData {
   GpencilModifierData modifier;
   /** Layer name. */
   char layername[64];
+  /** Material name. */
+  char materialname[64];
   /** Custom index for passes. */
   int pass_index;
   /** Flags. */
@@ -129,12 +134,15 @@ typedef enum eSubdivGpencil_Flag {
   GP_SUBDIV_INVERT_LAYER = (1 << 1),
   GP_SUBDIV_INVERT_PASS = (1 << 2),
   GP_SUBDIV_INVERT_LAYERPASS = (1 << 3),
+  GP_SUBDIV_INVERT_MATERIAL = (1 << 4),
 } eSubdivGpencil_Flag;
 
 typedef struct ThickGpencilModifierData {
   GpencilModifierData modifier;
   /** Layer name. */
   char layername[64];
+  /** Material name. */
+  char materialname[64];
   /** Optional vertexgroup name, MAX_VGROUP_NAME. */
   char vgname[64];
   /** Custom index for passes. */
@@ -155,6 +163,7 @@ typedef enum eThickGpencil_Flag {
   GP_THICK_CUSTOM_CURVE = (1 << 3),
   GP_THICK_NORMALIZE = (1 << 4),
   GP_THICK_INVERT_LAYERPASS = (1 << 5),
+  GP_THICK_INVERT_MATERIAL = (1 << 6),
 } eThickGpencil_Flag;
 
 typedef struct TimeGpencilModifierData {
@@ -197,6 +206,8 @@ typedef struct TintGpencilModifierData {
   GpencilModifierData modifier;
   /** Layer name. */
   char layername[64];
+  /** Material name. */
+  char materialname[64];
   /** Custom index for passes. */
   int pass_index;
   /** Flags. */
@@ -218,12 +229,15 @@ typedef enum eTintGpencil_Flag {
   GP_TINT_INVERT_LAYER = (1 << 1),
   GP_TINT_INVERT_PASS = (1 << 2),
   GP_TINT_INVERT_LAYERPASS = (1 << 3),
+  GP_TINT_INVERT_MATERIAL = (1 << 4),
 } eTintGpencil_Flag;
 
 typedef struct ColorGpencilModifierData {
   GpencilModifierData modifier;
   /** Layer name. */
   char layername[64];
+  /** Material name. */
+  char materialname[64];
   /** Custom index for passes. */
   int pass_index;
   /** Flags. */
@@ -243,12 +257,15 @@ typedef enum eColorGpencil_Flag {
   GP_COLOR_INVERT_LAYER = (1 << 1),
   GP_COLOR_INVERT_PASS = (1 << 2),
   GP_COLOR_INVERT_LAYERPASS = (1 << 3),
+  GP_COLOR_INVERT_MATERIAL = (1 << 4),
 } eColorGpencil_Flag;
 
 typedef struct OpacityGpencilModifierData {
   GpencilModifierData modifier;
   /** Layer name. */
   char layername[64];
+  /** Material name. */
+  char materialname[64];
   /** Optional vertexgroup name, MAX_VGROUP_NAME. */
   char vgname[64];
   /** Custom index for passes. */
@@ -271,6 +288,7 @@ typedef enum eOpacityGpencil_Flag {
   GP_OPACITY_INVERT_VGROUP = (1 << 2),
   GP_OPACITY_CREATE_COLORS = (1 << 3),
   GP_OPACITY_INVERT_LAYERPASS = (1 << 4),
+  GP_OPACITY_INVERT_MATERIAL = (1 << 5),
 } eOpacityGpencil_Flag;
 
 typedef struct ArrayGpencilModifierData {
@@ -300,6 +318,8 @@ typedef struct ArrayGpencilModifierData {
   int pass_index;
   /** Layer name. */
   char layername[64];
+  /** Material name. */
+  char materialname[64];
   /** Material replace (0 keep default). */
   int mat_rpl;
   /** Custom index for passes. */
@@ -313,6 +333,7 @@ typedef enum eArrayGpencil_Flag {
   GP_ARRAY_INVERT_PASS = (1 << 3),
   GP_ARRAY_KEEP_ONTOP = (1 << 4),
   GP_ARRAY_INVERT_LAYERPASS = (1 << 5),
+  GP_ARRAY_INVERT_MATERIAL = (1 << 6),
 } eArrayGpencil_Flag;
 
 typedef struct BuildGpencilModifierData {
@@ -322,6 +343,9 @@ typedef struct BuildGpencilModifierData {
   char layername[64];
   int pass_index;
 
+  /** Material name. */
+  char materialname[64];
+
   /** Custom index for passes. */
   int layer_pass;
 
@@ -392,6 +416,8 @@ typedef struct LatticeGpencilModifierData {
   struct Object *object;
   /** Layer name. */
   char layername[64];
+  /** Material name. */
+  char materialname[64];
   /** Optional vertexgroup name, MAX_VGROUP_NAME. */
   char vgname[64];
   /** Custom index for passes. */
@@ -410,6 +436,7 @@ typedef enum eLatticeGpencil_Flag {
   GP_LATTICE_INVERT_PASS = (1 << 1),
   GP_LATTICE_INVERT_VGROUP = (1 << 2),
   GP_LATTICE_INVERT_LAYERPASS = (1 << 3),
+  GP_LATTICE_INVERT_MATERIAL = (1 << 4),
 } eLatticeGpencil_Flag;
 
 typedef struct MirrorGpencilModifierData {
@@ -417,6 +444,8 @@ typedef struct MirrorGpencilModifierData {
   struct Object *object;
   /** Layer name. */
   char layername[64];
+  /** Material name. */
+  char materialname[64];
   /** Custom index for passes. */
   int pass_index;
   /** Flags. */
@@ -434,6 +463,7 @@ typedef enum eMirrorGpencil_Flag {
   GP_MIRROR_AXIS_Y = (1 << 4),
   GP_MIRROR_AXIS_Z = (1 << 5),
   GP_MIRROR_INVERT_LAYERPASS = (1 << 6),
+  GP_MIRROR_INVERT_MATERIAL = (1 << 7),
 } eMirrorGpencil_Flag;
 
 typedef struct HookGpencilModifierData {
@@ -444,6 +474,8 @@ typedef struct HookGpencilModifierData {
   char subtarget[64];
   /** Layer name. */
   char layername[64];
+  /** Material name. */
+  char materialname[64];
   /** Optional vertexgroup name, MAX_VGROUP_NAME. */
   char vgname[64];
   /** Custom index for passes. */
@@ -472,6 +504,7 @@ typedef enum eHookGpencil_Flag {
   GP_HOOK_INVERT_VGROUP = (1 << 2),
   GP_HOOK_UNIFORM_SPACE = (1 << 3),
   GP_HOOK_INVERT_LAYERPASS = (1 << 4),
+  GP_HOOK_INVERT_MATERIAL = (1 << 5),
 } eHookGpencil_Flag;
 
 typedef enum eHookGpencil_Falloff {
@@ -490,6 +523,8 @@ typedef struct SimplifyGpencilModifierData {
   GpencilModifierData modifier;
   /** Layer name. */
   char layername[64];
+  /** Material name. */
+  char materialname[64];
   /** Custom index for passes. */
   int pass_index;
   /** Flags. */
@@ -513,6 +548,7 @@ typedef enum eSimplifyGpencil_Flag {
   GP_SIMPLIFY_INVERT_LAYER = (1 << 0),
   GP_SIMPLIFY_INVERT_PASS = (1 << 1),
   GP_SIMPLIFY_INVERT_LAYERPASS = (1 << 2),
+  GP_SIMPLIFY_INVERT_MATERIAL = (1 << 3),
 } eSimplifyGpencil_Flag;
 
 typedef enum eSimplifyGpencil_Mode {
@@ -530,6 +566,8 @@ typedef struct OffsetGpencilModifierData {
   GpencilModifierData modifier;
   /** Layer name. */
   char layername[64];
+  /** Material name. */
+  char materialname[64];
   /** Optional vertexgroup name, MAX_VGROUP_NAME. */
   char vgname[64];
   /** Custom index for passes. */
@@ -548,12 +586,15 @@ typedef enum eOffsetGpencil_Flag {
   GP_OFFSET_INVERT_PASS = (1 << 1),
   GP_OFFSET_INVERT_VGROUP = (1 << 2),
   GP_OFFSET_INVERT_LAYERPASS = (1 << 3),
+  GP_OFFSET_INVERT_MATERIAL = (1 << 4),
 } eOffsetGpencil_Flag;
 
 typedef struct SmoothGpencilModifierData {
   GpencilModifierData modifier;
   /** Layer name. */
   char layername[64];
+  /** Material name. */
+  char materialname[64];
   /** Optional vertexgroup name, MAX_VGROUP_NAME. */
   char vgname[64];
   /** Custom index for passes. */
@@ -578,6 +619,7 @@ typedef enum eSmoothGpencil_Flag {
   GP_SMOOTH_INVERT_VGROUP = (1 << 5),
   GP_SMOOTH_MOD_UV = (1 << 6),
   GP_SMOOTH_INVERT_LAYERPASS = (1 << 7),
+  GP_SMOOTH_INVERT_MATERIAL = (1 << 4),
 } eSmoothGpencil_Flag;
 
 typedef struct ArmatureGpencilModifierData {
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h
index 81b93ce6541..385a5bd4428 100644
--- a/source/blender/makesdna/DNA_node_types.h
+++ b/source/blender/makesdna/DNA_node_types.h
@@ -1195,6 +1195,33 @@ enum {
   NODE_MATH_SQRT = 23,
 };
 
+/* Vector Math node operations. */
+enum {
+  NODE_VECTOR_MATH_ADD = 0,
+  NODE_VECTOR_MATH_SUBTRACT = 1,
+  NODE_VECTOR_MATH_MULTIPLY = 2,
+  NODE_VECTOR_MATH_DIVIDE = 3,
+
+  NODE_VECTOR_MATH_CROSS_PRODUCT = 4,
+  NODE_VECTOR_MATH_PROJECT = 5,
+  NODE_VECTOR_MATH_REFLECT = 6,
+  NODE_VECTOR_MATH_DOT_PRODUCT = 7,
+
+  NODE_VECTOR_MATH_DISTANCE = 8,
+  NODE_VECTOR_MATH_LENGTH = 9,
+  NODE_VECTOR_MATH_SCALE = 10,
+  NODE_VECTOR_MATH_NORMALIZE = 11,
+
+  NODE_VECTOR_MATH_SNAP = 12,
+  NODE_VECTOR_MATH_FLOOR = 13,
+  NODE_VECTOR_MATH_CEIL = 14,
+  NODE_VECTOR_MATH_MODULO = 15,
+  NODE_VECTOR_MATH_FRACTION = 16,
+  NODE_VECTOR_MATH_ABSOLUTE = 17,
+  NODE_VECTOR_MATH_MINIMUM = 18,
+  NODE_VECTOR_MATH_MAXIMUM = 19,
+};
+
 /* mix rgb node flags */
 #define SHD_MIXRGB_USE_ALPHA 1
 #define SHD_MIXRGB_CLAMP 2
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 45159af306c..57ec9e21c10 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -1460,16 +1460,14 @@ typedef struct ToolSettings {
 
   char edge_mode_live_unwrap;
 
-  char _pad1[1];
-
   /* Transform */
   char transform_pivot_point;
   char transform_flag;
-  char snap_mode, snap_node_mode;
-  char snap_uv_mode;
   char snap_flag;
   char snap_target;
   char snap_transform_mode_flag;
+  short snap_mode, snap_node_mode;
+  short snap_uv_mode;
 
   char proportional_edit, prop_mode;
   /** Proportional edit, object mode. */
@@ -1492,7 +1490,7 @@ typedef struct ToolSettings {
   char vgroupsubset;
 
   /* UV painting */
-  char _pad2[3];
+  char _pad2[1];
   char uv_sculpt_settings;
   char uv_relax_method;
   /* XXX: these sculpt_paint_* fields are deprecated, use the
@@ -2047,12 +2045,16 @@ enum {
 #define SCE_SNAP_MODE_FACE (1 << 2)
 #define SCE_SNAP_MODE_VOLUME (1 << 3)
 #define SCE_SNAP_MODE_INCREMENT (1 << 4)
+#define SCE_SNAP_MODE_EDGE_MIDPOINT (1 << 5)
+#define SCE_SNAP_MODE_EDGE_PERPENDICULAR (1 << 6)
 
 /* ToolSettings.snap_node_mode */
-#define SCE_SNAP_MODE_GRID (1 << 5)
 #define SCE_SNAP_MODE_NODE_X (1 << 6)
 #define SCE_SNAP_MODE_NODE_Y (1 << 7)
 
+/* ToolSettings.snap_mode and ToolSettings.snap_node_mode */
+#define SCE_SNAP_MODE_GRID (1 << 8)
+
 /** #ToolSettings.snap_transform_mode_flag */
 enum {
   SCE_SNAP_TRANSFORM_MODE_TRANSLATE = (1 << 0),
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index ca8c6d705b7..2593bc6db81 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -287,11 +287,11 @@ typedef enum eSpaceOutliner_Filter {
   SO_FILTER_NO_OB_CAMERA = (1 << 10),
   SO_FILTER_NO_OB_OTHERS = (1 << 11),
 
-  SO_FILTER_UNUSED_12 = (1 << 12),          /* cleared */
-  SO_FILTER_OB_STATE_VISIBLE = (1 << 13),   /* Not set via DNA. */
-  SO_FILTER_OB_STATE_INVISIBLE = (1 << 14), /* Not set via DNA. */
-  SO_FILTER_OB_STATE_SELECTED = (1 << 15),  /* Not set via DNA. */
-  SO_FILTER_OB_STATE_ACTIVE = (1 << 16),    /* Not set via DNA. */
+  SO_FILTER_UNUSED_12 = (1 << 12),         /* cleared */
+  SO_FILTER_OB_STATE_VISIBLE = (1 << 13),  /* Not set via DNA. */
+  SO_FILTER_OB_STATE_HIDDEN = (1 << 14),   /* Not set via DNA. */
+  SO_FILTER_OB_STATE_SELECTED = (1 << 15), /* Not set via DNA. */
+  SO_FILTER_OB_STATE_ACTIVE = (1 << 16),   /* Not set via DNA. */
   SO_FILTER_NO_COLLECTION = (1 << 17),
 
   SO_FILTER_ID_TYPE = (1 << 18),
@@ -302,7 +302,7 @@ typedef enum eSpaceOutliner_Filter {
    SO_FILTER_NO_OB_LAMP | SO_FILTER_NO_OB_CAMERA | SO_FILTER_NO_OB_OTHERS)
 
 #define SO_FILTER_OB_STATE \
-  (SO_FILTER_OB_STATE_VISIBLE | SO_FILTER_OB_STATE_INVISIBLE | SO_FILTER_OB_STATE_SELECTED | \
+  (SO_FILTER_OB_STATE_VISIBLE | SO_FILTER_OB_STATE_HIDDEN | SO_FILTER_OB_STATE_SELECTED | \
    SO_FILTER_OB_STATE_ACTIVE)
 
 #define SO_FILTER_ANY \
@@ -313,7 +313,7 @@ typedef enum eSpaceOutliner_Filter {
 typedef enum eSpaceOutliner_StateFilter {
   SO_FILTER_OB_ALL = 0,
   SO_FILTER_OB_VISIBLE = 1,
-  SO_FILTER_OB_INVISIBLE = 2,
+  SO_FILTER_OB_HIDDEN = 2,
   SO_FILTER_OB_SELECTED = 3,
   SO_FILTER_OB_ACTIVE = 4,
 } eSpaceOutliner_StateFilter;