Лишние релоады вьюпорта

VaIeroK · Dec 2, 2022 · 3535849 · 3535849
1 parent e409b42
commit 3535849
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/OGF tool/Forms/OgfEditor.cs b/OGF tool/Forms/OgfEditor.cs
@@ -1388,7 +1388,8 @@ private void TextBoxBonesFilter(object sender, EventArgs e)
 								if (i != OGF_V.bonedata.bones.Count - 1)
 									BoneNamesBox.Text += "\n";
 							}
-							ViewPortNeedReload = true;
+                            if (ViewPortBones)
+								ViewPortNeedReload = true;
                         }
 						break;
 					case "MaterialBox": OGF_V.ikdata.bones[idx].material = curControl.Text; break;
@@ -1404,12 +1405,8 @@ private void TextBoxBonesFilter(object sender, EventArgs e)
 					case "RotationZ": OGF_V.ikdata.bones[idx].rotation[2] = Convert.ToSingle(curControl.Text); need_recalc_bones = true; break;
 				}
 
-				if (need_recalc_bones)
-				{
-					FixOldBonesBind(ref OGF_V);
-					CalcBonesTransform(ref OGF_V);
+				if (need_recalc_bones && (ViewPortBones || OGF_V.ikdata != null && OGF_V.ikdata.chunk_version == 2)) // Åñëè ïîêàçûâàåì êîñòè èëè çàãðóæåí ñòàðûé ìåø çàâèñÿùèé îò êîñòåé
 					ViewPortNeedReload = true;
-                }
             }
 
 			bKeyIsDown = false;
@@ -2648,6 +2645,9 @@ private void InitViewPort(bool create_model = true, bool force_texture_reload =
 			ViewerWorking = false;
             ViewPortNeedReload = false;
 
+            FixOldBonesBind(ref OGF_V);
+            CalcBonesTransform(ref OGF_V);
+
             if (ViewerThread != null && ViewerThread.ThreadState != System.Threading.ThreadState.Stopped)
 				ViewerThread.Abort();