[Bf-blender-cvs] [6cf1f687251] greasepencil-object: Merge branch 'master' into greasepencil-object

[Antonioya]

Commit: 6cf1f6872514228e72f7aa31e0696c00725719c0
Author: Antonioya
Date:   Mon Apr 1 11:27:20 2019 +0200
Branches: greasepencil-object
https://developer.blender.org/rB6cf1f6872514228e72f7aa31e0696c00725719c0

Merge branch 'master' into greasepencil-object

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



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

diff --cc source/blender/makesrna/intern/rna_brush.c
index bab59b6e191,0e4f0553a0c..2ab0228fe7d
--- a/source/blender/makesrna/intern/rna_brush.c
+++ b/source/blender/makesrna/intern/rna_brush.c
@@@ -1194,28 -1194,9 +1194,28 @@@ static void rna_def_gpencil_options(Ble
  	RNA_def_property_float_sdna(prop, NULL, "uv_random");
  	RNA_def_property_range(prop, 0.0, 1.0);
  	RNA_def_property_ui_text(prop, "UV Random", "Random factor for autogenerated UV rotation");
- 	RNA_def_parameter_clear_flags(prop, PROP_ANIMATABLE, 0);
+ 	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
  	RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, NULL);
  
 +	/* gradient control along y */
 +	prop = RNA_def_property(srna, "gradient_factor", PROP_FLOAT, PROP_FACTOR);
 +	RNA_def_property_float_sdna(prop, NULL, "gradient_f");
 +	RNA_def_property_range(prop, 0.001f, 1.0f);
 +	RNA_def_property_float_default(prop, 1.0f);
 +	RNA_def_property_ui_text(
 +		prop, "Border Opacity Factor",
 +		"Amount of gradient along section of stroke (set to 1 for full solid)");
 +	RNA_def_parameter_clear_flags(prop, PROP_ANIMATABLE, 0);
 +
 +	/* gradient shape ratio */
 +	prop = RNA_def_property(srna, "gradient_shape", PROP_FLOAT, PROP_XYZ);
 +	RNA_def_property_float_sdna(prop, NULL, "gradient_s");
 +	RNA_def_property_array(prop, 2);
 +	RNA_def_property_range(prop, 0.01f, 1.0f);
 +	RNA_def_property_float_default(prop, 1.0f);
 +	RNA_def_property_ui_text(prop, "Aspect Ratio", "");
 +	RNA_def_parameter_clear_flags(prop, PROP_ANIMATABLE, 0);
 +
  	prop = RNA_def_property(srna, "input_samples", PROP_INT, PROP_NONE);
  	RNA_def_property_int_sdna(prop, NULL, "input_samples");
  	RNA_def_property_range(prop, 0, GP_MAX_INPUT_SAMPLES);