[Bf-blender-cvs] [55465600bf4] temp-gpencil-bezier-v2: GPencil: Remove use_curve_edit RNA
Falk David
noreply at git.blender.org
Thu Jan 21 13:26:38 CET 2021
Commit: 55465600bf4a54026b1cb2adf2448311e22756ba
Author: Falk David
Date: Thu Jan 21 12:42:51 2021 +0100
Branches: temp-gpencil-bezier-v2
https://developer.blender.org/rB55465600bf4a54026b1cb2adf2448311e22756ba
GPencil: Remove use_curve_edit RNA
===================================================================
M release/scripts/presets/keyconfig/keymap_data/blender_default.py
M source/blender/blenkernel/BKE_gpencil_curve.h
M source/blender/blenkernel/intern/gpencil_curve.c
M source/blender/makesrna/intern/rna_gpencil.c
===================================================================
diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
index 287322e9a29..6140a373066 100644
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@ -3314,9 +3314,6 @@ def km_grease_pencil_stroke_edit_mode(params):
# Proportional editing.
*_template_items_proportional_editing(
params, connected=True, toggle_data_path='tool_settings.use_proportional_edit'),
- # Curve edit mode toggle.
- ("wm.context_toggle", {"type": 'U', "value": 'PRESS'},
- {"properties": [("data_path", 'gpencil_data.use_curve_edit')]}),
# Add menu
("object.gpencil_add", {"type": 'A', "value": 'PRESS', "shift": True}, None),
# Vertex group menu
diff --git a/source/blender/blenkernel/BKE_gpencil_curve.h b/source/blender/blenkernel/BKE_gpencil_curve.h
index c861326c345..0bde1dec5cd 100644
--- a/source/blender/blenkernel/BKE_gpencil_curve.h
+++ b/source/blender/blenkernel/BKE_gpencil_curve.h
@@ -51,8 +51,6 @@ void BKE_gpencil_stroke_editcurve_update(struct bGPDstroke *gps,
const float corner_angle);
void BKE_gpencil_editcurve_stroke_sync_selection(struct bGPDstroke *gps, struct bGPDcurve *gpc);
void BKE_gpencil_stroke_editcurve_sync_selection(struct bGPDstroke *gps, struct bGPDcurve *gpc);
-void BKE_gpencil_strokes_selected_update_editcurve(struct bGPdata *gpd);
-void BKE_gpencil_strokes_selected_sync_selection_editcurve(struct bGPdata *gpd);
void BKE_gpencil_stroke_update_geometry_from_editcurve(struct bGPDstroke *gps,
const uint resolution,
const bool is_adaptive);
diff --git a/source/blender/blenkernel/intern/gpencil_curve.c b/source/blender/blenkernel/intern/gpencil_curve.c
index 76ca6301b61..9c35404e16b 100644
--- a/source/blender/blenkernel/intern/gpencil_curve.c
+++ b/source/blender/blenkernel/intern/gpencil_curve.c
@@ -1342,66 +1342,5 @@ void BKE_gpencil_editcurve_subdivide(bGPDstroke *gps, const int cuts)
}
}
-void BKE_gpencil_strokes_selected_update_editcurve(bGPdata *gpd)
-{
- const bool is_multiedit = (bool)GPENCIL_MULTIEDIT_SESSIONS_ON(gpd);
- /* For all selected strokes, update edit curve. */
- LISTBASE_FOREACH (bGPDlayer *, gpl, &gpd->layers) {
- if (!BKE_gpencil_layer_is_editable(gpl)) {
- continue;
- }
- bGPDframe *init_gpf = (is_multiedit) ? gpl->frames.first : gpl->actframe;
- for (bGPDframe *gpf = init_gpf; gpf; gpf = gpf->next) {
- if ((gpf == gpl->actframe) || ((gpf->flag & GP_FRAME_SELECT) && is_multiedit)) {
- LISTBASE_FOREACH (bGPDstroke *, gps, &gpf->strokes) {
- /* skip deselected stroke */
- if (!(gps->flag & GP_STROKE_SELECT)) {
- continue;
- }
-
- /* Generate the curve if there is none or the stroke was changed */
- if (gps->editcurve == NULL) {
- // BKE_gpencil_stroke_editcurve_update(gpd, gpl, gps);
- /* Continue if curve could not be generated. */
- if (gps->editcurve == NULL) {
- continue;
- }
- }
- else if (gps->editcurve->flag & GP_CURVE_NEEDS_STROKE_UPDATE) {
- // BKE_gpencil_stroke_editcurve_update(gpd, gpl, gps);
- }
- /* Update the selection from the stroke to the curve. */
- BKE_gpencil_editcurve_stroke_sync_selection(gps, gps->editcurve);
-
- gps->flag |= GP_STROKE_NEEDS_CURVE_UPDATE;
- BKE_gpencil_stroke_geometry_update(gpd, gps);
- }
- }
- }
- }
-}
-
-void BKE_gpencil_strokes_selected_sync_selection_editcurve(bGPdata *gpd)
-{
- const bool is_multiedit = (bool)GPENCIL_MULTIEDIT_SESSIONS_ON(gpd);
- /* Sync selection for all strokes with editcurve. */
- LISTBASE_FOREACH (bGPDlayer *, gpl, &gpd->layers) {
- if (!BKE_gpencil_layer_is_editable(gpl)) {
- continue;
- }
- bGPDframe *init_gpf = (is_multiedit) ? gpl->frames.first : gpl->actframe;
- for (bGPDframe *gpf = init_gpf; gpf; gpf = gpf->next) {
- if ((gpf == gpl->actframe) || ((gpf->flag & GP_FRAME_SELECT) && is_multiedit)) {
- LISTBASE_FOREACH (bGPDstroke *, gps, &gpf->strokes) {
- bGPDcurve *gpc = gps->editcurve;
- if (gpc != NULL) {
- /* Update the selection of every stroke that has an editcurve */
- BKE_gpencil_stroke_editcurve_sync_selection(gps, gpc);
- }
- }
- }
- }
- }
-}
/** \} */
diff --git a/source/blender/makesrna/intern/rna_gpencil.c b/source/blender/makesrna/intern/rna_gpencil.c
index dec25c0143f..08411622df9 100644
--- a/source/blender/makesrna/intern/rna_gpencil.c
+++ b/source/blender/makesrna/intern/rna_gpencil.c
@@ -192,30 +192,6 @@ static void rna_GpencilLayerMatrix_update(Main *bmain, Scene *scene, PointerRNA
rna_GPencil_update(bmain, scene, ptr);
}
-static void rna_GPencil_curve_edit_mode_toggle(Main *bmain, Scene *scene, PointerRNA *ptr)
-{
- ToolSettings *ts = scene->toolsettings;
- bGPdata *gpd = (bGPdata *)ptr->owner_id;
-
- /* Curve edit mode is turned on. */
- if (GPENCIL_CURVE_EDIT_SESSIONS_ON(gpd)) {
- /* If the current select mode is segment and the Bezier mode is on, change
- * to Point because segment is not supported. */
- if (ts->gpencil_selectmode_edit == GP_SELECTMODE_SEGMENT) {
- ts->gpencil_selectmode_edit = GP_SELECTMODE_POINT;
- }
-
- BKE_gpencil_strokes_selected_update_editcurve(gpd);
- }
- /* Curve edit mode is turned off. */
- else {
- BKE_gpencil_strokes_selected_sync_selection_editcurve(gpd);
- }
-
- /* Standard update. */
- rna_GPencil_update(bmain, scene, ptr);
-}
-
static void rna_GPencil_stroke_curve_update(Main *bmain, Scene *scene, PointerRNA *ptr)
{
bGPdata *gpd = (bGPdata *)ptr->owner_id;
@@ -2459,11 +2435,6 @@ 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 Editing", "Edit strokes using curve handles");
- RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, "rna_GPencil_curve_edit_mode_toggle");
-
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