[Bf-blender-cvs] [b8567b704bb] master: Fix Cycles fluid motion blur not working after recent refactor
Brecht Van Lommel
noreply at git.blender.org
Tue Feb 18 17:12:19 CET 2020
Commit: b8567b704bb92b57f12ca09faeba2ab4adb656c0
Author: Brecht Van Lommel
Date: Tue Feb 18 16:56:17 2020 +0100
Branches: master
https://developer.blender.org/rBb8567b704bb92b57f12ca09faeba2ab4adb656c0
Fix Cycles fluid motion blur not working after recent refactor
This also re-enables the fluid motion blur test.
===================================================================
M intern/cycles/blender/blender_mesh.cpp
M tests/python/modules/render_report.py
===================================================================
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=''):
More information about the Bf-blender-cvs
mailing list