From f1956d949638bbd984bc8096874367600b8108a0 Mon Sep 17 00:00:00 2001 From: Mario Zechner Date: Mon, 19 Aug 2024 14:01:33 +0200 Subject: [PATCH] Formatting. --- spine-c/spine-c/src/spine/Animation.c | 8 ++++---- spine-cpp/spine-cpp/src/spine/InheritTimeline.cpp | 8 ++++---- spine-godot/spine_godot/SpineAnimationTrack.cpp | 2 +- spine-godot/spine_godot/SpineSprite.cpp | 3 ++- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/spine-c/spine-c/src/spine/Animation.c b/spine-c/spine-c/src/spine/Animation.c index 56921f6f0d..331bb4f5d3 100644 --- a/spine-c/spine-c/src/spine/Animation.c +++ b/spine-c/spine-c/src/spine/Animation.c @@ -2163,10 +2163,10 @@ void _spInheritTimeline_apply(spTimeline *timeline, spSkeleton *skeleton, float float *frames = self->super.frames->items; if (!bone->active) return; - if (direction == SP_MIX_DIRECTION_OUT) { - if (blend == SP_MIX_BLEND_SETUP) bone->inherit = bone->data->inherit; - return; - } + if (direction == SP_MIX_DIRECTION_OUT) { + if (blend == SP_MIX_BLEND_SETUP) bone->inherit = bone->data->inherit; + return; + } if (time < frames[0]) { if (blend == SP_MIX_BLEND_SETUP || blend == SP_MIX_BLEND_FIRST) bone->inherit = bone->data->inherit; diff --git a/spine-cpp/spine-cpp/src/spine/InheritTimeline.cpp b/spine-cpp/spine-cpp/src/spine/InheritTimeline.cpp index 9bd5936992..f3326d04cc 100644 --- a/spine-cpp/spine-cpp/src/spine/InheritTimeline.cpp +++ b/spine-cpp/spine-cpp/src/spine/InheritTimeline.cpp @@ -67,10 +67,10 @@ void InheritTimeline::apply(Skeleton &skeleton, float lastTime, float time, Vect Bone *bone = skeleton.getBones()[_boneIndex]; if (!bone->isActive()) return; - if (direction == MixDirection_Out) { - if (blend == MixBlend_Setup) bone->setInherit(bone->_data.getInherit()); - return; - } + if (direction == MixDirection_Out) { + if (blend == MixBlend_Setup) bone->setInherit(bone->_data.getInherit()); + return; + } if (time < _frames[0]) { if (blend == MixBlend_Setup || blend == MixBlend_First) bone->_inherit = bone->_data.getInherit(); diff --git a/spine-godot/spine_godot/SpineAnimationTrack.cpp b/spine-godot/spine_godot/SpineAnimationTrack.cpp index 4de781d473..da0b80c5ad 100644 --- a/spine-godot/spine_godot/SpineAnimationTrack.cpp +++ b/spine-godot/spine_godot/SpineAnimationTrack.cpp @@ -182,7 +182,7 @@ void SpineAnimationTrack::setup_animation_player() { #if VERSION_MAJOR > 3 List animation_libraries; animation_player->get_animation_library_list(&animation_libraries); - for (auto iter = animation_libraries.front(); iter; iter = iter->next()) { + for (auto iter = animation_libraries.front(); iter; iter = iter->next()) { animation_player->remove_animation_library(iter->get()); } #else diff --git a/spine-godot/spine_godot/SpineSprite.cpp b/spine-godot/spine_godot/SpineSprite.cpp index 49571d41ff..f83bd37837 100644 --- a/spine-godot/spine_godot/SpineSprite.cpp +++ b/spine-godot/spine_godot/SpineSprite.cpp @@ -60,7 +60,8 @@ else #endif #endif -Ref SpineSprite::default_materials[4] = {}; + Ref + SpineSprite::default_materials[4] = {}; static int sprite_count = 0; static spine::Vector quad_indices; static spine::Vector scratch_vertices;