소스 검색

Make sure prefab diff remains on the object even after prefab update

BearishSun 10 년 전
부모
커밋
0450044d02
2개의 변경된 파일3개의 추가작업 그리고 1개의 파일을 삭제
  1. 2 0
      BansheeCore/Source/BsPrefabUtility.cpp
  2. 1 1
      SBansheeEngine/Source/BsManagedSerializableField.cpp

+ 2 - 0
BansheeCore/Source/BsPrefabUtility.cpp

@@ -118,6 +118,8 @@ namespace BansheeEngine
 				if (prefabDiff != nullptr)
 					prefabDiff->apply(newInstance);
 
+				newInstance->mPrefabDiff = prefabDiff;
+
 				newPrefabInstances.push_back({ newInstance, parent, newInstance->getLinkId() });
 			}
 		}

+ 1 - 1
SBansheeEngine/Source/BsManagedSerializableField.cpp

@@ -801,7 +801,7 @@ namespace BansheeEngine
 					HManagedResource managedResource = static_resource_cast<ManagedResource>(value);
 
 					ScriptManagedResource* scriptResource;
-					ScriptResourceManager::instance().getScriptResource(managedResource, &scriptResource, true);
+					ScriptResourceManager::instance().getScriptResource(managedResource, &scriptResource, false);
 
 					assert(scriptResource != nullptr); // Managed resource managed instance is created upon creation so it may never be null