From 11b1c57f6132b423f400a97b6f404235f0eb0da8 Mon Sep 17 00:00:00 2001 From: Luke Street Date: Fri, 4 Sep 2020 03:33:04 -0400 Subject: [PATCH] Require Blender 2.90 --- hecl/blender/hecl_blendershell.py | 6 +++--- hecl/lib/Blender/Connection.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hecl/blender/hecl_blendershell.py b/hecl/blender/hecl_blendershell.py index c72b0b589..0c005fba6 100644 --- a/hecl/blender/hecl_blendershell.py +++ b/hecl/blender/hecl_blendershell.py @@ -57,9 +57,9 @@ class PathHasher: read_str = readpipestr() return int(read_str[0:8], 16) -# Ensure Blender 2.81 is being used -if bpy.app.version < (2, 81, 0): - writepipestr(b'NOT281') +# Ensure Blender 2.90 is being used +if bpy.app.version < (2, 90, 0): + writepipestr(b'NOT290') _quitblender() # If there's a third argument, use it as the .zip path containing the addon diff --git a/hecl/lib/Blender/Connection.cpp b/hecl/lib/Blender/Connection.cpp index 4e617062e..c00714523 100644 --- a/hecl/lib/Blender/Connection.cpp +++ b/hecl/lib/Blender/Connection.cpp @@ -366,7 +366,7 @@ Connection::Connection(int verbosityLevel) { wchar_t progFiles[256]; if (!GetEnvironmentVariableW(L"ProgramFiles", progFiles, 256)) 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(); if (!RegFileExists(blenderBin)) BlenderLog.report(logvisor::Fatal, FMT_STRING(L"unable to find {}"), blenderBin); @@ -527,9 +527,9 @@ Connection::Connection(int verbosityLevel) { else BlenderLog.report(logvisor::Fatal, FMT_STRING(_SYS_STR("Unable to find blender at '{}'")), DEFAULT_BLENDER_BIN); #endif - } else if (lineStr == "NOT281") { + } else if (lineStr == "NOT290") { _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") { _closePipe(); if (blenderAddonPath != _SYS_STR("SKIPINSTALL"))