From 7f2cb4da8e2094adc753abf99cd8b6e0053a43d7 Mon Sep 17 00:00:00 2001
From: Relintai <relintai@protonmail.com>
Date: Thu, 14 Apr 2022 12:14:59 +0200
Subject: [PATCH] Fix uv island editing.

---
 .../uv_editor/mdr_uv_rect_view_node.cpp       | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/modules/mesh_data_resource/editor/uv_editor/mdr_uv_rect_view_node.cpp b/modules/mesh_data_resource/editor/uv_editor/mdr_uv_rect_view_node.cpp
index 357d27060..21838b200 100644
--- a/modules/mesh_data_resource/editor/uv_editor/mdr_uv_rect_view_node.cpp
+++ b/modules/mesh_data_resource/editor/uv_editor/mdr_uv_rect_view_node.cpp
@@ -63,7 +63,7 @@ void MDRUVRectViewNode::mirror_horizontal() {
 		int index = r[ii];
 		bool found = false;
 
-		PoolIntArray::Read pr = _indices.read();
+		PoolIntArray::Read pr = pia.read();
 
 		for (int i = 0; i < pia.size(); ++i) {
 			if (pr[i] == index) {
@@ -85,6 +85,8 @@ void MDRUVRectViewNode::mirror_horizontal() {
 		_uvs.set(index, uv);
 	}
 
+	r.release();
+
 	apply_uv();
 	update();
 }
@@ -97,7 +99,7 @@ void MDRUVRectViewNode::mirror_vertical() {
 		int index = r[ii];
 		bool found = false;
 
-		PoolIntArray::Read pr = _indices.read();
+		PoolIntArray::Read pr = pia.read();
 
 		for (int i = 0; i < pia.size(); ++i) {
 			if (pr[i] == index) {
@@ -119,6 +121,8 @@ void MDRUVRectViewNode::mirror_vertical() {
 		_uvs.set(index, uv);
 	}
 
+	r.release();
+
 	apply_uv();
 	update();
 }
@@ -133,7 +137,7 @@ void MDRUVRectViewNode::rotate_uvs(float amount) {
 		int index = r[ii];
 		bool found = false;
 
-		PoolIntArray::Read pr = _indices.read();
+		PoolIntArray::Read pr = pia.read();
 
 		for (int i = 0; i < pia.size(); ++i) {
 			if (pr[i] == index) {
@@ -155,6 +159,8 @@ void MDRUVRectViewNode::rotate_uvs(float amount) {
 		_uvs.set(index, uv);
 	}
 
+	r.release();
+
 	re_normalize_uvs();
 	apply_uv();
 	update();
@@ -260,7 +266,7 @@ void MDRUVRectViewNode::re_normalize_uvs() {
 		uv.y -= vmin.y;
 		uv.y /= ymm;
 
-		_uvs[i] = uv;
+		_uvs.set(i, uv);
 	}
 }
 void MDRUVRectViewNode::normalize_uvs() {
@@ -284,7 +290,7 @@ void MDRUVRectViewNode::normalize_uvs() {
 		uv.y -= _uv_min.y;
 		uv.y /= ymm;
 
-		_uvs[i] = uv;
+		_uvs.set(i, uv);
 	}
 }
 void MDRUVRectViewNode::apply_uv() {
@@ -312,14 +318,14 @@ void MDRUVRectViewNode::apply_uv() {
 
 	PoolVector2Array uvs = arrays[ArrayMesh::ARRAY_TEX_UV];
 
-	for (int i = 0; i < _uvs.size(); ++i) {
+	for (int i = 0; i < _indices.size(); ++i) {
 		int index = _indices[i];
 
 		Vector2 uv = _uvs[index];
 
 		uv = uv * rect.size + rect.position;
 
-		uvs[index] = uv;
+		uvs.set(index, uv);
 	}
 
 	_uv_min = rect.position;