blender
/
blender
131
398
Fork 575
Code Issues 6.2k Pull Requests 749 Projects 19 Wiki Activity

RNA: Raise error assigning an active object which doesn't exist 

Previously this silently cleared the view layers active object.
This commit is contained in:
Campbell Barton 2020-02-10 21:58:52 +11:00
parent 189e96ba68
commit 1c61f3e018
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source/blender/makesrna/intern/rna_layer.c
View File

@ -88,11 +88,22 @@ static PointerRNA rna_LayerObjects_active_object_get(PointerRNA *ptr)
static void rna_LayerObjects_active_object_set(PointerRNA *ptr,
PointerRNA value,
struct ReportList *UNUSED(reports))
struct ReportList *reports)
{
ViewLayer *view_layer = (ViewLayer *)ptr->data;
if (value.data) {
view_layer->basact = BKE_view_layer_base_find(view_layer, (Object *)value.data);
Object *ob = value.data;
Base *basact_test = BKE_view_layer_base_find(view_layer, ob);
if (basact_test != NULL) {
view_layer->basact = basact_test;
}
else {
BKE_reportf(reports,
RPT_ERROR,
"ViewLayer '%s' does not contain object '%s'",
view_layer->name,
ob->id.name + 2);
}
}
else {
view_layer->basact = NULL;