blender/blender-addons
19
43
Fork 96
Code Issues 628 Pull Requests 27 Projects 1 Releases Wiki Activity

IO: Option to import each 3DS file on a new collection #105232

Merged
Sebastian Sille merged 6 commits from :roblop-patch-new-collection into main 2024-03-13 13:34:08 +01:00
Conversation 1 Commits 6 Files Changed 2 +25 -3
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
io_scene_3ds/__init__.py
View File

@ -107,6 +107,12 @@ class Import3DS(bpy.types.Operator, ImportHelper):
description="Read the 3D cursor location",
default=False,
)
use_collection: BoolProperty(
RobLop marked this conversation as resolved Outdated
Sebastian Sille commented 2024-03-13 09:29:41 +01:00
Outdated
Review
Copy Link

In style guide we have all boolean options to begin with "use", therefore this boolean has to be "use_collection"

In style guide we have all boolean options to begin with "use", therefore this boolean has to be "use_collection"
👍 1
name="Collection",
RobLop marked this conversation as resolved Outdated
Sebastian Sille commented 2024-03-13 09:30:26 +01:00
Outdated
Review
Copy Link

This looks better if we simply call it "Collection"

This looks better if we simply call it "Collection"
👍 1
description="Create a new collection",
RobLop marked this conversation as resolved Outdated
Sebastian Sille commented 2024-03-13 09:31:05 +01:00
Outdated
Review
Copy Link

Would rename this to "Create a new collection"

Would rename this to "Create a new collection"
👍 1
default=False,
RobLop marked this conversation as resolved Outdated
Sebastian Sille commented 2024-03-13 09:36:00 +01:00
Outdated
Review
Copy Link

Default should be False to make it optional by default

Default should be False to make it optional by default
RobLop commented 2024-03-13 10:16:07 +01:00
Outdated
Review
Copy Link

I think it's better to make it True by default otherwise it create a mess on the active collection after the importation of multiple 3DS files.

I think it's better to make it True by default otherwise it create a mess on the active collection after the importation of multiple 3DS files.
Sebastian Sille commented 2024-03-13 10:31:44 +01:00
Outdated
Review
Copy Link

I think it's better to make it True by default otherwise it create a mess on the active collection after the importation of multiple 3DS files.

It depends on what the user wants, it may be useful for multiple files but the common use of all importers is to add a model to the current collection, thats why I think it should be false by default to match with the other IO scripts

> I think it's better to make it True by default otherwise it create a mess on the active collection after the importation of multiple 3DS files. > It depends on what the user wants, it may be useful for multiple files but the common use of all importers is to add a model to the current collection, thats why I think it should be false by default to match with the other IO scripts
)
def execute(self, context):
from . import import_3ds
@ -166,6 +172,9 @@ class MAX3DS_PT_import_include(bpy.types.Panel):
layrow.prop(operator, "use_keyframes")
layrow.label(text="", icon='ANIM' if operator.use_keyframes else 'DECORATE_DRIVER')
layrow = layout.row(align=True)
layrow.prop(operator, "use_collection")
layrow.label(text="", icon='OUTLINER_COLLECTION' if operator.use_collection else 'GROUP')
RobLop marked this conversation as resolved Outdated
Sebastian Sille commented 2024-03-13 11:03:44 +01:00
Outdated
Review
Copy Link

one last fix to make, replace this with:
layrow.label(text="", icon='OUTLINER_COLLECTION' if operator.use_collection else 'GROUP')
the GROUP icon looks better because it is the inverse of the collection icon ;)

one last fix to make, replace this with: `layrow.label(text="", icon='OUTLINER_COLLECTION' if operator.use_collection else 'GROUP')` the GROUP icon looks better because it is the inverse of the collection icon ;)
👍 1
layrow = layout.row(align=True)
RobLop marked this conversation as resolved Outdated
Sebastian Sille commented 2024-03-13 09:33:43 +01:00
Outdated
Review
Copy Link

This looks better if we move it up before "use_cursor" (so it looks more the same like the exporter)

This looks better if we move it up before "use_cursor" (so it looks more the same like the exporter)
👍 1
layrow.prop(operator, "use_cursor")
RobLop marked this conversation as resolved Outdated
Sebastian Sille commented 2024-03-13 09:34:52 +01:00
Outdated
Review
Copy Link

call it "use_collection" to match with style guide

call it "use_collection" to match with style guide
👍 1
layrow.label(text="", icon='PIVOT_CURSOR' if operator.use_cursor else 'CURSOR')

19
io_scene_3ds/import_3ds.py
View File

@ -10,6 +10,7 @@ import struct
import mathutils
from bpy_extras.image_utils import load_image
from bpy_extras.node_shader_utils import PrincipledBSDFWrapper
from pathlib import Path
BOUNDS_3DS = []
@ -1772,11 +1773,23 @@ def load_3ds(filepath, context, CONSTRAIN=10.0, UNITS=False, IMAGE_SEARCH=True,
def load(operator, context, files=None, directory="", filepath="", constrain_size=0.0, use_scene_unit=False,
use_image_search=True, object_filter=None, use_world_matrix=False, use_keyframes=True,
RobLop marked this conversation as resolved Outdated
Sebastian Sille commented 2024-03-13 09:36:20 +01:00
Outdated
Review
Copy Link

Set default to False

Set default to False
use_apply_transform=True, global_matrix=None, use_cursor=False, use_center_pivot=False):
use_apply_transform=True, global_matrix=None, use_cursor=False, use_center_pivot=False, use_collection=False):
for f in files:
load_3ds(os.path.join(directory, f.name), context, CONSTRAIN=constrain_size, UNITS=use_scene_unit,
# Get the active collection
collection_init = bpy.context.view_layer.active_layer_collection.collection
# Load each selected file
for file in files:
# Create new collections if activated (collection name = 3ds file name)
NRGSille marked this conversation as resolved
Sebastian Sille commented 2024-03-13 11:22:19 +01:00
Review
Copy Link

found a little error in line 1784 (below) must be replaced with if use_collection:

found a little error in line 1784 (below) must be replaced with `if use_collection:`
👍 1
RobLop commented 2024-03-13 13:20:42 +01:00
Review
Copy Link

Yes, I forgot this fix.

Yes, I forgot this fix.
if use_collection:
RobLop marked this conversation as resolved Outdated
Sebastian Sille commented 2024-03-13 09:38:58 +01:00
Outdated
Review
Copy Link

Looks better if we- use it without suffix. Can be achieved with file.name.split(".")[0]

Looks better if we- use it without suffix. Can be achieved with `file.name.split(".")[0]`
👍 1
RobLop commented 2024-03-13 10:49:59 +01:00
Outdated
Review
Copy Link

Ok, achieved with Path().stem (modern way).

Ok, achieved with Path().stem (modern way).
👍 1
collection = bpy.data.collections.new(Path(file.name).stem)
bpy.context.scene.collection.children.link(collection)
bpy.context.view_layer.active_layer_collection = bpy.context.view_layer.layer_collection.children[collection.name]
RobLop marked this conversation as resolved Outdated
Sebastian Sille commented 2024-03-13 09:40:10 +01:00
Outdated
Review
Copy Link

Here is a little error, it must be os.path.join(directory, file.name)

Here is a little error, it must be `os.path.join(directory, file.name)`
👍 1
RobLop commented 2024-03-13 10:50:35 +01:00
Outdated
Review
Copy Link

Ok, corrected with the Path().

Ok, corrected with the Path().
👍 1
load_3ds(Path(directory, file.name), context, CONSTRAIN=constrain_size, UNITS=use_scene_unit,
IMAGE_SEARCH=use_image_search, FILTER=object_filter, WORLD_MATRIX=use_world_matrix, KEYFRAME=use_keyframes,
APPLY_MATRIX=use_apply_transform, CONVERSE=global_matrix, CURSOR=use_cursor, PIVOT=use_center_pivot,)
# Retrive the initial collection as active
bpy.context.view_layer.active_layer_collection = bpy.context.view_layer.layer_collection.children[collection_init.name]
return {'FINISHED'}