Просмотр исходного кода

Build: Revert accidental commit "WIP"
- This reverts commit 44e1123d5c7f485118e54a0e4149d75022ced34e.

BearishSun 7 лет назад
Родитель
Сommit
c0995ff9cf
1 измененных файлов с 20 добавлено и 24 удалено
  1. 20 24
      Source/EditorCore/Library/BsProjectLibrary.cpp

+ 20 - 24
Source/EditorCore/Library/BsProjectLibrary.cpp

@@ -487,30 +487,6 @@ namespace bs
 			mQueuedImports[fileEntry] = queuedImport;
 			mQueuedImports[fileEntry] = queuedImport;
 
 
 			fileEntry->lastUpdateTime = std::time(nullptr);
 			fileEntry->lastUpdateTime = std::time(nullptr);
-
-			// TODO - Copy native resource directly
-			if (!newResources.empty())
-			{
-				Path internalResourcesPath = mProjectFolder;
-				internalResourcesPath.append(INTERNAL_RESOURCES_DIR);
-
-				if (!FileSystem::isDirectory(internalResourcesPath))
-					FileSystem::createDir(internalResourcesPath);
-
-				for (auto& entry : newResources)
-				{
-					String uuidStr = entry.getUUID().toString();
-
-					internalResourcesPath.setFilename(uuidStr + ".asset");
-					gResources().save(entry, internalResourcesPath, true);
-
-					const UUID& uuid = entry.getUUID();
-
-					// TODO - Not thread safe
-					mResourceManifest->registerResource(uuid, internalResourcesPath);
-				}
-			}
-
 			return true;
 			return true;
 		}
 		}
 
 
@@ -664,6 +640,26 @@ namespace bs
 
 
 			addDependencies(fileEntry);
 			addDependencies(fileEntry);
 
 
+			if (!newResources.empty())
+			{
+				Path internalResourcesPath = mProjectFolder;
+				internalResourcesPath.append(INTERNAL_RESOURCES_DIR);
+
+				if (!FileSystem::isDirectory(internalResourcesPath))
+					FileSystem::createDir(internalResourcesPath);
+
+				for (auto& entry : newResources)
+				{
+					String uuidStr = entry.getUUID().toString();
+
+					internalResourcesPath.setFilename(uuidStr + ".asset");
+					gResources().save(entry, internalResourcesPath, true);
+
+					const UUID& uuid = entry.getUUID();
+					mResourceManifest->registerResource(uuid, internalResourcesPath);
+				}
+			}
+
 			onEntryImported(fileEntry->path);
 			onEntryImported(fileEntry->path);
 			reimportDependants(fileEntry->path);
 			reimportDependants(fileEntry->path);