new demo version!

Author: rlguy

CMakeLists.txt

@@ -39,8 +39,8 @@ set(CMAKE_BUILD_TYPE Release)
 
 set(FLUIDENGINE_VERSION_MAJOR 0)
 set(FLUIDENGINE_VERSION_MINOR 0)
-set(FLUIDENGINE_VERSION_REVISION 5)
-set(FLUIDENGINE_VERSION_LABEL "0.0.5 Demo 04-JUN-2019")
+set(FLUIDENGINE_VERSION_REVISION 6)
+set(FLUIDENGINE_VERSION_LABEL "0.0.6 Demo 10-OCT-2019")
 
 # Configure OpenCL
 if(WITH_OPENCL)

src/addon/__init__.py.in

@@ -19,7 +19,7 @@ bl_info = {
     "description": "A FLIP Fluid Simulation Tool for Blender (v@FLUIDENGINE_VERSION_LABEL@)",
     "author" : "Ryan Guy <ryan.l.guy[at]gmail.com>, Dennis Fassbaender <info[at]df-videos.de>",
     "version" : (@FLUIDENGINE_VERSION_MAJOR@, @FLUIDENGINE_VERSION_MINOR@, @FLUIDENGINE_VERSION_REVISION@),
-    "blender" : (2, 80, 0),
+    "blender" : (2, 81, 0),
     "location" : "Properties > Physics > FLIP Fluid",
     "warning" : "",
     "wiki_url" : "https://github.com/rlguy/Blender-FLIP-Fluids/wiki",
@@ -66,30 +66,28 @@ from . import (
         exit_handler
         )
 
+from .utils import installation_utils
 from .utils import version_compatibility_utils as vcu
 
 
 @bpy.app.handlers.persistent
 def scene_update_post(scene):
-    properties.scene_update_post(scene)
+    if not render.is_rendering():
+        # We don't want to update these while rendering to prevent
+        # odd behaviour in the depsgraph
+        properties.scene_update_post(scene)
+        materials.scene_update_post(scene)
     render.scene_update_post(scene)
-    materials.scene_update_post(scene)
 
 
 @bpy.app.handlers.persistent
-def frame_change_pre(scene):
-    properties.frame_change_pre(scene)
-    render.frame_change_pre(scene)
+def render_init(scene):
+    render.render_init(scene)
 
 
 @bpy.app.handlers.persistent
-def render_pre(scene):
-    render.render_pre(scene)
-
-
-@bpy.app.handlers.persistent
-def render_post(scene):
-    render.render_post(scene)
+def render_complete(scene):
+    render.render_complete(scene)
 
 
 @bpy.app.handlers.persistent
@@ -98,8 +96,9 @@ def render_cancel(scene):
 
 
 @bpy.app.handlers.persistent
-def render_complete(scene):
-    render.render_complete(scene)
+def frame_change_post(scene):
+    properties.frame_change_post(scene)
+    render.frame_change_post(scene)
 
 
 @bpy.app.handlers.persistent
@@ -109,6 +108,11 @@ def load_pre(nonedata):
 
 @bpy.app.handlers.persistent
 def load_post(nonedata):
+    if vcu.is_blender_28() and not vcu.is_blender_281():
+        print("FLIP FLUIDS WARNING: Blender 2.80 contains bugs that can cause frequent crashes during render, Alembic export, and rigid/cloth simulation baking. Blender version 2.81 or higher is recommended.")
+
+    installation_utils.complete_installation()
+
     materials.load_post()
     properties.load_post()
     presets.load_post()
@@ -143,11 +147,10 @@ def register():
     else:
         bpy.app.handlers.scene_update_post.append(scene_update_post)
 
-    bpy.app.handlers.frame_change_pre.append(frame_change_pre)
-    bpy.app.handlers.render_pre.append(render_pre)
-    bpy.app.handlers.render_post.append(render_post)
-    bpy.app.handlers.render_cancel.append(render_cancel)
+    bpy.app.handlers.render_init.append(render_init)
     bpy.app.handlers.render_complete.append(render_complete)
+    bpy.app.handlers.render_cancel.append(render_cancel)
+    bpy.app.handlers.frame_change_post.append(frame_change_post)
     bpy.app.handlers.load_pre.append(load_pre)
     bpy.app.handlers.load_post.append(load_post)
     bpy.app.handlers.save_pre.append(save_pre)
@@ -168,11 +171,10 @@ def unregister():
     else:
         bpy.app.handlers.scene_update_post.remove(scene_update_post)
 
-    bpy.app.handlers.frame_change_pre.remove(frame_change_pre)
-    bpy.app.handlers.render_pre.remove(render_pre)
-    bpy.app.handlers.render_post.remove(render_post)
-    bpy.app.handlers.render_cancel.remove(render_cancel)
+    bpy.app.handlers.render_init.remove(render_init)
     bpy.app.handlers.render_complete.remove(render_complete)
+    bpy.app.handlers.render_cancel.remove(render_cancel)
+    bpy.app.handlers.frame_change_post.remove(frame_change_post)
     bpy.app.handlers.load_pre.remove(load_pre)
     bpy.app.handlers.load_post.remove(load_post)
     bpy.app.handlers.save_pre.remove(save_pre)

src/addon/exit_handler.py

@@ -1,3 +1,20 @@
+# Blender FLIP Fluid Add-on
+# Copyright (C) 2019 Ryan L. Guy
+# 
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
 import bpy, os, shutil
 
 # These variables are used when running an exit handler where
@@ -6,11 +23,8 @@
 CACHE_DIRECTORY = ""
 
 def on_exit():
-    global IS_BLEND_FILE_SAVED
-    global CACHE_DIRECTORY
-    if not IS_BLEND_FILE_SAVED:
-        if os.path.exists(CACHE_DIRECTORY):
-            shutil.rmtree(CACHE_DIRECTORY)
+    # nothing currently to do on exit
+    pass
 
 
 def save_post():

src/addon/export.py

@@ -196,11 +196,13 @@ def __export_static_mesh_data(object_data, mesh_directory):
     with open(info_filepath, "w") as f:
         f.write(info_json)
 
-    export_str = "Exporting static mesh: <" + object_data['name'] + ">, "
-    export_str += "verts: " + str(len(mesh_data.vertices) // 3)
-    export_str += ", tris: " + str(len(mesh_data.triangles) // 3)
-    export_str += ", filesize: " + __format_bytes(len(bobj_data))
-    print(export_str)
+    dprops = __get_domain_properties()
+    if dprops.debug.display_console_output:
+        export_str = "Exporting static mesh: <" + object_data['name'] + ">, "
+        export_str += "verts: " + str(len(mesh_data.vertices) // 3)
+        export_str += ", tris: " + str(len(mesh_data.triangles) // 3)
+        export_str += ", filesize: " + __format_bytes(len(bobj_data))
+        print(export_str)
 
     object_data['data']['mesh_data'] = None
 
@@ -231,12 +233,14 @@ def __export_keyframed_mesh_data(object_data, mesh_directory):
     matrix_filesize = os.stat(matrix_filepath).st_size 
     filesize = len(bobj_data) + matrix_filesize
 
-    export_str = "Exporting keyframed mesh: <" + object_data['name'] + ">, "
-    export_str += "numframes: " + str(len(matrix_data))
-    export_str += ", verts: " + str(len(mesh_data.vertices) // 3)
-    export_str += ", tris: " + str(len(mesh_data.triangles) // 3)
-    export_str += ", filesize: " + __format_bytes(filesize)
-    print(export_str)
+    dprops = __get_domain_properties()
+    if dprops.debug.display_console_output:
+        export_str = "Exporting keyframed mesh: <" + object_data['name'] + ">, "
+        export_str += "numframes: " + str(len(matrix_data))
+        export_str += ", verts: " + str(len(mesh_data.vertices) // 3)
+        export_str += ", tris: " + str(len(mesh_data.triangles) // 3)
+        export_str += ", filesize: " + __format_bytes(filesize)
+        print(export_str)
 
     object_data['data']['mesh_data'] = None
     object_data['data']['matrix_data'] = None
@@ -246,6 +250,7 @@ def __export_animated_mesh_data(object_data, mesh_directory):
     mesh_data = object_data['data']['mesh_data']
     frame_data = object_data['data']['frame_data']
 
+    dprops = __get_domain_properties()
     for i, mesh in enumerate(mesh_data):
         bobj_data = mesh.to_bobj()
         frameno = frame_data[i]
@@ -255,12 +260,13 @@ def __export_animated_mesh_data(object_data, mesh_directory):
         with open(filepath, 'wb') as mesh_file:
             mesh_file.write(bobj_data)
 
-        export_str = "Exporting animated mesh: <" + object_data['name'] + ">, "
-        export_str += "frame: " + str(frameno)
-        export_str += ", verts: " + str(len(mesh.vertices) // 3)
-        export_str += ", tris: " + str(len(mesh.triangles) // 3)
-        export_str += ", filesize: " + __format_bytes(len(bobj_data))
-        print(export_str)
+        if dprops.debug.display_console_output:
+            export_str = "Exporting animated mesh: <" + object_data['name'] + ">, "
+            export_str += "frame: " + str(frameno)
+            export_str += ", verts: " + str(len(mesh.vertices) // 3)
+            export_str += ", tris: " + str(len(mesh.triangles) // 3)
+            export_str += ", filesize: " + __format_bytes(len(bobj_data))
+            print(export_str)
 
     files = os.listdir(mesh_directory)
     files = [f.split('.')[0][-6:] for f in files]