[Bf-blender-cvs] [65ec69492da] greasepencil-object: Cleanup: Rename brush input_samples field

[Antonio Vazquez]

Commit: 65ec69492da102ddbb2b10926f5ff2c05ede9e7c
Author: Antonio Vazquez
Date:   Fri Mar 9 19:38:07 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rB65ec69492da102ddbb2b10926f5ff2c05ede9e7c

Cleanup: Rename brush input_samples field

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

M	source/blender/editors/gpencil/gpencil_paint.c
M	source/blender/makesdna/DNA_gpencil_types.h
M	source/blender/makesrna/intern/rna_scene.c

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

diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c
index f9afcfe77c1..aa6deb2155d 100644
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@ -2749,12 +2749,12 @@ static void gpencil_move_last_stroke_to_back(bContext *C)
 static void gpencil_add_missing_events(bContext *C, wmOperator *op, const wmEvent *event, tGPsdata *p)
 {
 	bGPDbrush *brush = p->brush;
-	if (brush->input_samples == 0) {
+	if (brush->gp_input_samples == 0) {
 		return;
 	}
 	RegionView3D *rv3d = p->ar->regiondata;
 	float defaultpixsize = rv3d->pixsize * 1000.0f;
-	int samples = (GP_MAX_INPUT_SAMPLES - brush->input_samples + 1);
+	int samples = (GP_MAX_INPUT_SAMPLES - brush->gp_input_samples + 1);
 	float thickness = (float)brush->thickness;
 
 	float pt[2], a[2], b[2];
diff --git a/source/blender/makesdna/DNA_gpencil_types.h b/source/blender/makesdna/DNA_gpencil_types.h
index d24fbc56194..48d9eadaa98 100644
--- a/source/blender/makesdna/DNA_gpencil_types.h
+++ b/source/blender/makesdna/DNA_gpencil_types.h
@@ -138,7 +138,7 @@ typedef struct bGPDbrush {
 	float lazy_factor;        /* factor of smooth */
 	
 	float uv_random;          /* random factor for UV rotation */
-	int   input_samples;      /* maximum distance before generate new point for very fast mouse movements */
+	int   gp_input_samples;   /* maximum distance before generate new point for very fast mouse movements */
 	int   gpbrush_type;       /* type of brush (draw, fill, erase, etc..) */
 	int   eraser_mode;        /* soft, hard or stroke */
 	float active_smooth;      /* smooth while drawing factor */
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index 9748fc29f65..b75eb922ff3 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -2435,7 +2435,7 @@ static void rna_def_gpencil_brush(BlenderRNA *brna)
 	RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, NULL);
 
 	prop = RNA_def_property(srna, "input_samples", PROP_INT, PROP_NONE);
-	RNA_def_property_int_sdna(prop, NULL, "input_samples");
+	RNA_def_property_int_sdna(prop, NULL, "gp_input_samples");
 	RNA_def_property_range(prop, 0, GP_MAX_INPUT_SAMPLES);
 	RNA_def_property_ui_text(prop, "Input Samples", "Generate intermediate points for very fast mouse movements. Set to 0 to disable");
 	RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, NULL);