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

Require Blender 2.90

This commit is contained in:
Luke Street 2020-09-04 03:33:04 -04:00
parent fef21c0a8b
commit 11b1c57f61
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hecl/blender/hecl_blendershell.py
View File

@ -57,9 +57,9 @@ class PathHasher:
read_str = readpipestr() read_str = readpipestr()
return int(read_str[0:8], 16) return int(read_str[0:8], 16)
# Ensure Blender 2.81 is being used # Ensure Blender 2.90 is being used
if bpy.app.version < (2, 81, 0): if bpy.app.version < (2, 90, 0):
writepipestr(b'NOT281') writepipestr(b'NOT290')
_quitblender() _quitblender()
# If there's a third argument, use it as the .zip path containing the addon # If there's a third argument, use it as the .zip path containing the addon

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

@ -366,7 +366,7 @@ Connection::Connection(int verbosityLevel) {
wchar_t progFiles[256]; wchar_t progFiles[256];
if (!GetEnvironmentVariableW(L"ProgramFiles", progFiles, 256)) if (!GetEnvironmentVariableW(L"ProgramFiles", progFiles, 256))
BlenderLog.report(logvisor::Fatal, FMT_STRING(L"unable to determine 'Program Files' path")); BlenderLog.report(logvisor::Fatal, FMT_STRING(L"unable to determine 'Program Files' path"));
blenderBinBuf = fmt::format(FMT_STRING(L"{}\\Blender Foundation\\Blender 2.83\\blender.exe"), progFiles); blenderBinBuf = fmt::format(FMT_STRING(L"{}\\Blender Foundation\\Blender 2.90\\blender.exe"), progFiles);
blenderBin = blenderBinBuf.c_str(); blenderBin = blenderBinBuf.c_str();
if (!RegFileExists(blenderBin)) if (!RegFileExists(blenderBin))
BlenderLog.report(logvisor::Fatal, FMT_STRING(L"unable to find {}"), blenderBin); BlenderLog.report(logvisor::Fatal, FMT_STRING(L"unable to find {}"), blenderBin);
@ -527,9 +527,9 @@ Connection::Connection(int verbosityLevel) {
else else
BlenderLog.report(logvisor::Fatal, FMT_STRING(_SYS_STR("Unable to find blender at '{}'")), DEFAULT_BLENDER_BIN); BlenderLog.report(logvisor::Fatal, FMT_STRING(_SYS_STR("Unable to find blender at '{}'")), DEFAULT_BLENDER_BIN);
#endif #endif
} else if (lineStr == "NOT281") { } else if (lineStr == "NOT290") {
_closePipe(); _closePipe();
BlenderLog.report(logvisor::Fatal, FMT_STRING(_SYS_STR("Installed blender version must be >= 2.81"))); BlenderLog.report(logvisor::Fatal, FMT_STRING(_SYS_STR("Installed blender version must be >= 2.90")));
} else if (lineStr == "NOADDON") { } else if (lineStr == "NOADDON") {
_closePipe(); _closePipe();
if (blenderAddonPath != _SYS_STR("SKIPINSTALL")) if (blenderAddonPath != _SYS_STR("SKIPINSTALL"))