Commit: 70b705b5fecc94df9fdc5a5c69c10a9249f8e49c
Author: Aaron Carlisle
Date: Wed Jun 6 12:00:04 2018 -0400
Branches: master
https://developer.blender.org/rB70b705b5fecc94df9fdc5a5c69c10a9249f8e49c
UI: NLA: Influence should be a factor (RNA)
===================================================================
M source/blender/makesrna/intern/rna_animation.c
M source/blender/makesrna/intern/rna_nla.c
===================================================================
diff --git a/source/blender/makesrna/intern/rna_animation.c
b/source/blender/makesrna/intern/rna_animation.c
index 6779e74700d..3f8a7bc96e8 100644
--- a/source/blender/makesrna/intern/rna_animation.c
+++ b/source/blender/makesrna/intern/rna_animation.c
@@ -1042,7 +1042,7 @@ static void rna_def_animdata(BlenderRNA *brna)
"Method used for combining Active Action's
result with result of NLA stack");
RNA_def_property_update(prop, NC_ANIMATION | ND_NLA, NULL); /* this
will do? */
- prop = RNA_def_property(srna, "action_influence", PROP_FLOAT,
PROP_NONE);
+ prop = RNA_def_property(srna, "action_influence", PROP_FLOAT,
PROP_FACTOR);
RNA_def_property_float_sdna(prop, NULL, "act_influence");
RNA_def_property_float_default(prop, 1.0f);
RNA_def_property_range(prop, 0.0f, 1.0f);
diff --git a/source/blender/makesrna/intern/rna_nla.c
b/source/blender/makesrna/intern/rna_nla.c
index f1c02896447..ce2fba37053 100644
--- a/source/blender/makesrna/intern/rna_nla.c
+++ b/source/blender/makesrna/intern/rna_nla.c
@@ -656,7 +656,7 @@ static void rna_def_nlastrip(BlenderRNA *brna)
"NLA Strips that this strip acts as a
container for (if it is of type Meta)");
/* Settings - Values necessary for evaluation */
- prop = RNA_def_property(srna, "influence", PROP_FLOAT, PROP_NONE);
+ prop = RNA_def_property(srna, "influence", PROP_FLOAT, PROP_FACTOR);
RNA_def_property_range(prop, 0.0f, 1.0f);
RNA_def_property_ui_text(prop, "Influence", "Amount the strip
contributes to the current result");
/* XXX: Update temporarily disabled so that the property can be edited
at all!
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
