AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-07-08 07:25:51 +00:00
Code Issues Projects Releases Wiki Activity

Update submodules

Browse Source
This commit is contained in:
Jack Andersen 2018-09-02 14:45:32 -10:00
parent be1184f822
commit e16ef9709d
5 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hecl/blender/hecl/hmdl/__init__.py
View File

@ -271,7 +271,7 @@ def cookcol(writebuf, mesh_obj):
surfaceDirt = prop_val_from_colmat('retro_surface_dirt', m) surfaceDirt = prop_val_from_colmat('retro_surface_dirt', m)
surfaceLava = prop_val_from_colmat('retro_surface_lava', m) surfaceLava = prop_val_from_colmat('retro_surface_lava', m)
surfaceSPMetal = prop_val_from_colmat('retro_surface_sp_metal', m) surfaceSPMetal = prop_val_from_colmat('retro_surface_sp_metal', m)
surfaceStoneRock = prop_val_from_colmat('retro_surface_stone_rock', m) surfaceStoneRock = prop_val_from_colmat('retro_surface_lava_stone', m)
surfaceSnow = prop_val_from_colmat('retro_surface_snow', m) surfaceSnow = prop_val_from_colmat('retro_surface_snow', m)
surfaceMudSlow = prop_val_from_colmat('retro_surface_mud_slow', m) surfaceMudSlow = prop_val_from_colmat('retro_surface_mud_slow', m)
surfaceFabric = prop_val_from_colmat('retro_surface_fabric', m) surfaceFabric = prop_val_from_colmat('retro_surface_fabric', m)

2
hecl/extern/athena vendored

@ -1 +1 @@
Subproject commit b57390e304ac2d625d70fac27b19f97eeaad9f85 Subproject commit 488acc867523ddce51bdf8e6975a4271997363dc

2
hecl/extern/boo vendored

@ -1 +1 @@
Subproject commit 70b2518751a68635923dc576d8ee0b42d07a3d57 Subproject commit c78afbdcdda682c586310ea1c8f42e55c3b3400c

2
hecl/include/hecl/Blender/Connection.hpp
View File

@ -288,7 +288,7 @@ struct ColMesh
bool surfaceDirt; bool surfaceDirt;
bool surfaceLava; bool surfaceLava;
bool surfaceSPMetal; bool surfaceSPMetal;
bool surfaceStoneRock; bool surfaceLavaStone;
bool surfaceSnow; bool surfaceSnow;
bool surfaceMudSlow; bool surfaceMudSlow;
bool surfaceFabric; bool surfaceFabric;

8
hecl/lib/Project.cpp
View File

@ -430,6 +430,14 @@ static void VisitDirectory(const ProjectPath& dir,
if (dir.getLastComponent().size() > 1 && dir.getLastComponent()[0] == _S('.')) if (dir.getLastComponent().size() > 1 && dir.getLastComponent()[0] == _S('.'))
return; return;
if (hecl::ProjectPath(dir, _S("!project.yaml")).isFile() &&
hecl::ProjectPath(dir, _S("!pool.yaml")).isFile())
{
/* Handle AudioGroup case */
VisitFile(dir, force, fast, specInsts, progress, cp, cookPass);
return;
}
std::map<SystemString, ProjectPath> children; std::map<SystemString, ProjectPath> children;
dir.getDirChildren(children); dir.getDirChildren(children);