Commit: 5eda9732b3199f4ebf9cd106a1b36152e86ebf32
Author: Dalai Felinto
Date: Tue May 29 16:32:21 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB5eda9732b3199f4ebf9cd106a1b36152e86ebf32
Use the correct time to evaluate object in BKE_object_where_is_calc functions
===================================================================
M source/blender/blenkernel/intern/object.c
===================================================================
diff --git a/source/blender/blenkernel/intern/object.c
b/source/blender/blenkernel/intern/object.c
index 9c9d3b4088e..d1f70fd2943 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -2168,11 +2168,11 @@ void BKE_object_where_is_calc_mat4(Depsgraph
*depsgraph, Scene *scene, Object *o
void BKE_object_where_is_calc_ex(Depsgraph *depsgraph, Scene *scene,
RigidBodyWorld *rbw, Object *ob, float r_originmat[3][3])
{
- BKE_object_where_is_calc_time_ex(depsgraph, scene, ob,
BKE_scene_frame_get(scene), rbw, r_originmat);
+ BKE_object_where_is_calc_time_ex(depsgraph, scene, ob,
DEG_get_ctime(depsgraph), rbw, r_originmat);
}
void BKE_object_where_is_calc(Depsgraph *depsgraph, Scene *scene, Object *ob)
{
- BKE_object_where_is_calc_time_ex(depsgraph, scene, ob,
BKE_scene_frame_get(scene), NULL, NULL);
+ BKE_object_where_is_calc_time_ex(depsgraph, scene, ob,
DEG_get_ctime(depsgraph), NULL, NULL);
}
/**
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
