Expanded the hack on removeOriginFromChildPrimitives too.

codereader · Aug 7, 2021 · f080e11 · f080e11
1 parent 8464877
commit f080e11
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/plugins/dm.gameconnection/GameConnection.cpp b/plugins/dm.gameconnection/GameConnection.cpp
@@ -749,7 +749,7 @@ std::string saveMapDiff(const DiffEntityStatuses& entityStatuses)
         registry::ScopedKeyChanger progressDisabler(RKEY_MAP_SUPPRESS_LOAD_STATUS_DIALOG, true);
 
         // Hack: disable recalculateBrushWindings for this export
-        registry::ScopedKeyChanger<std::string> guard("MapExporter_recalculateBrushWindings_ignore", "yes");
+        registry::ScopedKeyChanger<std::string> guard("MapExporter_IgnoreBrushes", "yes");
 
         // Get a scoped exporter class
         auto exporter = GlobalMapModule().createMapExporter(writer, root, outStream);

diff --git a/radiantcore/map/algorithm/MapExporter.cpp b/radiantcore/map/algorithm/MapExporter.cpp
@@ -262,10 +262,14 @@ void MapExporter::disableProgressMessages()
 
 void MapExporter::prepareScene()
 {
-	removeOriginFromChildPrimitives(_root);
+	// stgatilov: Hack to disable recalculateBrushWindings for hot-reload diffs
+	if (registry::getValue<std::string>("MapExporter_IgnoreBrushes") != "yes")
+	{
+		removeOriginFromChildPrimitives(_root);
 
-	// Re-evaluate all brushes, to update the Winding calculations
-	recalculateBrushWindings();
+		// Re-evaluate all brushes, to update the Winding calculations
+		recalculateBrushWindings();
+	}
 
 	// Emit the pre-export event to give subscribers a chance to prepare the scene
 	GlobalMapResourceManager().signal_onResourceExporting().emit(_root);
@@ -276,10 +280,14 @@ void MapExporter::finishScene()
 	// Emit the post-export event to give subscribers a chance to cleanup the scene
 	GlobalMapResourceManager().signal_onResourceExported().emit(_root);
 
-	scene::addOriginToChildPrimitives(_root);
+	// stgatilov: Hack to disable recalculateBrushWindings for hot-reload diffs
+	if (registry::getValue<std::string>("MapExporter_IgnoreBrushes") != "yes")
+	{
+		scene::addOriginToChildPrimitives(_root);
 
-	// Re-evaluate all brushes, to update the Winding calculations
-	recalculateBrushWindings();
+		// Re-evaluate all brushes, to update the Winding calculations
+		recalculateBrushWindings();
+	}
 
     if (_sendProgressMessages)
     {
@@ -290,12 +298,6 @@ void MapExporter::finishScene()
 
 void MapExporter::recalculateBrushWindings()
 {
-	if (registry::getValue<std::string>("MapExporter_recalculateBrushWindings_ignore") == "yes")
-	{
-		// stgatilov: Hack to disable recalculateBrushWindings for hot-reload diffs
-		return;
-	}
-
 	_root->foreachNode([] (const scene::INodePtr& child)->bool
 	{
 		auto* brush = Node_getIBrush(child);