[Bf-blender-cvs] [882cf08e5e4] fracture_modifier: only calc FM mblur velocity layer at render time

Martin Felke noreply at git.blender.org
Sat Feb 24 17:32:58 CET 2018


Commit: 882cf08e5e4c63b00b92dce6f4c026a20b5cb52a
Author: Martin Felke
Date:   Sat Feb 24 17:32:50 2018 +0100
Branches: fracture_modifier
https://developer.blender.org/rB882cf08e5e4c63b00b92dce6f4c026a20b5cb52a

only calc FM mblur velocity layer at render time

this costs some performance

===================================================================

M	source/blender/blenkernel/intern/pointcache.c
M	source/blender/blenkernel/intern/rigidbody.c

===================================================================

diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c
index d2ed49d1d49..8f07a8c5959 100644
--- a/source/blender/blenkernel/intern/pointcache.c
+++ b/source/blender/blenkernel/intern/pointcache.c
@@ -1621,7 +1621,7 @@ static void ptcache_rigidbody_interpolate(int index, void *rb_v, void **data, fl
 		copy_v3_v3(rbo->lin_vel, keys->vel);
 		copy_v3_v3(rbo->ang_vel, keys->ave);
 
-		if (fmd && mi)
+		if (fmd && mi && G.is_rendering)
 		{
 			BKE_update_velocity_layer(fmd, mi);
 		}
diff --git a/source/blender/blenkernel/intern/rigidbody.c b/source/blender/blenkernel/intern/rigidbody.c
index 2f6ce8c594a..5a36979be7e 100644
--- a/source/blender/blenkernel/intern/rigidbody.c
+++ b/source/blender/blenkernel/intern/rigidbody.c
@@ -5516,7 +5516,7 @@ static bool do_sync_modifier(ModifierData *md, Object *ob, RigidBodyWorld *rbw,
 
 					//reset at start, there no cache read seems to happen
 					BKE_update_acceleration_map(fmd, mi, ob, (int)ctime, 0.0f, rbw);
-					BKE_update_velocity_layer(fmd, mi);
+					//BKE_update_velocity_layer(fmd, mi);
 				}
 
 				if ((ob->rigidbody_object->type == RBO_TYPE_ACTIVE) && (rbo->type == RBO_TYPE_ACTIVE || rbo->flag & RBO_FLAG_KINEMATIC)) {



More information about the Bf-blender-cvs mailing list