[Bf-blender-cvs] [2bbfce631d7] blender2.8: Merge branch 'master' into blender2.8
Sergey Sharybin
noreply at git.blender.org
Tue Dec 19 13:42:09 CET 2017
Commit: 2bbfce631d77035098be78b19e0334b14177b83c
Author: Sergey Sharybin
Date: Tue Dec 19 13:42:01 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB2bbfce631d77035098be78b19e0334b14177b83c
Merge branch 'master' into blender2.8
===================================================================
===================================================================
diff --cc source/blender/editors/space_clip/clip_utils.c
index 40661937bae,e7853cb2a0c..7f9d9bf577c
--- a/source/blender/editors/space_clip/clip_utils.c
+++ b/source/blender/editors/space_clip/clip_utils.c
@@@ -209,12 -204,11 +210,11 @@@ void clip_delete_track(bContext *C, Mov
if (used_for_stabilization) {
WM_event_add_notifier(C, NC_MOVIECLIP | ND_DISPLAY, clip);
}
-
++ /* Inform dependency graph. */
+ DEG_id_tag_update(&clip->id, 0);
-
- if (has_bundle)
+ if (has_bundle) {
WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, NULL);
+ }
- /* Inform dependency graph. */
- DAG_id_tag_update(&clip->id, 0);
}
void clip_delete_marker(bContext *C, MovieClip *clip, MovieTrackingTrack *track,
@@@ -230,6 -224,28 +230,28 @@@
}
}
+ void clip_delete_plane_track(bContext *C,
+ MovieClip *clip,
+ MovieTrackingPlaneTrack *plane_track)
+ {
+ MovieTracking *tracking = &clip->tracking;
+ ListBase *plane_tracks_base = BKE_tracking_get_active_plane_tracks(tracking);
+ /* Delete f-curves associated with the track (such as weight, i.e.) */
+ /* Escaped object name, escaped track name, rest of the path. */
+ char rna_path[MAX_NAME * 4 + 64];
+ BKE_tracking_get_rna_path_for_plane_track(tracking,
+ plane_track,
+ rna_path, sizeof(rna_path));
+ BKE_animdata_fix_paths_remove(&clip->id, rna_path);
+ /* Delete the plane track itself. */
+ BKE_tracking_plane_track_free(plane_track);
+ BLI_freelinkN(plane_tracks_base, plane_track);
+ /* TODO(sergey): Any notifiers to be sent here? */
+ (void) C;
+ /* Inform dependency graph. */
- DAG_id_tag_update(&clip->id, 0);
++ DEG_id_tag_update(&clip->id, 0);
+ }
+
void clip_view_center_to_point(SpaceClip *sc, float x, float y)
{
int width, height;
diff --cc source/blender/makesrna/intern/rna_tracking.c
index d23017429c1,f44f7336cdf..ccc118edfb6
--- a/source/blender/makesrna/intern/rna_tracking.c
+++ b/source/blender/makesrna/intern/rna_tracking.c
@@@ -48,10 -48,12 +48,13 @@@
#ifdef RNA_RUNTIME
+ #include "DNA_anim_types.h"
+
+ #include "BKE_animsys.h"
-#include "BKE_depsgraph.h"
#include "BKE_node.h"
+#include "DEG_depsgraph.h"
+
#include "IMB_imbuf.h"
#include "WM_api.h"
More information about the Bf-blender-cvs
mailing list