[Bf-blender-cvs] [be7e61b31f7] greasepencil-edit-curve: GPencil: New Curve Edit submode flag
Antonio Vazquez
noreply at git.blender.org
Mon Jun 1 17:29:47 CEST 2020
Commit: be7e61b31f7f72b77a067df44e87f2594b565bc6
Author: Antonio Vazquez
Date: Mon Jun 1 17:29:41 2020 +0200
Branches: greasepencil-edit-curve
https://developer.blender.org/rBbe7e61b31f7f72b77a067df44e87f2594b565bc6
GPencil: New Curve Edit submode flag
Also created the macro GPENCIL_CURVE_EDIT_SESSIONS_ON to make easier to check the submode.
===================================================================
M source/blender/makesdna/DNA_gpencil_types.h
M source/blender/makesrna/intern/rna_gpencil.c
===================================================================
diff --git a/source/blender/makesdna/DNA_gpencil_types.h b/source/blender/makesdna/DNA_gpencil_types.h
index 57f41ffd793..e0d93e9148b 100644
--- a/source/blender/makesdna/DNA_gpencil_types.h
+++ b/source/blender/makesdna/DNA_gpencil_types.h
@@ -699,6 +699,9 @@ typedef enum eGPdata_Flag {
/* Allow edit several frames at the same time */
GP_DATA_STROKE_MULTIEDIT = (1 << 16),
+ /* Enable Bezier Editing Curve (a submode of Edit mode). */
+ GP_DATA_CURVE_EDIT_MODE = (1 << 17),
+
/* Vertex Paint Mode - Toggle paint mode */
GP_DATA_STROKE_VERTEXMODE = (1 << 18),
@@ -749,6 +752,9 @@ typedef enum eGP_DrawMode {
GP_DATA_STROKE_WEIGHTMODE | GP_DATA_STROKE_VERTEXMODE)) && \
((gpd)->flag & GP_DATA_STROKE_MULTIEDIT))
+#define GPENCIL_CURVE_EDIT_SESSIONS_ON(gpd) \
+ ((gpd) && ((gpd)->flag & (GP_DATA_STROKE_EDITMODE)) && ((gpd)->flag & GP_DATA_CURVE_EDIT_MODE))
+
/* Macros to check grease pencil modes */
#define GPENCIL_ANY_MODE(gpd) \
((gpd) && ((gpd)->flag & \
diff --git a/source/blender/makesrna/intern/rna_gpencil.c b/source/blender/makesrna/intern/rna_gpencil.c
index e8d6e9d5dac..b8f49ad6c4c 100644
--- a/source/blender/makesrna/intern/rna_gpencil.c
+++ b/source/blender/makesrna/intern/rna_gpencil.c
@@ -2006,6 +2006,11 @@ static void rna_def_gpencil_data(BlenderRNA *brna)
"(keyframes must be selected to be included)");
RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, "rna_GPencil_update");
+ prop = RNA_def_property(srna, "use_curve_edit", PROP_BOOLEAN, PROP_NONE);
+ RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_DATA_CURVE_EDIT_MODE);
+ RNA_def_property_ui_text(prop, "Curve Edit", "Edit strokes using curve handles");
+ RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, "rna_GPencil_update");
+
prop = RNA_def_property(srna, "use_autolock_layers", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_DATA_AUTOLOCK_LAYERS);
RNA_def_property_ui_text(
More information about the Bf-blender-cvs
mailing list