[Bf-extensions-cvs] [3b719f3] master: Bool Tool: Fix T49205

[Mikhail Rachinskiy]

Commit: 3b719f3f88f28fb61b982022774e124bbfb8d297
Author: Mikhail Rachinskiy
Date:   Thu Sep 1 12:36:24 2016 +0400
Branches: master
https://developer.blender.org/rBA3b719f3f88f28fb61b982022774e124bbfb8d297

Bool Tool: Fix T49205

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

M	object_boolean_tools.py

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

diff --git a/object_boolean_tools.py b/object_boolean_tools.py
index 79b4010..33fa260 100644
--- a/object_boolean_tools.py
+++ b/object_boolean_tools.py
@@ -188,6 +188,7 @@ def Operation(context, _operation):
             selObj["BoolTool_FTransform"] = "False"
 
 
+"""
 # Do Direct Union, Difference and Intersection Operations
 def Operation_Direct(context, _operation):
     actObj = context.active_object
@@ -224,6 +225,7 @@ def Operation_Direct(context, _operation):
             bpy.ops.object.select_all(action='DESELECT')
             # selObj.select = True
             # bpy.ops.object.delete()
+"""
 
 
 # Remove Obejcts form the BoolTool System
@@ -260,19 +262,20 @@ def Remove(context, thisObj_name, Prop):
         # Remove the Brush Property
         if Prop == "BRUSH":
             Canvas = FindCanvas(actObj)
-            for mod in Canvas.modifiers:
-                if ("BTool_" in mod.name):
-                    if (actObj.name in mod.name):
-                        Canvas.modifiers.remove(mod)
-                        cyclesVis = actObj.cycles_visibility
-                        actObj.draw_type = "TEXTURED"
-                        del actObj["BoolToolBrush"]
-                        del actObj["BoolTool_FTransform"]
-                        cyclesVis.camera = True
-                        cyclesVis.diffuse = True
-                        cyclesVis.glossy = True
-                        cyclesVis.shadow = True
-                        cyclesVis.transmission = True
+            if Canvas:
+                for mod in Canvas.modifiers:
+                    if ("BTool_" in mod.name):
+                        if (actObj.name in mod.name):
+                            Canvas.modifiers.remove(mod)
+            cyclesVis = actObj.cycles_visibility
+            actObj.draw_type = "TEXTURED"
+            del actObj["BoolToolBrush"]
+            del actObj["BoolTool_FTransform"]
+            cyclesVis.camera = True
+            cyclesVis.diffuse = True
+            cyclesVis.glossy = True
+            cyclesVis.shadow = True
+            cyclesVis.transmission = True
 
         if Prop == "CANVAS":
             for mod in actObj.modifiers:
@@ -347,22 +350,19 @@ def ApplyAll(context, list):
                 except:  # if fails the means it is multiuser data
                     context.active_object.data = context.active_object.data.copy()  # so just make data unique
                     bpy.ops.object.modifier_apply(modifier=mod.name)
+            del selObj['BoolToolRoot']
 
-            # bpy.ops.object.select_all(action='TOGGLE')
-            # bpy.ops.object.select_all(action='DESELECT')
-            # for obj in deleteList:
-            #     obj.select = True
-            # bpy.ops.object.delete()
     for obj in context.scene.objects:
         if isCanvas(obj):
             for mod in obj.modifiers:
                 if mod.type == 'BOOLEAN':
                     if mod.object in objDeleteList:  # do not delete brush that is used by another canvas
                         objDeleteList.remove(mod.object)  # remove it from deletion
+
     bpy.ops.object.select_all(action='DESELECT')
-    # for obj in objDeleteList:
-    #     obj.select = True
-    #     bpy.ops.object.delete()
+    for obj in objDeleteList:
+        obj.select = True
+    bpy.ops.object.delete()
 
 
 # Apply This Brush to the Canvas