Commit: 1303bd57f57b8d6c373d5320ad9ca4857d5b310b
Author: William Reynish
Date: Wed Feb 20 21:50:27 2019 +0100
Branches: master
https://developer.blender.org/rB1303bd57f57b8d6c373d5320ad9ca4857d5b310b
Units: Use units for smoke
-Use factor for flame_vorticity, slice_depth, density & volume_density
-Use distance for surface_distance
-Use factor for mix factor in Data Transfer modifier
-Use prop_translation for pivot constraint offset
===================================================================
M source/blender/makesrna/intern/rna_constraint.c
M source/blender/makesrna/intern/rna_modifier.c
M source/blender/makesrna/intern/rna_smoke.c
===================================================================
diff --git a/source/blender/makesrna/intern/rna_constraint.c
b/source/blender/makesrna/intern/rna_constraint.c
index 021af36b50c..c08a1e0128c 100644
--- a/source/blender/makesrna/intern/rna_constraint.c
+++ b/source/blender/makesrna/intern/rna_constraint.c
@@ -2406,7 +2406,7 @@ static void rna_def_constraint_pivot(BlenderRNA *brna)
"Offset will be an absolute point in space
instead of relative to the target");
RNA_def_property_update(prop, NC_OBJECT | ND_CONSTRAINT,
"rna_Constraint_update");
- prop = RNA_def_property(srna, "offset", PROP_FLOAT, PROP_XYZ);
+ prop = RNA_def_property(srna, "offset", PROP_FLOAT, PROP_TRANSLATION);
RNA_def_property_float_sdna(prop, NULL, "offset");
RNA_def_property_ui_text(prop, "Offset",
"Offset of pivot from target (when set), or
from owner's location "
diff --git a/source/blender/makesrna/intern/rna_modifier.c
b/source/blender/makesrna/intern/rna_modifier.c
index 76f64b5fcb7..d2822438a39 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -4872,7 +4872,7 @@ static void rna_def_modifier_datatransfer(BlenderRNA
*brna)
RNA_def_property_enum_funcs(prop, NULL, NULL,
"rna_DataTransferModifier_mix_mode_itemf");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
- prop = RNA_def_float(srna, "mix_factor", 1.0f, 0.0f, 1.0f, "Mix Factor",
+ prop = RNA_def_float_factor(srna, "mix_factor", 1.0f, 0.0f, 1.0f, "Mix
Factor",
"Factor to use when applying data to destination
(exact behavior depends on mix mode)",
0.0f, 1.0f);
RNA_def_property_update(prop, 0, "rna_Modifier_update");
diff --git a/source/blender/makesrna/intern/rna_smoke.c
b/source/blender/makesrna/intern/rna_smoke.c
index 59c911ab8ec..3f44d488497 100644
--- a/source/blender/makesrna/intern/rna_smoke.c
+++ b/source/blender/makesrna/intern/rna_smoke.c
@@ -757,7 +757,7 @@ static void rna_def_smoke_domain_settings(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Smoke", "Amount of smoke created by
burning fuel");
RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER,
"rna_Smoke_resetCache");
- prop = RNA_def_property(srna, "flame_vorticity", PROP_FLOAT, PROP_NONE);
+ prop = RNA_def_property(srna, "flame_vorticity", PROP_FLOAT,
PROP_FACTOR);
RNA_def_property_range(prop, 0.0, 2.0);
RNA_def_property_ui_range(prop, 0.0, 1.0, 1.0, 5);
RNA_def_property_ui_text(prop, "Vorticity", "Additional vorticity for
the flames");
@@ -842,7 +842,7 @@ static void rna_def_smoke_domain_settings(BlenderRNA *brna)
"How many slices per voxel should be
generated");
RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, NULL);
- prop = RNA_def_property(srna, "slice_depth", PROP_FLOAT, PROP_NONE);
+ prop = RNA_def_property(srna, "slice_depth", PROP_FLOAT, PROP_FACTOR);
RNA_def_property_float_sdna(prop, NULL, "slice_depth");
RNA_def_property_range(prop, 0.0, 1.0);
RNA_def_property_ui_range(prop, 0.0, 1.0, 0.1, 3);
@@ -954,7 +954,7 @@ static void rna_def_smoke_flow_settings(BlenderRNA *brna)
RNA_def_struct_sdna(srna, "SmokeFlowSettings");
RNA_def_struct_path_func(srna, "rna_SmokeFlowSettings_path");
- prop = RNA_def_property(srna, "density", PROP_FLOAT, PROP_NONE);
+ prop = RNA_def_property(srna, "density", PROP_FLOAT, PROP_FACTOR);
RNA_def_property_float_sdna(prop, NULL, "density");
RNA_def_property_range(prop, 0.0, 1);
RNA_def_property_ui_range(prop, 0.0, 1.0, 1.0, 4);
@@ -1030,13 +1030,13 @@ static void rna_def_smoke_flow_settings(BlenderRNA
*brna)
RNA_def_property_ui_text(prop, "Random", "Amount of random velocity");
RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER,
"rna_Smoke_reset");
- prop = RNA_def_property(srna, "volume_density", PROP_FLOAT, PROP_NONE);
+ prop = RNA_def_property(srna, "volume_density", PROP_FLOAT,
PROP_FACTOR);
RNA_def_property_range(prop, 0.0, 1.0);
RNA_def_property_ui_range(prop, 0.0, 1.0, 0.05, 5);
RNA_def_property_ui_text(prop, "Volume", "Factor for smoke emitted from
inside the mesh volume");
RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER,
"rna_Smoke_reset");
- prop = RNA_def_property(srna, "surface_distance", PROP_FLOAT,
PROP_NONE);
+ prop = RNA_def_property(srna, "surface_distance", PROP_FLOAT,
PROP_DISTANCE);
RNA_def_property_range(prop, 0.0, 10.0);
RNA_def_property_ui_range(prop, 0.5, 5.0, 0.05, 5);
RNA_def_property_ui_text(prop, "Surface", "Maximum distance from mesh
surface to emit smoke");
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
