Commit: 231355fd093d7dfa313e0de7885d7174903ae7f6
Author: Antonioya
Date: Wed Nov 28 19:23:17 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rB231355fd093d7dfa313e0de7885d7174903ae7f6
Merge branch 'blender2.8' into greasepencil-object
===================================================================
===================================================================
diff --cc source/blender/makesrna/intern/rna_gpencil.c
index 4874807e28d,0006a8859bf..e5e5d835054
--- a/source/blender/makesrna/intern/rna_gpencil.c
+++ b/source/blender/makesrna/intern/rna_gpencil.c
@@@ -1154,8 -1154,13 +1154,44 @@@ static void rna_def_gpencil_layer(Blend
/* Onion-Skinning */
- prop = RNA_def_property(srna, "use_onion_skinning", PROP_BOOLEAN,
PROP_NONE);
+ prop = RNA_def_property(srna, "use_annotation_onion_skinning",
PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "onion_flag",
GP_LAYER_ONIONSKIN);
- RNA_def_property_ui_text(prop, "Onion Skinning", "Display onion skins
before and after the current frame");
++ RNA_def_property_ui_text(prop, "Onion Skinning",
++ "Display annotation onion skins before and after the current
frame");
++ RNA_def_property_update(prop, NC_GPENCIL | ND_DATA,
"rna_GPencil_update");
++
++ prop = RNA_def_property(srna, "annotation_onion_before_range",
PROP_INT, PROP_NONE);
++ RNA_def_property_int_sdna(prop, NULL, "gstep");
++ RNA_def_property_range(prop, -1, 120);
++ RNA_def_property_ui_text(prop, "Frames Before",
++ "Maximum number of frames to show before current frame");
++ RNA_def_property_update(prop, NC_GPENCIL | ND_DATA,
"rna_GPencil_update");
++
++ prop = RNA_def_property(srna, "annotation_onion_after_range", PROP_INT,
PROP_NONE);
++ RNA_def_property_int_sdna(prop, NULL, "gstep_next");
++ RNA_def_property_range(prop, -1, 120);
++ RNA_def_property_ui_text(prop, "Frames After",
++ "Maximum number of frames to show after current frame");
++ RNA_def_property_update(prop, NC_GPENCIL | ND_DATA,
"rna_GPencil_update");
++
++ prop = RNA_def_property(srna, "annotation_onion_before_color",
PROP_FLOAT, PROP_COLOR_GAMMA);
++ RNA_def_property_float_sdna(prop, NULL, "gcolor_prev");
++ RNA_def_property_array(prop, 3);
++ RNA_def_property_range(prop, 0.0f, 1.0f);
++ RNA_def_property_float_array_default(prop, default_onion_color_b);
++ RNA_def_property_ui_text(prop, "Before Color", "Base color for ghosts
before the active frame");
++ RNA_def_property_update(prop, NC_GPENCIL | ND_DATA,
"rna_GPencil_update");
++
++ prop = RNA_def_property(srna, "annotation_onion_after_color",
PROP_FLOAT, PROP_COLOR_GAMMA);
++ RNA_def_property_float_sdna(prop, NULL, "gcolor_next");
++ RNA_def_property_array(prop, 3);
++ RNA_def_property_range(prop, 0.0f, 1.0f);
++ RNA_def_property_float_array_default(prop, default_onion_color_a);
++ RNA_def_property_ui_text(prop, "After Color", "Base color for ghosts
after the active frame");
+ RNA_def_property_update(prop, NC_GPENCIL | ND_DATA,
"rna_GPencil_update");
+
+ prop = RNA_def_property(srna, "use_annotation_onion_skinning",
PROP_BOOLEAN, PROP_NONE);
+ RNA_def_property_boolean_sdna(prop, NULL, "onion_flag",
GP_LAYER_ONIONSKIN);
RNA_def_property_ui_text(prop, "Onion Skinning",
"Display annotation onion skins before and after the current
frame");
RNA_def_property_update(prop, NC_GPENCIL | ND_DATA,
"rna_GPencil_update");
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
