Commit: 6cd2bfa3ff81e420547d29b48513fbbfa0854586
Author: Joshua Leung
Date: Sat Oct 31 13:25:59 2015 +1300
Branches: GPencil_Editing_Stage3
https://developer.blender.org/rB6cd2bfa3ff81e420547d29b48513fbbfa0854586
GPencil: Proper fix for proportional editing not working
===================================================================
M source/blender/editors/gpencil/gpencil_ops.c
M source/blender/editors/transform/transform_conversions.c
M source/blender/editors/transform/transform_generics.c
===================================================================
diff --git a/source/blender/editors/gpencil/gpencil_ops.c
b/source/blender/editors/gpencil/gpencil_ops.c
index 933bcdf..bcb233c 100644
--- a/source/blender/editors/gpencil/gpencil_ops.c
+++ b/source/blender/editors/gpencil/gpencil_ops.c
@@ -247,32 +247,23 @@ static void ed_keymap_gpencil_editing(wmKeyConfig
*keyconf)
/* Transform Tools */
kmi = WM_keymap_add_item(keymap, "TRANSFORM_OT_translate", GKEY,
KM_PRESS, 0, 0);
- RNA_boolean_set(kmi->ptr, "gpencil_strokes", true);
kmi = WM_keymap_add_item(keymap, "TRANSFORM_OT_translate", EVT_TWEAK_S,
KM_ANY, 0, 0);
- RNA_boolean_set(kmi->ptr, "gpencil_strokes", true);
kmi = WM_keymap_add_item(keymap, "TRANSFORM_OT_rotate", RKEY, KM_PRESS,
0, 0);
- RNA_boolean_set(kmi->ptr, "gpencil_strokes", true);
kmi = WM_keymap_add_item(keymap, "TRANSFORM_OT_resize", SKEY, KM_PRESS,
0, 0);
- RNA_boolean_set(kmi->ptr, "gpencil_strokes", true);
kmi = WM_keymap_add_item(keymap, "TRANSFORM_OT_mirror", MKEY, KM_PRESS,
KM_CTRL, 0);
- RNA_boolean_set(kmi->ptr, "gpencil_strokes", true);
kmi = WM_keymap_add_item(keymap, "TRANSFORM_OT_bend", WKEY, KM_PRESS,
KM_SHIFT, 0);
- RNA_boolean_set(kmi->ptr, "gpencil_strokes", true);
WM_keymap_add_item(keymap, "TRANSFORM_OT_tosphere", SKEY, KM_PRESS,
KM_ALT | KM_SHIFT, 0);
- RNA_boolean_set(kmi->ptr, "gpencil_strokes", true);
WM_keymap_add_item(keymap, "TRANSFORM_OT_shear", SKEY, KM_PRESS, KM_ALT
| KM_CTRL | KM_SHIFT, 0);
- RNA_boolean_set(kmi->ptr, "gpencil_strokes", true);
kmi = WM_keymap_add_item(keymap, "TRANSFORM_OT_transform", SKEY,
KM_PRESS, KM_ALT, 0);
RNA_enum_set(kmi->ptr, "mode", TFM_GPENCIL_SHRINKFATTEN);
- RNA_boolean_set(kmi->ptr, "gpencil_strokes", true);
/* Proportional Editing */
ED_keymap_proportional_cycle(keyconf, keymap);
diff --git a/source/blender/editors/transform/transform_conversions.c
b/source/blender/editors/transform/transform_conversions.c
index f14ce67..f84e0df 100644
--- a/source/blender/editors/transform/transform_conversions.c
+++ b/source/blender/editors/transform/transform_conversions.c
@@ -7885,7 +7885,6 @@ void createTransData(bContext *C, TransInfo *t)
{
Scene *scene = t->scene;
Object *ob = OBACT;
- bGPdata *gpd = CTX_data_gpencil_data(C);
/* if tests must match recalcData for correct updates */
if (t->options & CTX_TEXTURE) {
@@ -7902,7 +7901,7 @@ void createTransData(bContext *C, TransInfo *t)
sort_trans_data_dist(t);
}
}
- else if ((t->options & CTX_GPENCIL_STROKES) || ((gpd) && (gpd->flag &
GP_DATA_STROKE_EDITMODE))) {
+ else if (t->options & CTX_GPENCIL_STROKES) {
t->options |= CTX_GPENCIL_STROKES;
t->flag |= T_POINTS;
createTransGPencil(C, t);
diff --git a/source/blender/editors/transform/transform_generics.c
b/source/blender/editors/transform/transform_generics.c
index dc541c6..a3a2cab 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"
@@ -1088,6 +1089,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;
@@ -1156,6 +1158,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) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
