[Bf-blender-cvs] [a44f5a561f9] master: Revert "Fix T65301: Convert to mesh with Keep Original loses adjust operator panel."

[Bastien Montagne]

Commit: a44f5a561f94ea5fc11a06e75c73fe15799b9e65
Author: Bastien Montagne
Date:   Sun Jun 9 23:39:55 2019 +0200
Branches: master
https://developer.blender.org/rBa44f5a561f94ea5fc11a06e75c73fe15799b9e65

Revert "Fix T65301: Convert to mesh with Keep Original loses adjust operator 
panel."

This reverts commit rB78bbf374f475 (and part of rB702d85d7cddbf81).

Fix for this is actually simpler, done in next commit.

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

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 4ab4290d867..77964e2e100 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -2320,7 +2320,6 @@ static int convert_exec(bContext *C, wmOperator *op)
         if (obact->type == OB_MBALL) {
           basact = basen;
         }
-        ED_object_base_select(basen, BA_SELECT);
 
         mballConverted = 1;
       }
@@ -2343,11 +2342,6 @@ static int convert_exec(bContext *C, wmOperator *op)
         basact = basen;
       }
 
-      if (keep_original) {
-        ED_object_base_select(base, BA_DESELECT);
-        ED_object_base_select(basen, BA_SELECT);
-      }
-
       basen = NULL;
     }

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