- rename MovieTrackingMarker.enabled --> mute, to match constraints/nla/fcurves/sequencer

- report an error if an invalid BGpic arg is given to v3d.background_images.remove()

1 files changed, 9 insertions, 4 deletions

diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index 393ffa69cbc..a33622cf8a1 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -900,11 +900,15 @@ static BGpic *rna_BackgroundImage_new(View3D *v3d)
 	return bgpic;
 }
 
-static void rna_BackgroundImage_remove(View3D *v3d, BGpic *bgpic)
+static void rna_BackgroundImage_remove(View3D *v3d, ReportList *reports, BGpic *bgpic)
 {
-	ED_view3D_background_image_remove(v3d, bgpic);
-
-	WM_main_add_notifier(NC_SPACE|ND_SPACE_VIEW3D, v3d);
+	if (BLI_findindex(&v3d->bgpicbase, bgpic) == -1) {
+		BKE_report(reports, RPT_ERROR, "BackgroundImage can't be removed");
+	}
+	else {
+		ED_view3D_background_image_remove(v3d, bgpic);
+		WM_main_add_notifier(NC_SPACE|ND_SPACE_VIEW3D, v3d);
+	}
 }
 
 /* Space Node Editor */
@@ -1321,6 +1325,7 @@ static void rna_def_backgroundImages(BlenderRNA *brna, PropertyRNA *cprop)
 
 	func= RNA_def_function(srna, "remove", "rna_BackgroundImage_remove");
 	RNA_def_function_ui_description(func, "Remove background image");
+	RNA_def_function_flag(func, FUNC_USE_REPORTS);
 	parm= RNA_def_pointer(func, "image", "BackgroundImage", "", "Image displayed as viewport background");
 	RNA_def_property_flag(parm, PROP_REQUIRED|PROP_NEVER_NULL);
 }