diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-06 20:52:20 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-06 20:52:20 +0300 |
| commit | 1c4b04f1fde15a3be86a650b54f6e23030a97973 (patch) | |
| tree | 26e7d27e411b261d9d6ee26e302dce5967961fec /source/blender/makesrna/intern/rna_animation.c | |
| parent | 4165a57a66724b9b0f7e696a9d0ef75ee29a6af8 (diff) | |
| parent | 0e68751b8a0bac59a275b1fe3d818b8259d1cc7f (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesrna/intern/rna_animation.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_animation.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_animation.c b/source/blender/makesrna/intern/rna_animation.c index 0b928e63545..d2c719ac5d1 100644 --- a/source/blender/makesrna/intern/rna_animation.c +++ b/source/blender/makesrna/intern/rna_animation.c @@ -1074,7 +1074,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); |