Skip to content

Commit 5c69415

Browse files
committed
Fixed custom materials not working
1 parent 0420bc6 commit 5c69415

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

engine/source/materials/material.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -537,6 +537,7 @@ LightInfo* Material::getDebugLight()
537537

538538
bool loadMaterialsFromJson(const char* path)
539539
{
540+
Con::errorf("Loading materials from JSON file: %s", path);
540541

541542
Stream* fs = ResourceManager->openStream(path);
542543
if (fs == NULL) return false;

game/marble/main.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -363,6 +363,7 @@ function onStart()
363363
// Load the scripts that start it all...
364364
exec("./client/init.cs");
365365
exec("./server/init.cs");
366+
exec("~/data/init.cs");
366367
exec("./data/GameMissionInfo.cs");
367368
// init GameMissionInfo
368369
GameMissionInfo.init();
@@ -375,7 +376,7 @@ function onStart()
375376
if ($Server::Dedicated)
376377
{
377378
// need to load up the materials so that we have friction properties and what not
378-
exec("~/data/init.cs");
379+
//exec("~/data/init.cs");
379380

380381
// Load server scripts and resources
381382
execServerScripts();

0 commit comments

Comments
 (0)