[Bf-blender-cvs] [43520a8b37a] temp-gpencil-interpolate: GPencil: Fix Curve problem in UI
Antonio Vazquez
noreply at git.blender.org
Tue Dec 22 17:26:19 CET 2020
Commit: 43520a8b37aeb81d4a604664d59e53b56e49e4b9
Author: Antonio Vazquez
Date: Tue Dec 22 17:17:03 2020 +0100
Branches: temp-gpencil-interpolate
https://developer.blender.org/rB43520a8b37aeb81d4a604664d59e53b56e49e4b9
GPencil: Fix Curve problem in UI
===================================================================
M source/blender/editors/gpencil/gpencil_interpolate.c
===================================================================
diff --git a/source/blender/editors/gpencil/gpencil_interpolate.c b/source/blender/editors/gpencil/gpencil_interpolate.c
index 9b52b694f69..d890c12db6a 100644
--- a/source/blender/editors/gpencil/gpencil_interpolate.c
+++ b/source/blender/editors/gpencil/gpencil_interpolate.c
@@ -1198,15 +1198,12 @@ static void gpencil_interpolate_seq_ui(bContext *C, wmOperator *op)
if (type == GP_IPO_CURVEMAP) {
/* Get an RNA pointer to ToolSettings to give to the custom curve. */
Scene *scene = CTX_data_scene(C);
- ToolSettings *ts = CTX_data_tool_settings(C);
+ ToolSettings *ts = scene->toolsettings;
PointerRNA gpsettings_ptr;
RNA_pointer_create(
&scene->id, &RNA_GPencilInterpolateSettings, &ts->gp_interpolate, &gpsettings_ptr);
- uiTemplateCurveProfile(layout, &gpsettings_ptr, "interpolation_curve");
-
- // PointerRNA toolsettings_ptr;
- // RNA_pointer_create(&scene->id, &RNA_ToolSettings, scene->toolsettings, &toolsettings_ptr);
- // uiTemplateCurveProfile(layout, &toolsettings_ptr, "custom_bevel_profile_preset");
+ uiTemplateCurveMapping(
+ layout, &gpsettings_ptr, "interpolation_curve", 0, false, true, true, false);
}
else if (type != GP_IPO_LINEAR) {
row = uiLayoutRow(layout, false);
More information about the Bf-blender-cvs
mailing list