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

Various extract tweaks; ResourceLock integration

Browse Source
This commit is contained in:
Jack Andersen
2016-08-11 16:33:38 -10:00
parent 02a4d5501f
commit 42d39bf6b9
7 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
DataSpec/DNACommon/CMDL.cpp
View File

@@ -420,7 +420,8 @@ public:
};
void InitGeomBlenderContext(hecl::BlenderConnection::PyOutStream& os,
const hecl::ProjectPath& masterShaderPath)
const hecl::ProjectPath& masterShaderPath,
bool solidShading)
{
os << "import math\n"
"from mathutils import Vector\n"
@@ -505,6 +506,14 @@ void InitGeomBlenderContext(hecl::BlenderConnection::PyOutStream& os,
" return result\n"
"\n";
if (solidShading)
{
os << "for ar in bpy.context.screen.areas:\n"
" for sp in ar.spaces:\n"
" if sp.type == 'VIEW_3D':\n"
" sp.viewport_shade = 'SOLID'\n";
}
/* Link master shader library */
os.format("# Master shader library\n"
"with bpy.data.libraries.load('%s', link=True, relative=True) as (data_from, data_to):\n"
@@ -1102,7 +1111,7 @@ bool ReadCMDLToBlender(hecl::BlenderConnection& conn,
"bpy.context.scene.name = '%s'\n"
"bpy.context.scene.hecl_mesh_obj = bpy.context.scene.name\n",
pakRouter.getBestEntryName(entry).c_str());
InitGeomBlenderContext(os, dataspec.getMasterShaderPath());
InitGeomBlenderContext(os, dataspec.getMasterShaderPath(), false);
MaterialSet::RegisterMaterialProps(os);
os << "# Materials\n"