From 5c69415e4bef25bb8d3eb75ae75bb2e3bf7e0894 Mon Sep 17 00:00:00 2001
From: Human Gamer <39096122+HumanGamer@users.noreply.github.com>
Date: Sun, 31 Mar 2024 12:50:22 -0500
Subject: [PATCH] Fixed custom materials not working

---
 engine/source/materials/material.cpp | 1 +
 game/marble/main.cs                  | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/engine/source/materials/material.cpp b/engine/source/materials/material.cpp
index 5f5aa53c..69bb76a2 100644
--- a/engine/source/materials/material.cpp
+++ b/engine/source/materials/material.cpp
@@ -537,6 +537,7 @@ LightInfo* Material::getDebugLight()
 
 bool loadMaterialsFromJson(const char* path)
 {
+    Con::errorf("Loading materials from JSON file: %s", path);
     
     Stream* fs = ResourceManager->openStream(path);
     if (fs == NULL) return false;
diff --git a/game/marble/main.cs b/game/marble/main.cs
index f3d0c90d..7f391965 100644
--- a/game/marble/main.cs
+++ b/game/marble/main.cs
@@ -363,6 +363,7 @@ function onStart()
    // Load the scripts that start it all...
    exec("./client/init.cs");
    exec("./server/init.cs");
+   exec("~/data/init.cs");
    exec("./data/GameMissionInfo.cs");
    // init GameMissionInfo
    GameMissionInfo.init();
@@ -375,7 +376,7 @@ function onStart()
    if ($Server::Dedicated)
    {
       // need to load up the materials so that we have friction properties and what not
-      exec("~/data/init.cs");
+      //exec("~/data/init.cs");
       
       // Load server scripts and resources
       execServerScripts();