Browse Source

Build: Updated 'bsf' version

BearishSun 6 years ago
parent
commit
84c136f30f

+ 1 - 1
Source/EditorCore/GUI/BsGUISceneTreeView.cpp

@@ -259,7 +259,7 @@ namespace bs
 
 	void GUISceneTreeView::updateTreeElementHierarchy()
 	{
-		HSceneObject root = gSceneManager().getRootNode();
+		HSceneObject root = gSceneManager().getMainScene()->getRoot();
 		mRootElement.mSceneObject = root;
 		mRootElement.mId = root->getInstanceId();
 		mRootElement.mSortedIdx = 0;

+ 1 - 1
Source/EditorCore/Testing/BsEditorTestSuite.cpp

@@ -580,7 +580,7 @@ namespace bs
 		HSceneObject light = SceneObject::create("Directional light");
 		light->addComponent<TestComponentA>();
 
-		HSceneObject sceneRoot = gSceneManager().getRootNode();
+		HSceneObject sceneRoot = gSceneManager().getMainScene()->getRoot();
 		HPrefab scenePrefab = Prefab::create(sceneRoot, true);
 
 		HSceneObject bDeleteMe = SceneObject::create("B");

+ 1 - 1
Source/EditorManaged/Windows/LogWindow.cs

@@ -66,7 +66,7 @@ namespace bs.Editor
         /// <summary>
         /// Opens the console window.
         /// </summary>
-        [MenuItem("Windows/Log", ButtonModifier.CtrlAlt, ButtonCode.L, 6000)]
+        [MenuItem("Windows/Log", ButtonModifier.CtrlAlt, ButtonCode.M, 6000)]
         private static void OpenConsoleWindow()
         {
             OpenWindow<LogWindow>();

+ 1 - 1
Source/EditorScript/BsScriptGizmoManager.cpp

@@ -45,7 +45,7 @@ namespace bs
 	{
 		GizmoManager::instance().clearGizmos();
 
-		HSceneObject rootSO = SceneManager::instance().getRootNode();
+		HSceneObject rootSO = SceneManager::instance().getMainScene()->getRoot();
 
 		Stack<HSceneObject> todo;
 		todo.push(rootSO);

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

@@ -232,7 +232,7 @@ namespace bs
 	MonoObject* ScriptEditorApplication::internal_SaveScene(MonoString* path)
 	{
 		Path nativePath = MonoUtil::monoToString(path);
-		HSceneObject sceneRoot = gSceneManager().getRootNode();
+		HSceneObject sceneRoot = gSceneManager().getMainScene()->getRoot();
 		
 		SPtr<ProjectResourceMeta> resMeta = gProjectLibrary().findResourceMeta(nativePath);
 		HPrefab scene;

+ 1 - 1
Source/bsf

@@ -1 +1 @@
-Subproject commit a4966d4a24df8a00540d2dcd63d4135f144263c8
+Subproject commit 0ddf18017f6b98478998f87f53f8178d0763a9ce