diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-12-19 13:20:32 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-12-19 13:59:47 +0300 |
commit | 908a2742403b279cd6dfa5c27acb76d68d3f1523 (patch) | |
tree | 8a236ae1edaccb9730aa8099388f2eb7c6175da1 /source/blender/editors/space_view3d | |
parent | bc8f2e9ee42be09ff196c2e427f52042cff97197 (diff) |
Fix T59237: Instancing on a path doesn't do anything
This commit makes it so curve path parent solving accepts an explicit
arguments for both time and curve speed flag, making it so we don't
have to mock around with scene's frame.
One unfortunate issue still is that if the instancing object is used
for something else, we might be running into a threading conflict.
Possible solution would be to create a temp copy of an object, but
then it will be an issue of preventing drivers from modifying other
datablocks.
At least the original issue is fixed now, and things behave same as
in older Blender version. Additionally, the global variable which
was defining curve speed flag behavior is gone now!
Diffstat (limited to 'source/blender/editors/space_view3d')
-rw-r--r-- | source/blender/editors/space_view3d/view3d_snap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/space_view3d/view3d_snap.c b/source/blender/editors/space_view3d/view3d_snap.c index dbaf3014cfa..7ecd63d43e8 100644 --- a/source/blender/editors/space_view3d/view3d_snap.c +++ b/source/blender/editors/space_view3d/view3d_snap.c @@ -550,7 +550,7 @@ void VIEW3D_OT_snap_cursor_to_grid(wmOperatorType *ot) /* **************************************************** */ /** Returns the center position of a tracking marker visible on the viewport (useful to snap to). **/ -static void bundle_midpoint(Depsgraph *depsgraph, Scene *scene, Object *ob, float r_vec[3]) +static void bundle_midpoint(Scene *scene, Object *ob, float r_vec[3]) { MovieClip *clip = BKE_object_movieclip_get(scene, ob, false); MovieTracking *tracking; @@ -565,7 +565,7 @@ static void bundle_midpoint(Depsgraph *depsgraph, Scene *scene, Object *ob, floa copy_m4_m4(cammat, ob->obmat); - BKE_tracking_get_camera_object_matrix(depsgraph, scene, ob, mat); + BKE_tracking_get_camera_object_matrix(scene, ob, mat); INIT_MINMAX(min, max); @@ -694,7 +694,7 @@ static bool snap_curs_to_sel_ex(bContext *C, float cursor[3]) if (ob_eval->type == OB_CAMERA) { /* snap to bundles should happen only when bundles are visible */ if (v3d->flag2 & V3D_SHOW_RECONSTRUCTION) { - bundle_midpoint(depsgraph, scene, DEG_get_original_object(ob_eval), vec); + bundle_midpoint(scene, DEG_get_original_object(ob_eval), vec); } } |