[Bf-blender-cvs] [7cc8832ff1c] greasepencil-edit-curve: GPencil: More transform cleanup and add is_curve_edit flag check

Antonio Vazquez noreply at git.blender.org
Thu Jun 11 20:39:52 CEST 2020


Commit: 7cc8832ff1c4c445ea19923cdf7071290115e6aa
Author: Antonio Vazquez
Date:   Thu Jun 11 20:39:38 2020 +0200
Branches: greasepencil-edit-curve
https://developer.blender.org/rB7cc8832ff1c4c445ea19923cdf7071290115e6aa

GPencil: More transform cleanup and add is_curve_edit flag check

This is in preparation for transform Bezier handles

===================================================================

M	source/blender/editors/transform/transform_convert_gpencil.c

===================================================================

diff --git a/source/blender/editors/transform/transform_convert_gpencil.c b/source/blender/editors/transform/transform_convert_gpencil.c
index 121af286521..1dad8f71e4c 100644
--- a/source/blender/editors/transform/transform_convert_gpencil.c
+++ b/source/blender/editors/transform/transform_convert_gpencil.c
@@ -73,9 +73,6 @@ void createTransGPencil(bContext *C, TransInfo *t)
   bGPdata *gpd = ED_gpencil_data_get_active(C);
   ToolSettings *ts = CTX_data_tool_settings(C);
 
-  bool is_multiedit = (bool)GPENCIL_MULTIEDIT_SESSIONS_ON(gpd);
-  bool use_multiframe_falloff = (ts->gp_sculpt.flag & GP_SCULPT_SETT_FLAG_FRAME_FALLOFF) != 0;
-
   Object *obact = CTX_data_active_object(C);
   TransData *td = NULL;
   float mtx[3][3], smtx[3][3];
@@ -83,6 +80,11 @@ void createTransGPencil(bContext *C, TransInfo *t)
   const Scene *scene = CTX_data_scene(C);
   const int cfra_scene = CFRA;
 
+  const bool is_multiedit = (bool)GPENCIL_MULTIEDIT_SESSIONS_ON(gpd);
+  const bool use_multiframe_falloff = (ts->gp_sculpt.flag & GP_SCULPT_SETT_FLAG_FRAME_FALLOFF) !=
+                                      0;
+  const bool is_curve_edit = (bool)GPENCIL_CURVE_EDIT_SESSIONS_ON(gpd);
+
   const bool is_prop_edit = (t->flag & T_PROP_EDIT) != 0;
   const bool is_prop_edit_connected = (t->flag & T_PROP_CONNECTED) != 0;
   const bool is_scale_thickness = ((t->mode == TFM_GPENCIL_SHRINKFATTEN) ||



More information about the Bf-blender-cvs mailing list