blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Tracking: Raise python exception when assigning wrong active track 

Before this an attempt to assign track from another object wos
silently assigning active object to null. Such silencing of
errors is not really a good way.
This commit is contained in:
Sergey Sharybin 2022-10-12 15:18:50 +02:00
parent ea969ccc02
commit 0b251493c8
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source/blender/makesrna/intern/rna_tracking.c
View File

@ -36,6 +36,7 @@
# include "BKE_anim_data.h"
# include "BKE_animsys.h"
# include "BKE_node.h"
# include "BKE_report.h"
# include "DEG_depsgraph.h"
@ -141,7 +142,7 @@ static PointerRNA rna_tracking_active_track_get(PointerRNA *ptr)
static void rna_tracking_active_track_set(PointerRNA *ptr,
PointerRNA value,
struct ReportList *UNUSED(reports))
struct ReportList *reports)
{
MovieClip *clip = (MovieClip *)ptr->owner_id;
MovieTrackingTrack *track = (MovieTrackingTrack *)value.data;
@ -152,8 +153,11 @@ static void rna_tracking_active_track_set(PointerRNA *ptr,
tracking_object->active_track = track;
}
else {
/* TODO(sergey): Raise an error. */
tracking_object->active_track = NULL;
BKE_reportf(reports,
RPT_ERROR,
"Track '%s' is not found in the tracking object %s",
track->name,
tracking_object->name);
}
}
@ -168,7 +172,7 @@ static PointerRNA rna_tracking_active_plane_track_get(PointerRNA *ptr)
static void rna_tracking_active_plane_track_set(PointerRNA *ptr,
PointerRNA value,
struct ReportList *UNUSED(reports))
struct ReportList *reports)
{
MovieClip *clip = (MovieClip *)ptr->owner_id;
MovieTrackingPlaneTrack *plane_track = (MovieTrackingPlaneTrack *)value.data;
@ -179,8 +183,11 @@ static void rna_tracking_active_plane_track_set(PointerRNA *ptr,
tracking_object->active_plane_track = plane_track;
}
else {
/* TODO(sergey): Raise an error. */
tracking_object->active_plane_track = NULL;
BKE_reportf(reports,
RPT_ERROR,
"Plane track '%s' is not found in the tracking object %s",
plane_track->name,
tracking_object->name);
}
}