浏览代码

Build: Updated 'bsf' version

BearishSun 6 年之前
父节点
当前提交
69f5fd9d8b

+ 1 - 1
Source/EditorCore/Private/RTTI/BsProjectLibraryEntriesRTTI.h

@@ -166,7 +166,7 @@ namespace bs
 			{
 				ProjectLibrary::LibraryEntryType childType = ProjectLibrary::LibraryEntryType::File;
 
-				uint32_t prevLoc = stream.tell();
+				uint64_t prevLoc = stream.tell();
 				stream.skipBytes(sizeof(uint32_t)); // Skip ahead to get the type
 				rtti_read(childType, stream);
 				stream.seek(prevLoc);

+ 1 - 1
Source/EditorScript/Wrappers/BsScriptSerializedDiff.cpp

@@ -44,7 +44,7 @@ namespace bs
 
 		SPtr<IReflectable> diff;
 		if(oldManagedSerializedObject != nullptr && newManagedSerializedObject != nullptr)
-			diff = ManagedSerializableDiff::create(oldManagedSerializedObject, newManagedSerializedObject);
+			diff = ManagedSerializableDiff::create(oldManagedSerializedObject.get(), newManagedSerializedObject.get());
 		else if(oldNativeSerializedObj != nullptr && newNativeSerializedObj != nullptr)
 		{
 			BinaryDiff diffHandler;

+ 1 - 1
Source/EditorScript/Wrappers/BsScriptUnitTests.cpp

@@ -47,7 +47,7 @@ namespace bs
 		SPtr<ManagedSerializableObject> serializableOldObj = ManagedSerializableObject::createFromExisting(oldObj);
 		SPtr<ManagedSerializableObject> serializableNewObj = ManagedSerializableObject::createFromExisting(newObj);
 
-		tempDiff = ManagedSerializableDiff::create(serializableOldObj, serializableNewObj);
+		tempDiff = ManagedSerializableDiff::create(serializableOldObj.get(), serializableNewObj.get());
 	}
 
 	void ScriptUnitTests::internal_UT3_ApplyDiff(MonoObject* obj)

+ 1 - 1
Source/bsf

@@ -1 +1 @@
-Subproject commit c67c12dc57519f21659f56660f19b06be96f889f
+Subproject commit 41e122d24a286413f81acaaa83f8430979cc56e1