[Bf-blender-cvs] [c48a3afb166] blender2.8: Collision Modifier: get time from depsgraph instead of scene

Sybren A. Stüvel noreply at git.blender.org
Thu May 17 15:30:08 CEST 2018


Commit: c48a3afb166b38bbdf55c3e6d317ef85f90d18bf
Author: Sybren A. Stüvel
Date:   Thu May 17 15:28:18 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBc48a3afb166b38bbdf55c3e6d317ef85f90d18bf

Collision Modifier: get time from depsgraph instead of scene

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

M	source/blender/modifiers/intern/MOD_collision.c

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

diff --git a/source/blender/modifiers/intern/MOD_collision.c b/source/blender/modifiers/intern/MOD_collision.c
index 83fbf676beb..c9037074ecc 100644
--- a/source/blender/modifiers/intern/MOD_collision.c
+++ b/source/blender/modifiers/intern/MOD_collision.c
@@ -122,7 +122,7 @@ static void deformVerts(
 		CDDM_apply_vert_coords(dm, vertexCos);
 		CDDM_calc_normals(dm);
 		
-		current_time = BKE_scene_frame_get(md->scene);
+		current_time = DEG_get_ctime(ctx->depsgraph);
 		
 		if (G.debug_value > 0)
 			printf("current_time %f, collmd->time_xnew %f\n", current_time, collmd->time_xnew);



More information about the Bf-blender-cvs mailing list