diff options
author | Brecht Van Lommel <brecht@blender.org> | 2020-02-18 18:56:17 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2020-02-18 19:11:57 +0300 |
commit | b8567b704bb92b57f12ca09faeba2ab4adb656c0 (patch) | |
tree | 877f50343548f8423f1a597fba2096661273afe8 | |
parent | 43c497051a470ab6611b008d968a5fa8132f63f1 (diff) |
Fix Cycles fluid motion blur not working after recent refactor
This also re-enables the fluid motion blur test.
-rw-r--r-- | intern/cycles/blender/blender_mesh.cpp | 6 | ||||
-rwxr-xr-x | tests/python/modules/render_report.py | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/intern/cycles/blender/blender_mesh.cpp b/intern/cycles/blender/blender_mesh.cpp index 332c26161dc..4be07ac5e8e 100644 --- a/intern/cycles/blender/blender_mesh.cpp +++ b/intern/cycles/blender/blender_mesh.cpp @@ -965,6 +965,12 @@ void BlenderSync::sync_mesh_motion(BL::Depsgraph b_depsgraph, Mesh *mesh, int motion_step) { + /* Fluid motion blur already exported. */ + BL::FluidDomainSettings b_fluid_domain = object_fluid_liquid_domain_find(b_ob); + if (b_fluid_domain) { + return; + } + /* Skip if no vertices were exported. */ size_t numverts = mesh->verts.size(); if (numverts == 0) { diff --git a/tests/python/modules/render_report.py b/tests/python/modules/render_report.py index ea72afa7fdc..0cce1791a88 100755 --- a/tests/python/modules/render_report.py +++ b/tests/python/modules/render_report.py @@ -31,7 +31,7 @@ COLORS = COLORS_DUMMY # NOTE: Keep everything lowercase. BLACKLIST = ( - 'fluid_motion_blur.blend', + # 'file_to_blacklist.blend', ) def print_message(message, type=None, status=''): |