diff options
author | Luca Rood <dev@lucarood.com> | 2017-06-08 11:14:53 +0300 |
---|---|---|
committer | Luca Rood <dev@lucarood.com> | 2017-06-08 11:17:04 +0300 |
commit | d675415eef9f565b1828f48dfe874321af1c4af8 (patch) | |
tree | 84f7e210a0dd17c538e3480a33af82f4e1f86dc2 /source/blender/editors/space_clip | |
parent | 7f480352caaa14a20c0438ae0ed1c2607b6c2c00 (diff) |
Replace all old DAG calls with direct calls to new DEG and remove BKE_depsgraph.h
This removes BKE_depsgraph.h and depsgraph.c
Diffstat (limited to 'source/blender/editors/space_clip')
9 files changed, 39 insertions, 30 deletions
diff --git a/source/blender/editors/space_clip/CMakeLists.txt b/source/blender/editors/space_clip/CMakeLists.txt index 32d48c9c564..8fa4a0de53f 100644 --- a/source/blender/editors/space_clip/CMakeLists.txt +++ b/source/blender/editors/space_clip/CMakeLists.txt @@ -27,6 +27,7 @@ set(INC ../../blenkernel ../../blenlib ../../blentranslation + ../../depsgraph ../../imbuf ../../gpu ../../makesdna diff --git a/source/blender/editors/space_clip/clip_buttons.c b/source/blender/editors/space_clip/clip_buttons.c index 0378c68d12c..eb9aadd2e72 100644 --- a/source/blender/editors/space_clip/clip_buttons.c +++ b/source/blender/editors/space_clip/clip_buttons.c @@ -47,11 +47,12 @@ #include "BLT_translation.h" #include "BKE_context.h" -#include "BKE_depsgraph.h" #include "BKE_screen.h" #include "BKE_movieclip.h" #include "BKE_tracking.h" +#include "DEG_depsgraph.h" + #include "ED_gpencil.h" #include "UI_interface.h" @@ -236,7 +237,7 @@ static void marker_block_handler(bContext *C, void *arg_cb, int event) marker->pos[1] = cb->marker_pos[1] / height; /* to update position of "parented" objects */ - DAG_id_tag_update(&cb->clip->id, 0); + DEG_id_tag_update(&cb->clip->id, 0); WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, NULL); ok = true; @@ -321,7 +322,7 @@ static void marker_block_handler(bContext *C, void *arg_cb, int event) sub_v2_v2(cb->track->markers[i].pos, delta); /* to update position of "parented" objects */ - DAG_id_tag_update(&cb->clip->id, 0); + DEG_id_tag_update(&cb->clip->id, 0); WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, NULL); ok = true; diff --git a/source/blender/editors/space_clip/clip_graph_ops.c b/source/blender/editors/space_clip/clip_graph_ops.c index e781d199d35..edac128d18b 100644 --- a/source/blender/editors/space_clip/clip_graph_ops.c +++ b/source/blender/editors/space_clip/clip_graph_ops.c @@ -37,7 +37,8 @@ #include "BKE_context.h" #include "BKE_tracking.h" -#include "BKE_depsgraph.h" + +#include "DEG_depsgraph.h" #include "WM_api.h" #include "WM_types.h" @@ -691,7 +692,7 @@ static int graph_disable_markers_exec(bContext *C, wmOperator *op) } } - DAG_id_tag_update(&clip->id, 0); + DEG_id_tag_update(&clip->id, 0); WM_event_add_notifier(C, NC_MOVIECLIP | NA_EVALUATED, clip); diff --git a/source/blender/editors/space_clip/clip_utils.c b/source/blender/editors/space_clip/clip_utils.c index 272d99c2b0e..5d02f02167b 100644 --- a/source/blender/editors/space_clip/clip_utils.c +++ b/source/blender/editors/space_clip/clip_utils.c @@ -41,7 +41,8 @@ #include "BKE_context.h" #include "BKE_movieclip.h" #include "BKE_tracking.h" -#include "BKE_depsgraph.h" + +#include "DEG_depsgraph.h" #include "GPU_immediate.h" #include "GPU_matrix.h" @@ -210,7 +211,7 @@ void clip_delete_track(bContext *C, MovieClip *clip, MovieTrackingTrack *track) WM_event_add_notifier(C, NC_MOVIECLIP | ND_DISPLAY, clip); } - DAG_id_tag_update(&clip->id, 0); + DEG_id_tag_update(&clip->id, 0); if (has_bundle) WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, NULL); diff --git a/source/blender/editors/space_clip/tracking_ops.c b/source/blender/editors/space_clip/tracking_ops.c index 56c240c3d20..ea7ede46887 100644 --- a/source/blender/editors/space_clip/tracking_ops.c +++ b/source/blender/editors/space_clip/tracking_ops.c @@ -42,10 +42,11 @@ #include "BKE_context.h" #include "BKE_movieclip.h" #include "BKE_tracking.h" -#include "BKE_depsgraph.h" #include "BKE_report.h" #include "BKE_sound.h" +#include "DEG_depsgraph.h" + #include "WM_api.h" #include "WM_types.h" @@ -905,7 +906,7 @@ static int slide_marker_modal(bContext *C, wmOperator *op, const wmEvent *event) } WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL); - DAG_id_tag_update(&sc->clip->id, 0); + DEG_id_tag_update(&sc->clip->id, 0); } else if (data->area == TRACK_AREA_PAT) { if (data->action == SLIDE_ACTION_SIZE) { @@ -1200,7 +1201,7 @@ static int disable_markers_exec(bContext *C, wmOperator *op) } } - DAG_id_tag_update(&clip->id, 0); + DEG_id_tag_update(&clip->id, 0); WM_event_add_notifier(C, NC_MOVIECLIP | NA_EVALUATED, clip); diff --git a/source/blender/editors/space_clip/tracking_ops_orient.c b/source/blender/editors/space_clip/tracking_ops_orient.c index 7b44e9317ba..671825ef7c3 100644 --- a/source/blender/editors/space_clip/tracking_ops_orient.c +++ b/source/blender/editors/space_clip/tracking_ops_orient.c @@ -43,11 +43,12 @@ #include "BKE_constraint.h" #include "BKE_tracking.h" #include "BKE_global.h" -#include "BKE_depsgraph.h" #include "BKE_layer.h" #include "BKE_object.h" #include "BKE_report.h" +#include "DEG_depsgraph.h" + #include "WM_api.h" #include "WM_types.h" @@ -248,8 +249,8 @@ static int set_origin_exec(bContext *C, wmOperator *op) copy_v3_v3(object->loc, vec); } - DAG_id_tag_update(&clip->id, 0); - DAG_id_tag_update(&object->id, OB_RECALC_OB); + DEG_id_tag_update(&clip->id, 0); + DEG_id_tag_update(&object->id, OB_RECALC_OB); WM_event_add_notifier(C, NC_MOVIECLIP | NA_EVALUATED, clip); WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL); @@ -494,8 +495,8 @@ static int set_plane_exec(bContext *C, wmOperator *op) BKE_object_where_is_calc(scene, object); set_axis(scene, object, clip, tracking_object, axis_track, 'X'); - DAG_id_tag_update(&clip->id, 0); - DAG_id_tag_update(&object->id, OB_RECALC_OB); + DEG_id_tag_update(&clip->id, 0); + DEG_id_tag_update(&object->id, OB_RECALC_OB); WM_event_add_notifier(C, NC_MOVIECLIP | NA_EVALUATED, clip); WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL); @@ -568,8 +569,8 @@ static int set_axis_exec(bContext *C, wmOperator *op) set_axis(scene, object, clip, tracking_object, track, axis == 0 ? 'X' : 'Y'); - DAG_id_tag_update(&clip->id, 0); - DAG_id_tag_update(&object->id, OB_RECALC_OB); + DEG_id_tag_update(&clip->id, 0); + DEG_id_tag_update(&object->id, OB_RECALC_OB); WM_event_add_notifier(C, NC_MOVIECLIP | NA_EVALUATED, clip); WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL); @@ -695,10 +696,10 @@ static int do_set_scale(bContext *C, tracking_object->scale = scale; } - DAG_id_tag_update(&clip->id, 0); + DEG_id_tag_update(&clip->id, 0); if (object) - DAG_id_tag_update(&object->id, OB_RECALC_OB); + DEG_id_tag_update(&object->id, OB_RECALC_OB); WM_event_add_notifier(C, NC_MOVIECLIP | NA_EVALUATED, clip); WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL); diff --git a/source/blender/editors/space_clip/tracking_ops_plane.c b/source/blender/editors/space_clip/tracking_ops_plane.c index aa8518befaa..6c85bdfc4ec 100644 --- a/source/blender/editors/space_clip/tracking_ops_plane.c +++ b/source/blender/editors/space_clip/tracking_ops_plane.c @@ -39,9 +39,10 @@ #include "BKE_context.h" #include "BKE_tracking.h" -#include "BKE_depsgraph.h" #include "BKE_report.h" +#include "DEG_depsgraph.h" + #include "WM_api.h" #include "WM_types.h" @@ -372,7 +373,7 @@ static int slide_plane_marker_modal(bContext *C, data->previous_mval[1] = event->mval[1]; copy_v2_v2(data->previous_corner, data->corner); - DAG_id_tag_update(&sc->clip->id, 0); + DEG_id_tag_update(&sc->clip->id, 0); WM_event_add_notifier(C, NC_MOVIECLIP | NA_EDITED, NULL); @@ -390,7 +391,7 @@ static int slide_plane_marker_modal(bContext *C, clip_tracking_show_cursor(C); - DAG_id_tag_update(&sc->clip->id, 0); + DEG_id_tag_update(&sc->clip->id, 0); WM_event_add_notifier(C, NC_MOVIECLIP | NA_EDITED, clip); return OPERATOR_FINISHED; diff --git a/source/blender/editors/space_clip/tracking_ops_solve.c b/source/blender/editors/space_clip/tracking_ops_solve.c index 5c74c1947e3..89dfadc8974 100644 --- a/source/blender/editors/space_clip/tracking_ops_solve.c +++ b/source/blender/editors/space_clip/tracking_ops_solve.c @@ -43,10 +43,11 @@ #include "BKE_movieclip.h" #include "BKE_tracking.h" #include "BKE_global.h" -#include "BKE_depsgraph.h" #include "BKE_report.h" #include "BKE_library.h" +#include "DEG_depsgraph.h" + #include "WM_api.h" #include "WM_types.h" @@ -180,7 +181,7 @@ static void solve_camera_freejob(void *scv) MEM_freeN(tracking->stats); tracking->stats = NULL; - DAG_id_tag_update(&clip->id, 0); + DEG_id_tag_update(&clip->id, 0); WM_main_add_notifier(NC_MOVIECLIP | NA_EVALUATED, clip); WM_main_add_notifier(NC_OBJECT | ND_TRANSFORM, NULL); @@ -327,7 +328,7 @@ static int clear_solution_exec(bContext *C, wmOperator *UNUSED(op)) reconstruction->camnr = 0; reconstruction->flag &= ~TRACKING_RECONSTRUCTED; - DAG_id_tag_update(&clip->id, 0); + DEG_id_tag_update(&clip->id, 0); WM_event_add_notifier(C, NC_MOVIECLIP | NA_EVALUATED, clip); WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, NULL); diff --git a/source/blender/editors/space_clip/tracking_ops_stabilize.c b/source/blender/editors/space_clip/tracking_ops_stabilize.c index 35b1aead343..4eb6a4fbb24 100644 --- a/source/blender/editors/space_clip/tracking_ops_stabilize.c +++ b/source/blender/editors/space_clip/tracking_ops_stabilize.c @@ -38,7 +38,8 @@ #include "BKE_context.h" #include "BKE_tracking.h" -#include "BKE_depsgraph.h" + +#include "DEG_depsgraph.h" #include "WM_api.h" #include "WM_types.h" @@ -84,7 +85,7 @@ static int stabilize_2d_add_exec(bContext *C, wmOperator *UNUSED(op)) } if (update) { - DAG_id_tag_update(&clip->id, 0); + DEG_id_tag_update(&clip->id, 0); WM_event_add_notifier(C, NC_MOVIECLIP | ND_DISPLAY, clip); } @@ -138,7 +139,7 @@ static int stabilize_2d_remove_exec(bContext *C, wmOperator *UNUSED(op)) } if (update) { - DAG_id_tag_update(&clip->id, 0); + DEG_id_tag_update(&clip->id, 0); WM_event_add_notifier(C, NC_MOVIECLIP | ND_DISPLAY, clip); } @@ -227,7 +228,7 @@ static int stabilize_2d_rotation_add_exec(bContext *C, wmOperator *UNUSED(op)) } if (update) { - DAG_id_tag_update(&clip->id, 0); + DEG_id_tag_update(&clip->id, 0); WM_event_add_notifier(C, NC_MOVIECLIP | ND_DISPLAY, clip); } @@ -281,7 +282,7 @@ static int stabilize_2d_rotation_remove_exec(bContext *C, wmOperator *UNUSED(op) } if (update) { - DAG_id_tag_update(&clip->id, 0); + DEG_id_tag_update(&clip->id, 0); WM_event_add_notifier(C, NC_MOVIECLIP | ND_DISPLAY, clip); } |