Merge branch 'main' into finalizeConstraints

eoineoineoin · Nov 27, 2023 · 5a3fb48 · 5a3fb48
2 parents e0bc410 + 232aaa0
commit 5a3fb48
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@ glTF specification for rigid body dynamics, [KHR_rigid_bodies](https://github.co
 
 ## Installation
 
-1. Download a zip file from the [releases](releases) page.
+1. Download a zip file from the [releases](https://github.com/eoineoineoin/glTF_Physics_Blender_Exporter/releases) page.
 2. Launch Blender.
 3. Navigate to Edit → Preferences → Add-ons and click the "Install" button.
 4. Select the zip file you downloaded.

diff --git a/addons/KHR_rigid_bodies/__init__.py b/addons/KHR_rigid_bodies/__init__.py
@@ -7,7 +7,7 @@
 bl_info = {
     "name": "KHR_rigid_bodies",
     "category": "Import-Export",
-    "version": (0, 0, 2),
+    "version": (0, 1, 0),
     "blender": (3, 6, 0),
     "location": "File > Export > glTF 2.0",
     "description": "Extension for adding rigid body information to exported glTF file",

diff --git a/addons/KHR_rigid_bodies/blender/com/gltf2_blender_rigid_bodies_ui.py b/addons/KHR_rigid_bodies/blender/com/gltf2_blender_rigid_bodies_ui.py
@@ -168,7 +168,8 @@ class KHR_rigid_body_importer_properties(bpy.types.PropertyGroup):
 class KHR_rigid_body_viewport_render:
     def __init__(self):
         if not bpy.app.background:
-            self.shader = gpu.shader.from_builtin("3D_UNIFORM_COLOR")
+            shaderType = "3D_UNIFORM_COLOR" if bpy.app.version[0] < 4 else "UNIFORM_COLOR"
+            self.shader = gpu.shader.from_builtin(shaderType)
         else:
             self.shader = None