diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-11-14 09:12:52 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-11-14 09:21:34 +0300 |
commit | 55e719ec35a10c3f9e7231dee13d4b05aad7d965 (patch) | |
tree | 563ed5b1b27e9613de8384da90197ce2c3e1924b /source/blender/makesrna/intern/rna_fcurve.c | |
parent | c279f879ab86e03dff0dbfd3a36b14bebb4956f9 (diff) | |
parent | d7f55c4ff58f87b80f0ce2fa43ce2f7cd2b72675 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesrna/intern/rna_fcurve.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_fcurve.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/source/blender/makesrna/intern/rna_fcurve.c b/source/blender/makesrna/intern/rna_fcurve.c index 7b714bef186..b4715075624 100644 --- a/source/blender/makesrna/intern/rna_fcurve.c +++ b/source/blender/makesrna/intern/rna_fcurve.c @@ -111,8 +111,10 @@ static StructRNA *rna_FModifierType_refine(struct PointerRNA *ptr) return &RNA_FModifierCycles; case FMODIFIER_TYPE_NOISE: return &RNA_FModifierNoise; - /*case FMODIFIER_TYPE_FILTER: */ - /* return &RNA_FModifierFilter; */ +#if 0 + case FMODIFIER_TYPE_FILTER: + return &RNA_FModifierFilter; +#endif case FMODIFIER_TYPE_PYTHON: return &RNA_FModifierPython; case FMODIFIER_TYPE_LIMITS: @@ -1058,8 +1060,8 @@ static void rna_def_fmodifier_envelope_ctrl(BlenderRNA *brna) RNA_def_struct_sdna(srna, "FCM_EnvelopeData"); /* min/max extents - * - for now, these are allowed to go past each other, so that we can have inverted action - * - technically, the range is limited by the settings in the envelope-modifier data, not here... + * - for now, these are allowed to go past each other, so that we can have inverted action + * - technically, the range is limited by the settings in the envelope-modifier data, not here... */ prop = RNA_def_property(srna, "min", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "min"); @@ -1078,7 +1080,7 @@ static void rna_def_fmodifier_envelope_ctrl(BlenderRNA *brna) RNA_def_property_update(prop, NC_ANIMATION | ND_KEYFRAME | NA_EDITED, "rna_FModifier_update"); /* TODO: */ - /* - selection flags (not implemented in UI yet though) */ + /* - selection flags (not implemented in UI yet though) */ } static void rna_def_fmodifier_envelope_control_points(BlenderRNA *brna, PropertyRNA *cprop) @@ -1603,7 +1605,7 @@ static void rna_def_drivervar(BlenderRNA *brna) static void rna_def_channeldriver_variables(BlenderRNA *brna, PropertyRNA *cprop) { StructRNA *srna; -/* PropertyRNA *prop; */ + /* PropertyRNA *prop; */ FunctionRNA *func; PropertyRNA *parm; |