AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use empty .blend on create; remove MallocNanoZone workaround

This commit is contained in:
Luke Street 2020-04-15 02:13:11 -04:00
parent a22a5e9473
commit 62f5617539
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hecl/blender/hecl_blendershell.py
View File

@ -475,7 +475,8 @@ try:
if len(cmdargs) >= 4: if len(cmdargs) >= 4:
bpy.ops.wm.open_mainfile(filepath=cmdargs[3]) bpy.ops.wm.open_mainfile(filepath=cmdargs[3])
else: else:
bpy.ops.wm.read_homefile() bpy.ops.wm.read_homefile(use_empty=True)
bpy.context.scene.world = bpy.data.worlds.new('World')
loaded_blend = cmdargs[1] loaded_blend = cmdargs[1]
bpy.context.preferences.filepaths.save_version = 0 bpy.context.preferences.filepaths.save_version = 0
if 'FINISHED' in bpy.ops.wm.save_as_mainfile(filepath=cmdargs[1]): if 'FINISHED' in bpy.ops.wm.save_as_mainfile(filepath=cmdargs[1]):

5
hecl/lib/Blender/Connection.cpp
View File

@ -453,11 +453,6 @@ Connection::Connection(int verbosityLevel) {
std::string writefds = fmt::format(FMT_STRING("{}"), m_readpipe[1]); std::string writefds = fmt::format(FMT_STRING("{}"), m_readpipe[1]);
std::string vLevel = fmt::format(FMT_STRING("{}"), verbosityLevel); std::string vLevel = fmt::format(FMT_STRING("{}"), verbosityLevel);
#ifdef __APPLE__
// Undocumented flag that makes Blender not crash ¯\_(ツ)_/¯
setenv("MallocNanoZone", "1", 1);
#endif
/* Try user-specified blender first */ /* Try user-specified blender first */
if (blenderBin) { if (blenderBin) {
execlp(blenderBin, blenderBin, "--background", "-P", blenderShellPath.c_str(), "--", readfds.c_str(), execlp(blenderBin, blenderBin, "--background", "-P", blenderShellPath.c_str(), "--", readfds.c_str(),