diff options
| author | Hans Goudey <h.goudey@me.com> | 2020-08-12 04:59:16 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2020-08-12 04:59:16 +0300 |
| commit | ef11238c743e6985fe325280fb13e05d6ec27378 (patch) | |
| tree | 1dd2605a676bee52296535825b99f000a9c255eb /source/blender/io/collada/BCAnimationCurve.cpp | |
| parent | 1f768bbe4145daed111636ca09dd53b25b8d29b5 (diff) | |
| parent | ec5f39208785c1bbe723054ffe69e1ac2ab470dd (diff) | |
Merge branch 'master' into property-search-uiproperty-search-ui
Diffstat (limited to 'source/blender/io/collada/BCAnimationCurve.cpp')
| -rw-r--r-- | source/blender/io/collada/BCAnimationCurve.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/io/collada/BCAnimationCurve.cpp b/source/blender/io/collada/BCAnimationCurve.cpp index 61dded368b5..5fdbb65fb6e 100644 --- a/source/blender/io/collada/BCAnimationCurve.cpp +++ b/source/blender/io/collada/BCAnimationCurve.cpp @@ -559,9 +559,8 @@ inline bool operator<(const BCAnimationCurve &lhs, const BCAnimationCurve &rhs) const int rha = rhs.get_channel_index(); return lha < rha; } - else { - return lhtgt < rhtgt; - } + + return lhtgt < rhtgt; } BCCurveKey::BCCurveKey() |