sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

[#21182] Make proxy for object without group crash Blender.

Browse Source 
from Banlu Kemiyatorn (suchness), modified with more error messages.
This commit is contained in:
Campbell Barton 2010-02-16 16:32:25 +00:00
parent bc9b873f60
commit 2036a2638e
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
source/blender/editors/object/object_relations.c
View File

@ -302,12 +302,23 @@ static int make_proxy_invoke (bContext *C, wmOperator *op, wmEvent *evt)
static int make_proxy_exec (bContext *C, wmOperator *op)
{
Object *ob, *gob= CTX_data_active_object(C);
GroupObject *go= BLI_findlink(&gob->dup_group->gobject, RNA_enum_get(op->ptr, "type"));
Object *ob, *gob;
GroupObject *go;
Scene *scene= CTX_data_scene(C);
ob= go->ob;
if (ob) {
if(!(gob=CTX_data_active_object(C))) {
BKE_report(op->reports, RPT_ERROR, "No active object");
return OPERATOR_CANCELLED;
} else if(gob->dup_group==NULL) {
BKE_report(op->reports, RPT_ERROR, "Active obhect has no dupligroup");
return OPERATOR_CANCELLED;
} else if(!(go= BLI_findlink(&gob->dup_group->gobject, RNA_enum_get(op->ptr, "type")))) {
BKE_report(op->reports, RPT_ERROR, "Active objects dupligroup could not be found");
return OPERATOR_CANCELLED;
} else if (!(ob= go->ob)) {
BKE_report(op->reports, RPT_ERROR, "Group has no object to make the proxy with");
return OPERATOR_CANCELLED;
} else {
Object *newob;
Base *newbase, *oldbase= BASACT;
char name[32];
@ -339,10 +350,6 @@ static int make_proxy_exec (bContext *C, wmOperator *op)
DAG_id_flush_update(&newob->id, OB_RECALC);
WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, newob);
}
else {
BKE_report(op->reports, RPT_ERROR, "No object to make proxy for");
return OPERATOR_CANCELLED;
}
return OPERATOR_FINISHED;
}