[Bf-blender-cvs] [cab013bc5d4] master: Fix use of uninitialized variable in some cases, in recent bugfix.

[Brecht Van Lommel]

Commit: cab013bc5d4da1c552a3afc4ea980645e9540f46
Author: Brecht Van Lommel
Date:   Tue Aug 14 15:27:25 2018 +0200
Branches: master
https://developer.blender.org/rBcab013bc5d4da1c552a3afc4ea980645e9540f46

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

===================================================================

M       source/blender/editors/object/object_add.c

===================================================================

diff --git a/source/blender/editors/object/object_add.c 
b/source/blender/editors/object/object_add.c
index 8fc2d419c3c..efc69c36cc3 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -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 */

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs