Merge pull request #682 from GPUOpen-LibrariesAndSDKs/feature/RPRBLD-0-update

Update outdated, build fix for 4.1

Author: takahiroharada

BlenderPkg/build_osx-arm64.sh

@@ -17,4 +17,4 @@ pushd ..
 ./build_osx-arm64.sh
 popd
 
-arch -arm64 python3.9 create_zip_addon.py
+arch -arm64 python3.11 create_zip_addon.py

BlenderPkg/create_zip_addon.py

@@ -80,6 +80,8 @@ def enumerate_addon_data():
 def get_version():
     # getting buid version
     build_ver = subprocess.getoutput("git rev-parse --short HEAD")
+    if build_ver.find("fatal") != -1:
+        build_ver = 0 # todo. get git hash 
 
     # getting plugin version
     text = (repo_dir / "src/rprblender/__init__.py").read_text()

README.md

@@ -2,22 +2,19 @@
 
 ### Build Requirements
 
-2.93+
+4.1+ 
 ====
-- Blender 2.93+
-- Python 3.9.2 (Blender 2.93 uses 3.9.2) x64(for Core) - all code, addon and misc tested with python3
-- python-cffi - `py -3.9 -m pip install cffi`
+- Blender 4.1+
+- Python 3.11 (Blender 4.1 uses 3.11) x64(for Core) - all code, addon and misc tested with python3
+- python-cffi
+  - `py -3.11 -m pip install cffi`
+  - `py -3.11 -m pip install numpy`
 - Visual Studio 2015 SP3 / 2017 / 2019 with SDK 8.1 and 2015.3 v140 toolset installed
 - If you are using Visual studio 2019 you would need to install the Windows SDK 8.1 manually from Microsoft website https://developer.microsoft.com/en-us/windows/downloads/sdk-archive/
 - cmake 3.x. Make sure it's added to the PATH environment variable
 
 Note that the .sln provided is for easy editing and searching of files on Windows.  The blender code builds on the command line rather than in the solution file.  Visual Studio does provided support for debugging Python when you attach to the running Blender process with loaded addon.
 
-### Software, required for development:
-
-- numpy - `py -3.9 -m pip install numpy`
-
-
 ### ThirdParty libraries
 
 There is ThirdParty repository included to the project as a submodule. Please update submodules:
@@ -39,7 +36,6 @@ Once SSH keys are installed update/checkout submodules for active branch
 
 `git submodule update --init -f --recursive`
 
-
 ## Developing
 
 ### Coding Conventions

RPRBlender.sln

@@ -64,6 +64,8 @@ if %vs_major%==15 or %vs_major%==16 (
 	goto :eof
 
 :build_plugin
+py -3.11 -m pip install cffi
+py -3.11 -m pip install numpy
 py -3.11 cmd_tools\create_sdk.py
 py -3.11 src\bindings\pyrpr\src\pyrprapi.py %castxml%
 

RadeonProRenderBlender.sln

@@ -29,7 +29,6 @@
 
 assert '64bit' == arch[0] and (('Windows' in uname[0]) or ('Linux' in uname[0]) or ('Darwin' in uname[0])), arch
 
-subprocess.check_call([sys.executable, 'src/tools/encrypt_athena_bin.py'])
 
 pyrpr_path = Path('src/bindings/pyrpr')