1_8_5

Added collection export

Author: DigiKrafting

README.md

@@ -4,11 +4,11 @@ Pipeline/Workflow import/export for Substance Painter.
 
 # Features
 
-- Blender 2.80 (Tested on Linux/Windows)
+- Blender 2.80+ (Tested on Linux/Windows)
 
 - Export in either FBX or OBJ.
 - Exports to export folder and opens Substance Painter.
-- Creates SPP Project File "{mesh}.spp" or "{filename}.spp". * (Excludes 2018.1.0-2018.3.0)
+- Creates SPP Project File "{filename}.spp" or "{mesh}.spp" or "{collection}.spp". * (Excludes 2018.1.0-2018.3.0 - See usage notes below)
 - Passes textures folder from preferences to Substance Painter.
 - Creates Nodes using the Principled BSDF shader.
 - Autosave before export option.
@@ -17,12 +17,17 @@ Pipeline/Workflow import/export for Substance Painter.
 - Optional Height Maps (Combines Height and Normal maps using the Bump Node, use with care, see screenshots below)
 - Checks if Mesh has material and will create one if it doesn't (Can be turned off in preferences "Create Material")
 
-## Selected Mesh
+## Scene
 
 - One Click Export
 - One Click Textures Import
 
-## Scene
+## Selected Mesh(s)
+
+- One Click Export
+- One Click Textures Import
+
+## Selected Collection
 
 - One Click Export
 - One Click Textures Import

__init__.py

@@ -20,7 +20,7 @@
         "name": "DKS Substance Painter",
         "description": "Substance Painter Pipeline",
         "author": "DigiKrafting.Studio",
-        "version": (1, 8, 2),
+        "version": (1, 8, 5),
         "blender": (2, 80, 0),
         "location": "Info Toolbar, File -> Import, File -> Export, Menu",
         "wiki_url":    "https://github.com/DigiKrafting/blender_addon_substance_painter/wiki",
@@ -130,11 +130,14 @@ def draw(self, context):
 
         layout = self.layout
 
-        self.layout.operator(dks_sp.dks_sp_export_scene.bl_idname,icon="EXPORT")
-        self.layout.operator(dks_sp.dks_sp_pbr_nodes.bl_idname, text='Substance Painter (Scene)', icon="IMPORT").import_setting = 'scene'
+        layout.operator(dks_sp.dks_sp_export_scene.bl_idname,icon="EXPORT")
+        layout.operator(dks_sp.dks_sp_pbr_nodes.bl_idname, text='Substance Painter (Scene)', icon="IMPORT").import_setting = 'scene'
 
-        self.layout.operator(dks_sp.dks_sp_export_sel.bl_idname,icon="EXPORT")
-        self.layout.operator(dks_sp.dks_sp_pbr_nodes.bl_idname, text='Substance Painter (Selected)', icon="IMPORT").import_setting = 'selected'
+        layout.operator(dks_sp.dks_sp_export_sel.bl_idname,icon="EXPORT")
+        layout.operator(dks_sp.dks_sp_pbr_nodes.bl_idname, text='Substance Painter (Selected)', icon="IMPORT").import_setting = 'selected'
+
+        layout.operator(dks_sp.dks_sp_export_col.bl_idname,icon="EXPORT")
+        layout.operator(dks_sp.dks_sp_pbr_nodes.bl_idname, text='Substance Painter (Collection)', icon="IMPORT").import_setting = 'collection'
 
 def dks_sp_draw_menu(self, context):
 
@@ -148,6 +151,14 @@ def dks_sp_menu_func_export_sel(self, context):
 
     self.layout.operator(dks_sp.dks_sp_export_sel.bl_idname)
 
+def dks_sp_menu_func_export_col(self, context):
+
+    self.layout.operator(dks_sp.dks_sp_export_col.bl_idname)
+
+def dks_sp_menu_func_import_col(self, context):
+
+    self.layout.operator(dks_sp.dks_sp_pbr_nodes.bl_idname, text='Substance Painter (Collection)').import_setting = 'collection'
+
 def dks_sp_menu_func_import_scene(self, context):
 
     self.layout.operator(dks_sp.dks_sp_pbr_nodes.bl_idname, text='Substance Painter (Scene)').import_setting = 'scene'
@@ -162,21 +173,27 @@ def dks_sp_draw_btns(self, context):
 
         layout = self.layout
         row = layout.row(align=True)
+        sp_lbl="SP:"
 
         if bpy.context.preferences.addons[__package__].preferences.option_show_sp_toggle:
 
                 if bpy.context.preferences.addons[__package__].preferences.option_show_sp_toggle_state:
                         row.operator(dks_sp_toggle.bl_idname,text="SP",icon="TRIA_LEFT")
                 else:
                         row.operator(dks_sp_toggle.bl_idname,text="SP",icon="TRIA_RIGHT")
+                
+                sp_lbl=""
 
         if bpy.context.preferences.addons[__package__].preferences.option_show_sp_toggle_state or not bpy.context.preferences.addons[__package__].preferences.option_show_sp_toggle:
 
-                row.operator(dks_sp.dks_sp_export_scene.bl_idname,text="SP:Scene",icon="EXPORT")
-                row.operator(dks_sp.dks_sp_pbr_nodes.bl_idname, text='SP:Scene',icon="IMPORT").import_setting = 'scene'
+                row.operator(dks_sp.dks_sp_export_scene.bl_idname,text=sp_lbl+"Scn",icon="EXPORT")
+                row.operator(dks_sp.dks_sp_pbr_nodes.bl_idname, text=sp_lbl+'Scn',icon="IMPORT").import_setting = 'scene'
+
+                row.operator(dks_sp.dks_sp_export_sel.bl_idname,text=sp_lbl+"Sel",icon="EXPORT")
+                row.operator(dks_sp.dks_sp_pbr_nodes.bl_idname, text=sp_lbl+'Sel', icon="IMPORT").import_setting = 'selected'
 
-                row.operator(dks_sp.dks_sp_export_sel.bl_idname,text="SP:Sel",icon="EXPORT")
-                row.operator(dks_sp.dks_sp_pbr_nodes.bl_idname, text='SP:Sel', icon="IMPORT").import_setting = 'selected'
+                row.operator(dks_sp.dks_sp_export_col.bl_idname,text=sp_lbl+"Col",icon="EXPORT")
+                row.operator(dks_sp.dks_sp_pbr_nodes.bl_idname, text=sp_lbl+'Col', icon="IMPORT").import_setting = 'collection'
 
 class dks_sp_toggle(bpy.types.Operator):
 
@@ -191,6 +208,7 @@ def execute(self, context):
                 bpy.context.preferences.addons[__package__].preferences.option_show_sp_toggle_state=True
         else:
                 bpy.context.preferences.addons[__package__].preferences.option_show_sp_toggle_state=False
+
         return {'FINISHED'}
 
 classes = (
@@ -210,6 +228,8 @@ def register():
         bpy.types.TOPBAR_MT_file_import.append(dks_sp_menu_func_import_scene)
         bpy.types.TOPBAR_MT_file_export.append(dks_sp_menu_func_export_sel)
         bpy.types.TOPBAR_MT_file_import.append(dks_sp_menu_func_import_sel)
+        bpy.types.TOPBAR_MT_file_export.append(dks_sp_menu_func_export_col)
+        bpy.types.TOPBAR_MT_file_import.append(dks_sp_menu_func_import_col)
 
         bpy.context.preferences.addons[__package__].preferences.option_show_sp_toggle_state=False
 
@@ -230,14 +250,16 @@ def unregister():
         bpy.types.TOPBAR_MT_file_import.remove(dks_sp_menu_func_import_scene)
         bpy.types.TOPBAR_MT_file_export.remove(dks_sp_menu_func_export_sel)
         bpy.types.TOPBAR_MT_file_import.remove(dks_sp_menu_func_import_sel)
+        bpy.types.TOPBAR_MT_file_export.remove(dks_sp_menu_func_export_col)
+        bpy.types.TOPBAR_MT_file_import.remove(dks_sp_menu_func_import_col)
 
         if bpy.context.preferences.addons[__package__].preferences.option_display_type=='Buttons':
 
                 bpy.types.TOPBAR_HT_upper_bar.remove(dks_sp_draw_btns)
 
         elif bpy.context.preferences.addons[__package__].preferences.option_display_type=='Menu':
 
-                register_class(dks_sp_menu)
+                unregister_class(dks_sp_menu)
                 bpy.types.TOPBAR_MT_editor_menus.remove(dks_sp_draw_menu)
 
         from bpy.utils import unregister_class