From aa3a181d9061f684d10a7ffd2af134d520e2f379 Mon Sep 17 00:00:00 2001 From: maybites Date: Wed, 20 Dec 2023 18:33:51 +0100 Subject: [PATCH] bumped version code cleanup --- README.md | 2 +- __init__.py | 9 ++++----- operators.py | 4 ++-- pip_importer.py | 4 +--- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 2f86ee7..9e5e022 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Spout addon V4.0.0 for Blender 3.0.x +# Spout and Syphon addon V4.0.0 for Blender 3.0.x Blender addon that allows to stream [spout](http://spout.zeal.co/) and [Syphon](https://syphon.github.io/) streams from blender. diff --git a/__init__.py b/__init__.py index d7168ba..dcd42f4 100644 --- a/__init__.py +++ b/__init__.py @@ -14,11 +14,10 @@ bl_info = { "name" : "Spout", "author" : "Martin Froehlich, Florian Bruggisser", - "description" : "Streaming Spout from Blender", + "description" : "Streaming Textures via spout and syphon from Blender", "blender" : (3, 0, 0), - "version" : (3, 0, 0), + "version" : (4, 0, 0), "location" : "Properties > Camera > Camera data", - "warning" : "Experimental", "category" : "Render", "wiki_url" : "https://github.com/maybites/blender.script.spout", "tracker_url" : "https://github.com/maybites/blender.script.spout/issues", @@ -37,10 +36,10 @@ def register(): # then add the required packages if platform.system() == "Windows": - pip_importer.add_package(pip_importer.Package("SpoutGL", version="==0.0.4")) + pip_importer.add_package(pip_importer.Package("SpoutGL", version="==0.0.4", custom_module="spoutgl")) if platform.system() == "Darwin": - pip_importer.add_package(pip_importer.Package("syphon")) + pip_importer.add_package(pip_importer.Package("syphon-python", version="==0.1.0", custom_module="syphon")) # pip_importer.auto_install_packages() diff --git a/operators.py b/operators.py index 3d5ada1..c411133 100644 --- a/operators.py +++ b/operators.py @@ -145,13 +145,13 @@ def texshare_main(self, context): drawhandle = bpy.types.SpaceView3D.draw_handler_add(texshare_capture, args, 'WINDOW', 'POST_PIXEL') # store the references inside the db-dicts - db_frameHandle[dbID] = frameHandler + #db_frameHandle[dbID] = frameHandler db_drawHandle[dbID] = drawhandle db_spoutInstances[dbID] = spyphonSender # if streaming has been disabled and my ID is still stored in the db if context.camera.texshare.enable == 0 and dbID in db_drawHandle: - bpy.app.handlers.depsgraph_update_post.remove(db_frameHandle[dbID]) + #bpy.app.handlers.depsgraph_update_post.remove(db_frameHandle[dbID]) bpy.types.SpaceView3D.draw_handler_remove(db_drawHandle[dbID], 'WINDOW') db_spoutInstances[dbID].release() #removing my ID diff --git a/pip_importer.py b/pip_importer.py index 5fb0b48..a9b82e6 100644 --- a/pip_importer.py +++ b/pip_importer.py @@ -95,9 +95,7 @@ def update_pip(): def install_package(package): update_pip() - # cmd = [PYPATH, "-m", "pip", "install", "--upgrade", f"{package.name}{package.version}"] - cmd = [PYPATH, "-m", "pip", "install", "/Users/mfroehli/Arbeiten/02_code/python/syphon-python/dist/syphon_python-0.1.0-cp310-cp310-macosx_11_0_arm64.whl"] - # cmd = [PYPATH, "-m", "pip", "install", "-e", "/Users/mfroehli/Arbeiten/02_code/python/syphon-python"] + cmd = [PYPATH, "-m", "pip", "install", "--upgrade", f"{package.name}{package.version}"] ok = subprocess.call(cmd) == 0 return ok