Merge branch '4.1' into 4.2-beta

# Conflicts:
#	.gitignore

.gitignore

@@ -178,6 +178,10 @@ spine-godot/logs
 !spine-godot/build
 spine-ts/spine-ts.zip
 *.d
+
 spine-flutter/ios/Classes/spine-cpp
 spine-flutter/macos/Classes/spine-cpp
 spine-flutter/src/spine-cpp
+
+spine-godot/.clang-format
+

spine-godot/build/setup.sh

@@ -23,6 +23,7 @@ git clone --depth 1 https://github.com/godotengine/godot.git -b $branch
 if [ $dev = "true" ]; then
 	cp -r .idea godot
 	cp build/custom.py godot
+	cp ../formatters/.clang-format .
 	rm -rf example/.import
 	rm -rf example/.godot
 

spine-godot/example/examples/02-animation-state-listeners/animation-state-listeners.tscn

@@ -11,6 +11,7 @@ script = ExtResource( 1 )
 position = Vector2( 473, 487 )
 scale = Vector2( 0.575051, 0.575051 )
 skeleton_data_res = ExtResource( 2 )
+preview_skin = "Default"
 preview_animation = "-- Empty --"
 preview_frame = false
 preview_time = 0.0

spine-godot/example/examples/04-simple-input/simple-input.tscn

@@ -9,6 +9,7 @@
 position = Vector2( 501.503, 472.035 )
 scale = Vector2( 0.518624, 0.518624 )
 skeleton_data_res = ExtResource( 1 )
+preview_skin = "Default"
 preview_animation = "-- Empty --"
 preview_frame = false
 preview_time = 0.0

spine-godot/example/examples/05-mouse-following/mouse-following.tscn

@@ -10,6 +10,7 @@ script = ExtResource( 1 )
 position = Vector2( 481, 457 )
 scale = Vector2( 0.5, 0.5 )
 skeleton_data_res = ExtResource( 2 )
+preview_skin = "Default"
 preview_animation = "-- Empty --"
 preview_frame = false
 preview_time = 0.0

spine-godot/example/examples/06-bone-following/bone-following.tscn

@@ -11,6 +11,7 @@ script = ExtResource( 2 )
 position = Vector2( 478, 483 )
 scale = Vector2( 0.58461, 0.58461 )
 skeleton_data_res = ExtResource( 1 )
+preview_skin = "Default"
 preview_animation = ""
 preview_frame = false
 preview_time = 0.0

spine-godot/example/examples/07-slot-node/slot-node.tscn

@@ -12,6 +12,7 @@ script = ExtResource( 1 )
 position = Vector2( 474, 506 )
 scale = Vector2( 0.560712, 0.560712 )
 skeleton_data_res = ExtResource( 2 )
+preview_skin = "Default"
 preview_animation = "-- Empty --"
 preview_frame = false
 preview_time = 0.0
@@ -27,6 +28,7 @@ slot_name = "gun"
 position = Vector2( 84.6909, -67.9174 )
 scale = Vector2( 0.193472, 0.193472 )
 skeleton_data_res = ExtResource( 3 )
+preview_skin = "Default"
 preview_animation = "-- Empty --"
 preview_frame = false
 preview_time = 0.0
@@ -54,6 +56,7 @@ slot_name = "front-fist"
 position = Vector2( -2.64624, -10.8111 )
 scale = Vector2( 0.193389, 0.193389 )
 skeleton_data_res = ExtResource( 2 )
+preview_skin = "Default"
 preview_animation = "-- Empty --"
 preview_frame = false
 preview_time = 0.0

spine-godot/example/examples/08-animation-player/animation-player.tscn

@@ -1850,6 +1850,7 @@ script = ExtResource( 2 )
 position = Vector2( 72.0001, 520 )
 scale = Vector2( 0.323942, 0.323942 )
 skeleton_data_res = ExtResource( 1 )
+preview_skin = "Default"
 preview_animation = "-- Empty --"
 preview_frame = false
 preview_time = 0.0
@@ -1919,6 +1920,7 @@ anims/walk_looped = SubResource( 129 )
 position = Vector2( 1284, 520 )
 scale = Vector2( -0.328761, 0.328761 )
 skeleton_data_res = ExtResource( 3 )
+preview_skin = "Default"
 preview_animation = "-- Empty --"
 preview_frame = false
 preview_time = 0.0

spine-godot/example/examples/09-custom-material/custom-material.tscn

@@ -31,6 +31,7 @@ position = Vector2( 501, 507 )
 scale = Vector2( 0.546374, 0.546373 )
 skeleton_data_res = ExtResource( 1 )
 normal_material = SubResource( 2 )
+preview_skin = "Default"
 preview_animation = "-- Empty --"
 preview_frame = false
 preview_time = 0.0

spine-godot/example/examples/10-2d-lighting/2d-lighting.tscn

@@ -11,6 +11,7 @@ script = ExtResource( 3 )
 position = Vector2( 576, 506 )
 scale = Vector2( 0.458967, 0.458967 )
 skeleton_data_res = ExtResource( 1 )
+preview_skin = "Default"
 preview_animation = "-- Empty --"
 preview_frame = false
 preview_time = 0.0

spine-godot/spine_godot/SpineSprite.cpp

@@ -536,6 +536,7 @@ void SpineSprite::update_meshes(Ref<SpineSkeleton> skeleton_ref) {
 		spine::Slot *slot = skeleton->getDrawOrder()[i];
 		spine::Attachment *attachment = slot->getAttachment();
 		MeshInstance2D *mesh_instance = mesh_instances[i];
+		mesh_instance->set_light_mask(get_light_mask());
 		clear_mesh_instance(mesh_instance);
 		if (!attachment) {
 			skeleton_clipper->clipEnd(*slot);
@@ -621,7 +622,7 @@ void SpineSprite::update_meshes(Ref<SpineSkeleton> skeleton_ref) {
 			Ref<Material> custom_material;
 
 			// See if we have a slot node for this slot with a custom material
-			auto &nodes = slot_nodes[i];
+			auto &nodes = slot_nodes[slot->getData().getIndex()];
 			if (nodes.size() > 0) {
 				auto slot_node = nodes[0];
 				if (slot_node) {