Commit: f19d99c10d252e2bf0b96e23dca12b4bd802f2c5
Author: Brecht Van Lommel
Date: Tue Aug 14 15:41:11 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBf19d99c10d252e2bf0b96e23dca12b4bd802f2c5
Merge branch 'master' into blender2.8
===================================================================
===================================================================
diff --cc source/blender/editors/object/object_add.c
index 8b4412ed6f9,efc69c36cc3..f322e544307
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@@ -1809,11 -1619,9 +1809,11 @@@ static Base *duplibase_for_convert(Mai
static int convert_exec(bContext *C, wmOperator *op)
{
Main *bmain = CTX_data_main(C);
+ Depsgraph *depsgraph = CTX_data_depsgraph(C);
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 *ob, *ob1, *obact = CTX_data_active_object(C);
++ Object *ob1, *obact = CTX_data_active_object(C);
DerivedMesh *dm;
Curve *cu;
Nurb *nu;
@@@ -1880,8 -1689,9 +1880,9 @@@
}
for (CollectionPointerLink *link = selected_editable_bases.first; link;
link = link->next) {
+ Object *newob = NULL;
Base *base = link->ptr.data;
- ob = base->object;
+ Object *ob = base->object;
if (ob->flag & OB_DONE || !IS_TAGGED(ob->data)) {
if (ob->type != target) {
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
