diff options
author | Campbell Barton <ideasman42@gmail.com> | 2021-08-26 05:27:16 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2021-08-26 05:36:58 +0300 |
commit | 42032db1c220e2a10d2d80879ec0037b4e12257e (patch) | |
tree | 2b198f3c34ec6a5a0f9e0c7ee5bc0b6b89fffa9d /source | |
parent | afcd06e1e11b1166deb55b0ce05b777706369028 (diff) |
Cleanup: remove deprecated flag use in collada
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/io/collada/AnimationImporter.cpp | 4 | ||||
-rw-r--r-- | source/blender/io/collada/BCAnimationCurve.cpp | 2 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_anim_types.h | 5 |
3 files changed, 6 insertions, 5 deletions
diff --git a/source/blender/io/collada/AnimationImporter.cpp b/source/blender/io/collada/AnimationImporter.cpp index e54192abc54..5b6391c1b9c 100644 --- a/source/blender/io/collada/AnimationImporter.cpp +++ b/source/blender/io/collada/AnimationImporter.cpp @@ -58,7 +58,7 @@ template<class T> static const char *bc_get_joint_name(T *node) FCurve *AnimationImporter::create_fcurve(int array_index, const char *rna_path) { FCurve *fcu = BKE_fcurve_create(); - fcu->flag = (FCURVE_VISIBLE | FCURVE_AUTO_HANDLES | FCURVE_SELECTED); + fcu->flag = (FCURVE_VISIBLE | FCURVE_SELECTED); fcu->rna_path = BLI_strdupn(rna_path, strlen(rna_path)); fcu->array_index = array_index; return fcu; @@ -102,7 +102,7 @@ void AnimationImporter::animation_to_fcurves(COLLADAFW::AnimationCurve *curve) for (i = 0; i < dim; i++) { FCurve *fcu = BKE_fcurve_create(); - fcu->flag = (FCURVE_VISIBLE | FCURVE_AUTO_HANDLES | FCURVE_SELECTED); + fcu->flag = (FCURVE_VISIBLE | FCURVE_SELECTED); fcu->array_index = 0; fcu->auto_smoothing = U.auto_smoothing_new; diff --git a/source/blender/io/collada/BCAnimationCurve.cpp b/source/blender/io/collada/BCAnimationCurve.cpp index 0e31e522ec4..82d8b6e9ff3 100644 --- a/source/blender/io/collada/BCAnimationCurve.cpp +++ b/source/blender/io/collada/BCAnimationCurve.cpp @@ -95,7 +95,7 @@ void BCAnimationCurve::delete_fcurve(FCurve *fcu) FCurve *BCAnimationCurve::create_fcurve(int array_index, const char *rna_path) { FCurve *fcu = BKE_fcurve_create(); - fcu->flag = (FCURVE_VISIBLE | FCURVE_AUTO_HANDLES | FCURVE_SELECTED); + fcu->flag = (FCURVE_VISIBLE | FCURVE_SELECTED); fcu->rna_path = BLI_strdupn(rna_path, strlen(rna_path)); fcu->array_index = array_index; return fcu; diff --git a/source/blender/makesdna/DNA_anim_types.h b/source/blender/makesdna/DNA_anim_types.h index a49a76c3f26..5dbed6b4d24 100644 --- a/source/blender/makesdna/DNA_anim_types.h +++ b/source/blender/makesdna/DNA_anim_types.h @@ -658,9 +658,10 @@ typedef enum eFCurve_Flags { /** FCurve will not be evaluated for the next round. */ FCURVE_MUTED = (1 << 4), +#ifdef DNA_DEPRECATED_ALLOW /** fcurve uses 'auto-handles', which stay horizontal... */ - // DEPRECATED - FCURVE_AUTO_HANDLES = (1 << 5), + FCURVE_AUTO_HANDLES = (1 << 5), /* Dirty. */ +#endif FCURVE_MOD_OFF = (1 << 6), /** skip evaluation, as RNA-path cannot be resolved * (similar to muting, but cannot be set by user) */ |