[Bf-blender-cvs] [c9654e6e881] greasepencil-object: Set Onion frame range to 1 as default

Antonio Vazquez noreply at git.blender.org
Tue Sep 19 10:44:22 CEST 2017


Commit: c9654e6e881b6bbc24d90f88d843cf635c5d6014
Author: Antonio Vazquez
Date:   Tue Sep 19 10:41:55 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rBc9654e6e881b6bbc24d90f88d843cf635c5d6014

Set Onion frame range to 1 as default

===================================================================

M	source/blender/blenkernel/intern/gpencil.c
M	source/blender/makesrna/intern/rna_gpencil.c

===================================================================

diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c
index cdc2e8f6982..8a91a232b92 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -465,6 +465,8 @@ bGPDlayer *BKE_gpencil_layer_addnew(bGPdata *gpd, const char *name, bool setacti
 	gpl->onion_flag |= (GP_LAYER_GHOST_PREVCOL | GP_LAYER_GHOST_NEXTCOL);
 	gpl->onion_flag |= GP_LAYER_ONION_FADE;
 	gpl->onion_factor = 0.5f;
+	gpl->gstep = 1;
+	gpl->gstep_next = 1;
 
 	ARRAY_SET_ITEMS(gpl->gcolor_prev, 0.145098f, 0.419608f, 0.137255f); /* green */
 	ARRAY_SET_ITEMS(gpl->gcolor_next, 0.125490f, 0.082353f, 0.529412f); /* blue */
@@ -780,6 +782,8 @@ bGPdata *BKE_gpencil_data_addnew(const char name[])
 	gpd->onion_factor = 0.5f;
 	ARRAY_SET_ITEMS(gpd->gcolor_prev, 0.145098f, 0.419608f, 0.137255f); /* green */
 	ARRAY_SET_ITEMS(gpd->gcolor_next, 0.125490f, 0.082353f, 0.529412f); /* blue */
+	gpd->gstep = 1;
+	gpd->gstep_next = 1;
 
 	return gpd;
 }
diff --git a/source/blender/makesrna/intern/rna_gpencil.c b/source/blender/makesrna/intern/rna_gpencil.c
index 86bd5247ae4..a703e528790 100644
--- a/source/blender/makesrna/intern/rna_gpencil.c
+++ b/source/blender/makesrna/intern/rna_gpencil.c
@@ -1050,6 +1050,7 @@ static void rna_def_gpencil_layer(BlenderRNA *brna)
 	prop = RNA_def_property(srna, "ghost_before_range", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "gstep");
 	RNA_def_property_range(prop, 0, 120);
+	RNA_def_property_int_default(prop, 1);
 	RNA_def_property_ui_text(prop, "Frames Before",
 		"Maximum number of frames to show before current frame "
 		"(0 = don't show any frames before current)");
@@ -1058,6 +1059,7 @@ static void rna_def_gpencil_layer(BlenderRNA *brna)
 	prop = RNA_def_property(srna, "ghost_after_range", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "gstep_next");
 	RNA_def_property_range(prop, 0, 120);
+	RNA_def_property_int_default(prop, 1);
 	RNA_def_property_ui_text(prop, "Frames After",
 		"Maximum number of frames to show after current frame "
 		"(0 = don't show any frames after current)");
@@ -1387,6 +1389,7 @@ static void rna_def_gpencil_data(BlenderRNA *brna)
 	prop = RNA_def_property(srna, "ghost_before_range", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "gstep");
 	RNA_def_property_range(prop, 0, 120);
+	RNA_def_property_int_default(prop, 1);
 	RNA_def_property_ui_text(prop, "Frames Before",
 		"Maximum number of frames to show before current frame "
 		"(0 = don't show any frames before current)");
@@ -1395,6 +1398,7 @@ static void rna_def_gpencil_data(BlenderRNA *brna)
 	prop = RNA_def_property(srna, "ghost_after_range", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "gstep_next");
 	RNA_def_property_range(prop, 0, 120);
+	RNA_def_property_int_default(prop, 1);
 	RNA_def_property_ui_text(prop, "Frames After",
 		"Maximum number of frames to show after current frame "
 		"(0 = don't show any frames after current)");



More information about the Bf-blender-cvs mailing list