VOXEDIT: fixed restoring of previously selected palette for a new scene

vengi-voxel · Feb 23, 2025 · fa32347 · fa32347
1 parent 918e591
commit fa32347
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/tools/voxedit/modules/voxedit-ui/ViewMode.h b/src/tools/voxedit/modules/voxedit-ui/ViewMode.h
@@ -2,6 +2,8 @@
  * @file
  */
 
+#pragma once
+
 namespace voxedit {
 
 enum class ViewMode { Default, Simple, All, CommandAndConquer, Max };

diff --git a/src/tools/voxedit/modules/voxedit-util/SceneManager.cpp b/src/tools/voxedit/modules/voxedit-util/SceneManager.cpp
@@ -1451,6 +1451,11 @@ bool SceneManager::newScene(bool force, const core::String &name, voxel::RawVolu
 	} else {
 		newNode.setName(name);
 	}
+	palette::Palette palette;
+	if (!palette.load(core::Var::getSafe(cfg::VoxEditLastPalette)->strVal().c_str())) {
+		palette = voxel::getPalette();
+	}
+	newNode.setPalette(palette);
 	const int nodeId = scenegraph::moveNodeToSceneGraph(_sceneGraph, newNode, 0);
 	if (nodeId == InvalidNodeId) {
 		Log::error("Failed to add empty volume to new scene graph");
@@ -2328,10 +2333,6 @@ bool SceneManager::init() {
 		return true;
 	}
 
-	palette::Palette palette;
-	if (!palette.load(core::Var::getSafe(cfg::VoxEditLastPalette)->strVal().c_str())) {
-		palette = voxel::getPalette();
-	}
 	if (!_mementoHandler.init()) {
 		Log::error("Failed to initialize the memento handler");
 		return false;
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,8 @@ @@
      * @file
      */
+    #pragma once
     namespace voxedit {
     enum class ViewMode { Default, Simple, All, CommandAndConquer, Max };
@@ Expand Down @@