diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-08-14 16:41:11 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-08-14 16:41:11 +0300 |
| commit | f19d99c10d252e2bf0b96e23dca12b4bd802f2c5 (patch) | |
| tree | 991c8f662b93107ea60f9ed240f0b768f41e93b1 /source/blender/editors/object | |
| parent | cc9255f8a8f1f3cf0f75c13a568dc9458e0ffb8e (diff) | |
| parent | cab013bc5d4da1c552a3afc4ea980645e9540f46 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/object')
| -rw-r--r-- | source/blender/editors/object/object_add.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index 8b4412ed6f9..f322e544307 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -1813,7 +1813,7 @@ static int convert_exec(bContext *C, wmOperator *op) Scene *scene = CTX_data_scene(C); ViewLayer *view_layer = CTX_data_view_layer(C); Base *basen = NULL, *basact = NULL; - Object *ob1, *newob, *obact = CTX_data_active_object(C); + Object *ob1, *obact = CTX_data_active_object(C); DerivedMesh *dm; Curve *cu; Nurb *nu; @@ -1880,6 +1880,7 @@ static int convert_exec(bContext *C, wmOperator *op) } for (CollectionPointerLink *link = selected_editable_bases.first; link; link = link->next) { + Object *newob = NULL; Base *base = link->ptr.data; Object *ob = base->object; @@ -2099,7 +2100,9 @@ static int convert_exec(bContext *C, wmOperator *op) } /* Ensure new object has consistent material data with its new obdata. */ - test_object_materials(bmain, newob, newob->data); + if (newob) { + test_object_materials(bmain, newob, newob->data); + } /* tag obdata if it was been changed */ |