Skip to content

Commit

Permalink
Fixed custom materials not working
Browse files Browse the repository at this point in the history
  • Loading branch information
HumanGamer committed Mar 31, 2024
1 parent 0420bc6 commit 5c69415
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions engine/source/materials/material.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 2 additions & 1 deletion game/marble/main.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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();
Expand Down

0 comments on commit 5c69415

Please sign in to comment.