Commit: efa01dae5940a6ec061d73164a1257a91ba98cc8
Author: Antonio Vazquez
Date: Thu Jan 28 16:40:44 2021 +0100
Branches: temp-gpencil-interpolate
https://developer.blender.org/rBefa01dae5940a6ec061d73164a1257a91ba98cc8
Merge branch 'master' into temp-gpencil-interpolate
===================================================================
===================================================================
diff --cc source/blender/editors/gpencil/gpencil_interpolate.c
index b6004113476,2e756cf9c8d..962e36ed9f6
--- a/source/blender/editors/gpencil/gpencil_interpolate.c
+++ b/source/blender/editors/gpencil/gpencil_interpolate.c
@@@ -787,14 -733,8 +787,14 @@@ void GPENCIL_OT_interpolate(wmOperatorT
/* flags */
ot->flag = OPTYPE_UNDO | OPTYPE_BLOCKING;
+ static const EnumPropertyItem gpencil_interpolation_layer_items[] = {
+ {0, "ACTIVE", 0, "Active", ""},
+ {1, "ALL", 0, "All Layers", ""},
+ {0, NULL, 0, NULL, NULL},
+ };
+
/* properties */
- RNA_def_float_percentage(
+ RNA_def_float_factor(
ot->srna,
"shift",
0.0f,
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
