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

Fix use of uninitialized variable in some cases, in recent bugfix.

This commit is contained in:
Brecht Van Lommel 2018-08-14 15:27:25 +02:00
parent 6eb5b418ee
commit cab013bc5d
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/editors/object/object_add.c
View File

@ -1621,7 +1621,7 @@ static int convert_exec(bContext *C, wmOperator *op)
Main *bmain = CTX_data_main(C);
Scene *scene = CTX_data_scene(C);
Base *basen = NULL, *basact = NULL;
Object *ob, *ob1, *newob, *obact = CTX_data_active_object(C);
Object *ob, *ob1, *obact = CTX_data_active_object(C);
DerivedMesh *dm;
Curve *cu;
Nurb *nu;
@ -1689,6 +1689,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;
ob = base->object;
@ -1904,7 +1905,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 */