Mario Zechner il y a 11 mois
Parent
commit
f1956d9496

+ 4 - 4
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;

+ 4 - 4
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();

+ 1 - 1
spine-godot/spine_godot/SpineAnimationTrack.cpp

@@ -182,7 +182,7 @@ void SpineAnimationTrack::setup_animation_player() {
 #if VERSION_MAJOR > 3
 		List<StringName> 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

+ 2 - 1
spine-godot/spine_godot/SpineSprite.cpp

@@ -60,7 +60,8 @@ else
 #endif
 #endif
 
-Ref<CanvasItemMaterial> SpineSprite::default_materials[4] = {};
+		Ref<CanvasItemMaterial>
+				SpineSprite::default_materials[4] = {};
 static int sprite_count = 0;
 static spine::Vector<unsigned short> quad_indices;
 static spine::Vector<float> scratch_vertices;