[Bf-blender-cvs] [3f65cad5aed] master: Units: Use pixels for denoising radius property, and set Cycles motion blur duration to factor.

[William Reynish]

Commit: 3f65cad5aedef8e413140c77cd5c91d8e66af524
Author: William Reynish
Date:   Wed Feb 20 18:02:26 2019 +0100
Branches: master
https://developer.blender.org/rB3f65cad5aedef8e413140c77cd5c91d8e66af524

Units: Use pixels for denoising radius property, and set Cycles motion blur duration to factor.

Also fix own mistake of using of spaces instead of tabs in RNA.

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

M	intern/cycles/blender/addon/properties.py
M	source/blender/makesrna/intern/rna_scene.c

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

diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py
index 1ced509221c..11f75b668a9 100644
--- a/intern/cycles/blender/addon/properties.py
+++ b/intern/cycles/blender/addon/properties.py
@@ -644,6 +644,7 @@ class CyclesRenderSettings(bpy.types.PropertyGroup):
         description="Scanline \"exposure\" time for the rolling shutter effect",
         default=0.1,
         min=0.0, max=1.0,
+        subtype='FACTOR',
     )
 
     texture_limit: EnumProperty(
@@ -1343,6 +1344,7 @@ class CyclesRenderLayerSettings(bpy.types.PropertyGroup):
         description="Size of the image area that's used to denoise a pixel (higher values are smoother, but might lose detail and are slower)",
         min=1, max=25,
         default=8,
+        subtype="PIXEL",
     )
     denoising_relative_pca: BoolProperty(
         name="Relative filter",
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index dcdd0c0710b..e91670ea61c 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -5045,7 +5045,7 @@ static void rna_def_scene_render_data(BlenderRNA *brna)
 
 	prop = RNA_def_property(srna, "motion_blur_shutter", PROP_FLOAT, PROP_FACTOR);
 	RNA_def_property_float_sdna(prop, NULL, "blurfac");
-    RNA_def_property_range(prop, 0.01f, 2.0f);
+	RNA_def_property_range(prop, 0.01f, 2.0f);
 	RNA_def_property_ui_range(prop, 0.01f, 1.0f, 1, 2);
 	RNA_def_property_ui_text(prop, "Shutter", "Time taken in frames between shutter open and close");
 	RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_Scene_glsl_update");
@@ -6217,7 +6217,7 @@ static void rna_def_scene_eevee(BlenderRNA *brna)
 	prop = RNA_def_property(srna, "motion_blur_shutter", PROP_FLOAT, PROP_FACTOR);
 	RNA_def_property_float_default(prop, 1.0f);
 	RNA_def_property_ui_text(prop, "Shutter", "Time taken in frames between shutter open and close");
-    RNA_def_property_range(prop, 0.01f, 2.0f);
+	RNA_def_property_range(prop, 0.01f, 2.0f);
 	RNA_def_property_ui_range(prop, 0.01f, 1.0f, 1, 2);
 	RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_STATIC);