소스 검색

Reverted attribue editor count logic as it does not work for all cases.

Wei Tjong Yao 12 년 전
부모
커밋
4b8aab55f7
1개의 변경된 파일2개의 추가작업 그리고 7개의 파일을 삭제
  1. 2 7
      Bin/Data/Scripts/Editor/AttributeEditor.as

+ 2 - 7
Bin/Data/Scripts/Editor/AttributeEditor.as

@@ -13,7 +13,6 @@ const StringHash TEXT_CHANGED_EVENT_TYPE("TextChanged");
 
 bool inLoadAttributeEditor = false;
 bool showNonEditableAttribute = false;
-uint attributeCountAdjustment = 0;
 
 Color normalTextColor(1.0f, 1.0f, 1.0f);
 Color modifiedTextColor(1.0f, 0.8f, 0.5f);
@@ -361,7 +360,7 @@ uint GetAttributeEditorCount(Array<Serializable@>@ serializables)
         }
     }
 
-    return count - attributeCountAdjustment;
+    return count;
 }
 
 UIElement@ GetAttributeEditorParent(UIElement@ parent, uint index, uint subIndex)
@@ -390,7 +389,7 @@ void LoadAttributeEditor(ListView@ list, Array<Serializable@>@ serializables, co
             sameName = false;
             break;
         }
-        
+
         Variant val = serializables[i].attributes[index];
         if (val != value)
             sameValue = false;
@@ -401,10 +400,7 @@ void LoadAttributeEditor(ListView@ list, Array<Serializable@>@ serializables, co
     if (sameName)
         LoadAttributeEditor(parent, value, info, editable, sameValue, values);
     else
-    {
         parent.Remove();
-        ++attributeCountAdjustment;
-    }
 
     inLoadAttributeEditor = false;
 }
@@ -706,7 +702,6 @@ void UpdateAttributes(Array<Serializable@>@ serializables, ListView@ list, bool
     if (fullUpdate)
     {
         list.RemoveAllItems();
-        attributeCountAdjustment = 0;
         Array<UIElement@> children = list.GetChildren();
         for (uint i = 0; i < children.length; ++i)
         {