Merge branch 'master' into filebrowser_redesign

2 files changed, 31 insertions, 2 deletions

diff --git a/source/blender/makesdna/DNA_constraint_types.h b/source/blender/makesdna/DNA_constraint_types.h
index 17ce279f1b7..42d58cb34d0 100644
--- a/source/blender/makesdna/DNA_constraint_types.h
+++ b/source/blender/makesdna/DNA_constraint_types.h
@@ -271,7 +271,8 @@ typedef struct bTrackToConstraint {
 typedef struct bRotateLikeConstraint {
   struct Object *tar;
   int flag;
-  int reserved1;
+  char euler_order;
+  char _pad[3];
   /** MAX_ID_NAME-2. */
   char subtarget[64];
 } bRotateLikeConstraint;
@@ -441,6 +442,13 @@ typedef struct bTransformConstraint {
   /** Extrapolate motion? if 0, confine to ranges. */
   char expo;
 
+  /** Input rotation type - uses the same values as driver targets. */
+  char from_rotation_mode;
+  /** Output euler order override. */
+  char to_euler_order;
+
+  char _pad[6];
+
   /** From_min/max defines range of target transform. */
   float from_min[3];
   /** To map on to to_min/max range. */
@@ -715,6 +723,20 @@ typedef enum eConstraintChannel_Flags {
   CONSTRAINT_CHANNEL_PROTECTED = (1 << 1),
 } eConstraintChannel_Flags;
 
+/* Common enum for constraints that support override. */
+typedef enum eConstraint_EulerOrder {
+  /** Automatic euler mode. */
+  CONSTRAINT_EULER_AUTO = 0,
+
+  /** Explicit euler rotation modes - must sync with BLI_math_rotation.h defines. */
+  CONSTRAINT_EULER_XYZ = 1,
+  CONSTRAINT_EULER_XZY,
+  CONSTRAINT_EULER_YXZ,
+  CONSTRAINT_EULER_YZX,
+  CONSTRAINT_EULER_ZXY,
+  CONSTRAINT_EULER_ZYX,
+} eConstraint_EulerOrder;
+
 /* -------------------------------------- */
 
 /* bRotateLikeConstraint.flag */
diff --git a/source/blender/makesdna/DNA_gpencil_modifier_types.h b/source/blender/makesdna/DNA_gpencil_modifier_types.h
index f094d630fc8..7d407dc85bc 100644
--- a/source/blender/makesdna/DNA_gpencil_modifier_types.h
+++ b/source/blender/makesdna/DNA_gpencil_modifier_types.h
@@ -200,6 +200,11 @@ typedef enum eModifyColorGpencil_Flag {
   GP_MODIFY_COLOR_FILL = 2,
 } eModifyColorGpencil_Flag;
 
+typedef enum eOpacityModesGpencil_Flag {
+  GP_OPACITY_MODE_MATERIAL = 0,
+  GP_OPACITY_MODE_STRENGTH = 1,
+} eOpacityModesGpencil_Flag;
+
 typedef struct TintGpencilModifierData {
   GpencilModifierData modifier;
   /** Layer name. */
@@ -274,7 +279,9 @@ typedef struct OpacityGpencilModifierData {
   float factor;
   /** Modify stroke, fill or both. */
   char modify_color;
-  char _pad[3];
+  /** Mode of opacity, colors or strength */
+  char opacity_mode;
+  char _pad[2];
   /** Custom index for passes. */
   int layer_pass;
   char _pad1[4];