diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2018-05-29 17:11:08 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2018-05-29 18:05:32 +0300 |
| commit | e2bac484e02a26616419a4b51385e7068545c44b (patch) | |
| tree | 3a747d88564272079f710b35280a35357d2f7b44 /source/blender/blenkernel/BKE_object.h | |
| parent | 36e9ed98e7cbccdf3e1b3085a4be2679aec5a869 (diff) | |
Use correct time for curve parent evaluation
Time should alwaus come from depsgraph, not scene.
Diffstat (limited to 'source/blender/blenkernel/BKE_object.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_object.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/blenkernel/BKE_object.h b/source/blender/blenkernel/BKE_object.h index a7cdef06268..4621f2fbe31 100644 --- a/source/blender/blenkernel/BKE_object.h +++ b/source/blender/blenkernel/BKE_object.h @@ -142,7 +142,7 @@ struct Base **BKE_object_pose_base_array_get_unique(struct ViewLayer *view_layer struct Base **BKE_object_pose_base_array_get(struct ViewLayer *view_layer, unsigned int *r_bases_len); void BKE_object_get_parent_matrix( - struct Scene *scene, struct Object *ob, + struct Depsgraph *depsgraph, struct Scene *scene, struct Object *ob, struct Object *par, float parentmat[4][4]); void BKE_object_where_is_calc( struct Depsgraph *depsgraph, struct Scene *scene, struct Object *ob); @@ -154,7 +154,8 @@ void BKE_object_where_is_calc_time( void BKE_object_where_is_calc_time_ex( struct Depsgraph *depsgraph, struct Scene *scene, struct Object *ob, float ctime, struct RigidBodyWorld *rbw, float r_originmat[3][3]); -void BKE_object_where_is_calc_mat4(struct Scene *scene, struct Object *ob, float obmat[4][4]); +void BKE_object_where_is_calc_mat4( + struct Depsgraph *depsgraph, struct Scene *scene, struct Object *ob, float obmat[4][4]); /* possibly belong in own moduke? */ struct BoundBox *BKE_boundbox_alloc_unit(void); |