Added: Join As Proxy can now take the path from a "proxy" named selection on the joining object

Author: AlwarrenSidh

ArmaToolbox/ArmaTools.py

@@ -1073,3 +1073,16 @@ def deleteVertexGroupList(context, vgrpList):
             bpy.ops.mesh.delete(type='VERT')
 
     bpy.ops.object.mode_set(mode="OBJECT")
+
+def findNamedSelectionString(obj, selectionName):
+    index = obj.armaObjProps.namedProps.find(selectionName)
+    
+    if index is -1: 
+        return None
+
+    output = obj.armaObjProps.namedProps[selectionName]
+    
+    if len(output.value) is 0:
+        return None
+    
+    return output.value

ArmaToolbox/operators.py

@@ -570,6 +570,8 @@ def execute(self, context):
         index = context.window_manager.armaGUIProps.mapProxyIndex
         doDel = context.window_manager.armaGUIProps.mapProxyDelete
 
+        
+
         enclose = context.window_manager.armaGUIProps.mapProxyEnclose
         if len(enclose) == 0:
             enclose = None
@@ -578,6 +580,13 @@ def execute(self, context):
             if sel == obj:
                 pass
             else:
+                if context.window_manager.armaGUIProps.mapUseNamedSelection:
+                    newPath = ArmaTools.findNamedSelectionString(sel, "proxy")
+                    if newPath is not None:
+                        path = newPath
+                    else:
+                        path = context.window_manager.armaGUIProps.mapProxyObject
+
                 if enclose == None:
                     e = None
                 else:
@@ -590,6 +599,9 @@ def execute(self, context):
             obj.select_set(False)
             bpy.ops.object.delete();      
 
+        if context.window_manager.armaGUIProps.mapAutoIncrementProxy:
+            context.window_manager.armaGUIProps.mapProxyIndex = index
+
         return {"FINISHED"}   
 
 ###

ArmaToolbox/panels.py

@@ -518,11 +518,17 @@ def draw(self, context):
         row = layout.row()
         box = createToggleBox(context, row, "mapOpen", "Join as Proxy", "armatoolbox.joinasproxy")
         if guiProp.mapOpen == True:
+            row = box.row()
+            row.prop(guiProp, "mapUseNamedSelection", text="Use proxy named selection (if present)")
+            row = box.row()
+            row.label(text="Otherwise use path")
             row = box.row()
             row.prop(guiProp, "mapProxyObject", text="Path")
             row = box.row()
             row.prop(guiProp, "mapProxyIndex",  text="Index")
             row = box.row()
+            row.prop(guiProp, "mapAutoIncrementProxy", text="Auto-Increment Proxy Index")
+            row = box.row()
             row.prop(guiProp, "mapProxyDelete", text="Delete source objects")
             row = box.row()
             bx = row.box()

ArmaToolbox/properties.py

@@ -349,6 +349,8 @@ class ArmaToolboxGUIProps(bpy.types.PropertyGroup):
     mapProxyDelete : bpy.props.BoolProperty("mapProxyDelete", description="Delete original", default=True)
     mapProxyEnclose : bpy.props.StringProperty("mapProxyEnclose", description="Enclosed Selection")
     mapOpen : bpy.props.BoolProperty(name="mapOpen", default=False)
+    mapUseNamedSelection : bpy.props.BoolProperty(name="mapUseNamedSelection", default=True)
+    mapAutoIncrementProxy : bpy.props.BoolProperty(name="mapAutoIncrementProxy", default=False)
 
     # Proxy Path Changer
     proxyPathFrom : bpy.props.StringProperty("proxyPathFrom", description="Proxy Path From", subtype = 'FILE_PATH')