Commit: f367e02ea985ded763495b431ac8c739f6afe8b4 - MikuMikuStudio (git)

Main repository of MikuMikuStudio

Commit MetaInfo

• Revisión: f367e02ea985ded763495b431ac8c739f6afe8b4 (tree)
• Tiempo: 2013-07-08 06:17:30
• Autor: [e-mail] <remy.bouquet@gmai...>
• Commiter: [e-mail]

Log Message

- Fixed issue introduced in last change of Mesh write method. Hardware Skinning buffers were not properly ignored at save time in some rare cases, and were causing a crash

git-svn-id: http://jmonkeyengine.googlecode.com/svn/trunk@10697 75d07b2b-3a1a-0410-a2c5-0572b91ccdca

Cambiar Resumen

• modified: engine/src/core/com/jme3/scene/Mesh.java

Diferencia incremental

--- a/engine/src/core/com/jme3/scene/Mesh.java
+++ b/engine/src/core/com/jme3/scene/Mesh.java
@@ -1329,29 +1329,25 @@ public class Mesh implements Savable, Cloneable {
         //Removing HW skinning buffers to not save them
         VertexBuffer hwBoneIndex = null;
         VertexBuffer hwBoneWeight = null;
-        if (isAnimated()) {
-            hwBoneIndex = getBuffer(Type.HWBoneIndex);
-            if (hwBoneIndex != null) {
-                buffers.remove(Type.HWBoneIndex.ordinal());
-            }
-            hwBoneWeight = getBuffer(Type.HWBoneWeight);
-            if (hwBoneWeight != null) {
-                buffers.remove(Type.HWBoneWeight.ordinal());
-            }
+        hwBoneIndex = getBuffer(Type.HWBoneIndex);
+        if (hwBoneIndex != null) {
+            buffers.remove(Type.HWBoneIndex.ordinal());
         }
-        
+        hwBoneWeight = getBuffer(Type.HWBoneWeight);
+        if (hwBoneWeight != null) {
+            buffers.remove(Type.HWBoneWeight.ordinal());
+        }
+
         out.writeIntSavableMap(buffers, "buffers", null);
-        
+
         //restoring Hw skinning buffers.
-        if (isAnimated()) {
-            if (hwBoneIndex != null) {
-                buffers.put(hwBoneIndex.getBufferType().ordinal(), hwBoneIndex);               
-            }            
-            if (hwBoneWeight != null) {
-                buffers.put(hwBoneWeight.getBufferType().ordinal(), hwBoneWeight);                 
-            }
+        if (hwBoneIndex != null) {
+            buffers.put(hwBoneIndex.getBufferType().ordinal(), hwBoneIndex);
         }
-        
+        if (hwBoneWeight != null) {
+            buffers.put(hwBoneWeight.getBufferType().ordinal(), hwBoneWeight);
+        }
+
         out.write(lodLevels, "lodLevels", null);
     }