diff options
| author | Joshua Leung <aligorith@gmail.com> | 2015-12-13 11:03:13 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2015-12-13 11:03:13 +0300 |
| commit | a1f87064c4c0cd9e8eafc19c599c4ad4ccdba49f (patch) | |
| tree | d016e95050f10eda7bc44e1bdfa2f7c4fc0fc024 /source/blender/editors/transform/transform_generics.c | |
| parent | d9ee88d126ddb59b68d2561694b522a99e4923b6 (diff) | |
Grease Pencil: Merge GPencil_Editing_Stage3 branch into master
This commit merges all the work done in the GPencil_Editing_Stage3 branch
as of ef2aecf2db981b5344e0d14e7f074f1742b0b2f7 into master. For more details
about the changes that this brings, see the WIP release notes:
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.77/GPencil
Diffstat (limited to 'source/blender/editors/transform/transform_generics.c')
| -rw-r--r-- | source/blender/editors/transform/transform_generics.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index 3b40a55a270..84087ec8840 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -39,6 +39,7 @@ #include "DNA_anim_types.h" #include "DNA_armature_types.h" #include "DNA_brush_types.h" +#include "DNA_gpencil_types.h" #include "DNA_lattice_types.h" #include "DNA_screen_types.h" #include "DNA_sequence_types.h" @@ -1095,6 +1096,7 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve ScrArea *sa = CTX_wm_area(C); Object *obedit = CTX_data_edit_object(C); Object *ob = CTX_data_active_object(C); + bGPdata *gpd = CTX_data_gpencil_data(C); PropertyRNA *prop; t->scene = sce; @@ -1164,6 +1166,11 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve t->remove_on_cancel = true; } } + + /* GPencil editing context */ + if ((gpd) && (gpd->flag & GP_DATA_STROKE_EDITMODE)) { + t->options |= CTX_GPENCIL_STROKES; + } /* Assign the space type, some exceptions for running in different mode */ if (sa == NULL) { |