From 0011459602410b5ade0ee3e2f355b3eb7abd377e Mon Sep 17 00:00:00 2001
From: archibate <1931127624@qq.com>
Date: Sun, 22 Nov 2020 14:00:18 +0800
Subject: [PATCH] misc

---
 make.sh                                       |  2 +-
 misc/imseqshow.py                             | 18 ++++++++++++++++++
 taichi_logo.py => misc/taichi_logo.py         |  0
 version_checker.py => misc/version_checker.py |  0
 src/node_system/nodes/blendina.py             | 19 ++-----------------
 5 files changed, 21 insertions(+), 18 deletions(-)
 create mode 100644 misc/imseqshow.py
 rename taichi_logo.py => misc/taichi_logo.py (100%)
 rename version_checker.py => misc/version_checker.py (100%)

diff --git a/make.sh b/make.sh
index 828e818..476fd9a 100755
--- a/make.sh
+++ b/make.sh
@@ -6,8 +6,8 @@ win) PIPPLAT=win_amd64;;
 osx) PIPPLAT=macosx_10_14_x86_64;;
 esac
 
-rm -rf build
 mkdir -p build
+rm -rf build/Taichi-Blend
 cp -r src build/Taichi-Blend
 mkdir -p build/Taichi-Blend/bundle-packages
 pip install --python-version $PYVERSION --platform $PIPPLAT --no-deps -r requirements.txt -t build/Taichi-Blend/bundle-packages
diff --git a/misc/imseqshow.py b/misc/imseqshow.py
new file mode 100644
index 0000000..bc788e8
--- /dev/null
+++ b/misc/imseqshow.py
@@ -0,0 +1,18 @@
+import taichi as ti
+import os
+
+images = []
+frames = 0
+while True:
+    file = f'{frames + 1:04d}.png'
+    if not os.path.exists(file):
+        break
+    print('Loading', file)
+    images.append(ti.imread(file))
+    frames += 1
+
+res = images[0].shape[:2]
+gui = ti.GUI('imseqshow', res)
+while gui.running:
+    gui.set_image(images[gui.frame % frames])
+    gui.show()
diff --git a/taichi_logo.py b/misc/taichi_logo.py
similarity index 100%
rename from taichi_logo.py
rename to misc/taichi_logo.py
diff --git a/version_checker.py b/misc/version_checker.py
similarity index 100%
rename from version_checker.py
rename to misc/version_checker.py
diff --git a/src/node_system/nodes/blendina.py b/src/node_system/nodes/blendina.py
index dbdf429..3768d56 100644
--- a/src/node_system/nodes/blendina.py
+++ b/src/node_system/nodes/blendina.py
@@ -105,32 +105,17 @@ def __init__(self, object, update, verts):
 
         # Make the stupid `StructRNA` happy:
         old_name = self.object.name
-        object = bpy.data.objects[old_name]
-        old_mesh = object.data.name
-        new_mesh = None
 
         @bpy.app.handlers.persistent
         def save_pre(self):
-            print('save_pre', old_mesh)
             try:
-                nonlocal new_mesh
+                print('save_pre', old_name)
                 object = bpy.data.objects[old_name]
-                new_mesh = object.data.name
-                object.data = bpy.data.meshes[old_mesh]
+                object.data = bpy.data.meshes[old_name]
             except Exception as e:
                 print('save_pre', repr(e))
 
-        @bpy.app.handlers.persistent
-        def save_post(self):
-            print('save_post', new_mesh)
-            try:
-                object = bpy.data.objects[old_name]
-                object.data = bpy.data.meshes[new_mesh]
-            except Exception as e:
-                print('save_post', repr(e))
-
         bpy.app.handlers.save_pre.append(save_pre)
-        bpy.app.handlers.save_post.append(save_post)
 
     def update_data(self):
         self.update.run()