diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2014-12-01 16:54:28 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2014-12-01 16:54:28 +0300 |
| commit | b57d67dfb9583fd6adbf7b63889f5f4c79d7bed8 (patch) | |
| tree | ed08910e5fdd32c38a20a4104df15d94a6cc93ce /source/blender/editors/include/ED_transform.h | |
| parent | 0b443c8a232b021bff9f5bd17d66c71aa7694df7 (diff) | |
| parent | e7de96f5eb3526683a94afc407cf672be17180f4 (diff) | |
Merge branch 'master' into gooseberry
Conflicts:
source/blender/blenkernel/BKE_context.h
source/blender/editors/include/ED_transform.h
source/blender/editors/transform/transform_ops.c
Diffstat (limited to 'source/blender/editors/include/ED_transform.h')
| -rw-r--r-- | source/blender/editors/include/ED_transform.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/include/ED_transform.h b/source/blender/editors/include/ED_transform.h index eda179460bf..66c62472a3e 100644 --- a/source/blender/editors/include/ED_transform.h +++ b/source/blender/editors/include/ED_transform.h @@ -100,6 +100,7 @@ enum TfmMode { #define CTX_MOVIECLIP (1 << 6) #define CTX_MASK (1 << 7) #define CTX_PAINT_CURVE (1 << 8) +#define CTX_GPENCIL_STROKES (1 << 9) /* Standalone call to get the transformation center corresponding to the current situation * returns 1 if successful, 0 otherwise (usually means there's no selection) @@ -149,7 +150,7 @@ int BIF_countTransformOrientation(const struct bContext *C); #define P_CORRECT_UV (1 << 8) #define P_NO_DEFAULTS (1 << 10) #define P_NO_TEXSPACE (1 << 11) -#define P_WIDGET_DRIVEN (1 << 12) +#define P_GPENCIL_EDIT (1 << 12) void Transform_Properties(struct wmOperatorType *ot, int flags); |