From f72359918db82cf9855df0746b21a3b1a4a59172 Mon Sep 17 00:00:00 2001 From: Ziad-I <68874104+Ziad-I@users.noreply.github.com> Date: Sat, 27 Jul 2024 22:12:14 +0300 Subject: [PATCH] use blenderbim version instead of blender version --- src/blenderbim/blenderbim/bim/data/webui/sioserver.py | 6 +++--- .../blenderbim/bim/data/webui/templates/gantt.html | 2 +- .../blenderbim/bim/data/webui/templates/index.html | 2 +- src/blenderbim/blenderbim/tool/web.py | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/blenderbim/blenderbim/bim/data/webui/sioserver.py b/src/blenderbim/blenderbim/bim/data/webui/sioserver.py index e195635952..b441272e0d 100644 --- a/src/blenderbim/blenderbim/bim/data/webui/sioserver.py +++ b/src/blenderbim/blenderbim/bim/data/webui/sioserver.py @@ -3,7 +3,7 @@ import os import webbrowser blenderbim_lib_path = os.environ.get("BLENDERBIM_LIB_PATH") -blender_version = os.environ.get("BLENDER_VERSION") +blenderbim_version = os.environ.get("BLENDERBIM_VERSION") if blenderbim_lib_path: sys.path.insert(0, blenderbim_lib_path) @@ -122,14 +122,14 @@ sio.register_namespace(BlenderNamespace("/blender")) async def index(request): with open("templates/index.html", "r") as f: template = f.read() - html_content = pystache.render(template, {"port": sio_port, "version": blender_version}) + html_content = pystache.render(template, {"port": sio_port, "version": blenderbim_version}) return web.Response(text=html_content, content_type="text/html") async def gantt(request): with open("templates/gantt.html", "r") as f: template = f.read() - html_content = pystache.render(template, {"port": sio_port, "version": blender_version}) + html_content = pystache.render(template, {"port": sio_port, "version": blenderbim_version}) return web.Response(text=html_content, content_type="text/html") diff --git a/src/blenderbim/blenderbim/bim/data/webui/templates/gantt.html b/src/blenderbim/blenderbim/bim/data/webui/templates/gantt.html index 1454158ba2..280c116dbb 100644 --- a/src/blenderbim/blenderbim/bim/data/webui/templates/gantt.html +++ b/src/blenderbim/blenderbim/bim/data/webui/templates/gantt.html @@ -50,7 +50,7 @@
diff --git a/src/blenderbim/blenderbim/bim/data/webui/templates/index.html b/src/blenderbim/blenderbim/bim/data/webui/templates/index.html index 9ffda835b1..e31204d197 100644 --- a/src/blenderbim/blenderbim/bim/data/webui/templates/index.html +++ b/src/blenderbim/blenderbim/bim/data/webui/templates/index.html @@ -57,7 +57,7 @@
diff --git a/src/blenderbim/blenderbim/tool/web.py b/src/blenderbim/blenderbim/tool/web.py index 116841289b..1ce1b92b77 100644 --- a/src/blenderbim/blenderbim/tool/web.py +++ b/src/blenderbim/blenderbim/tool/web.py @@ -123,7 +123,7 @@ class Web(blenderbim.core.tool.Web): env = os.environ.copy() env["BLENDERBIM_LIB_PATH"] = str(blenderbim_lib_path) - env["BLENDER_VERSION"] = ".".join(map(str, bpy.app.version)) + env["BLENDERBIM_VERSION"] = tool.Blender.get_blenderbim_version() ws_process = subprocess.Popen( [sys.executable, ws_path, "--p", str(port), "--host", "127.0.0.1"],