[Bf-extensions-cvs] [d364a7b4] master: Split io_scene_obj into separate io_import_obj and io_export_obj.
Howard Trickey
noreply at git.blender.org
Thu Feb 3 13:55:56 CET 2022
Commit: d364a7b4253e974ad3cc5c76e08478fa69ca0a46
Author: Howard Trickey
Date: Thu Feb 3 07:55:33 2022 -0500
Branches: master
https://developer.blender.org/rBAd364a7b4253e974ad3cc5c76e08478fa69ca0a46
Split io_scene_obj into separate io_import_obj and io_export_obj.
Also put an " - Old" by the name of the exporter.
The intention is that we won't load the Python exporter, but if a user wants
it, they can enable that addon.
===================================================================
R060 io_scene_obj/__init__.py io_export_obj/__init__.py
R100 io_scene_obj/export_obj.py io_export_obj/export_obj.py
A io_import_obj/__init__.py
R100 io_scene_obj/import_obj.py io_import_obj/import_obj.py
===================================================================
diff --git a/io_scene_obj/__init__.py b/io_export_obj/__init__.py
similarity index 60%
rename from io_scene_obj/__init__.py
rename to io_export_obj/__init__.py
index 78c2314e..67be3175 100644
--- a/io_scene_obj/__init__.py
+++ b/io_export_obj/__init__.py
@@ -19,12 +19,12 @@
# <pep8-80 compliant>
bl_info = {
- "name": "Wavefront OBJ format",
+ "name": "Export Wavefront OBJ format",
"author": "Campbell Barton, Bastien Montagne",
"version": (3, 9, 0),
"blender": (3, 0, 0),
"location": "File > Import-Export",
- "description": "Import-Export OBJ, Import OBJ mesh, UV's, materials and textures",
+ "description": "Export OBJ, Import OBJ mesh, UV's, materials and textures",
"warning": "",
"doc_url": "{BLENDER_MANUAL_URL}/addons/import_export/scene_obj.html",
"support": 'OFFICIAL',
@@ -33,8 +33,6 @@ bl_info = {
if "bpy" in locals():
import importlib
- if "import_obj" in locals():
- importlib.reload(import_obj)
if "export_obj" in locals():
importlib.reload(export_obj)
@@ -47,7 +45,6 @@ from bpy.props import (
EnumProperty,
)
from bpy_extras.io_utils import (
- ImportHelper,
ExportHelper,
orientation_helper,
path_reference_mode,
@@ -55,190 +52,6 @@ from bpy_extras.io_utils import (
)
- at orientation_helper(axis_forward='-Z', axis_up='Y')
-class ImportOBJ(bpy.types.Operator, ImportHelper):
- """Load a Wavefront OBJ File"""
- bl_idname = "import_scene.obj"
- bl_label = "Import OBJ"
- bl_options = {'PRESET', 'UNDO'}
-
- filename_ext = ".obj"
- filter_glob: StringProperty(
- default="*.obj;*.mtl",
- options={'HIDDEN'},
- )
-
- use_edges: BoolProperty(
- name="Lines",
- description="Import lines and faces with 2 verts as edge",
- default=True,
- )
- use_smooth_groups: BoolProperty(
- name="Smooth Groups",
- description="Surround smooth groups by sharp edges",
- default=True,
- )
-
- use_split_objects: BoolProperty(
- name="Object",
- description="Import OBJ Objects into Blender Objects",
- default=True,
- )
- use_split_groups: BoolProperty(
- name="Group",
- description="Import OBJ Groups into Blender Objects",
- default=False,
- )
-
- use_groups_as_vgroups: BoolProperty(
- name="Poly Groups",
- description="Import OBJ groups as vertex groups",
- default=False,
- )
-
- use_image_search: BoolProperty(
- name="Image Search",
- description="Search subdirs for any associated images "
- "(Warning, may be slow)",
- default=True,
- )
-
- split_mode: EnumProperty(
- name="Split",
- items=(
- ('ON', "Split", "Split geometry, omits vertices unused by edges or faces"),
- ('OFF', "Keep Vert Order", "Keep vertex order from file"),
- ),
- )
-
- global_clamp_size: FloatProperty(
- name="Clamp Size",
- description="Clamp bounds under this value (zero to disable)",
- min=0.0, max=1000.0,
- soft_min=0.0, soft_max=1000.0,
- default=0.0,
- )
-
- def execute(self, context):
- # print("Selected: " + context.active_object.name)
- from . import import_obj
-
- if self.split_mode == 'OFF':
- self.use_split_objects = False
- self.use_split_groups = False
- else:
- self.use_groups_as_vgroups = False
-
- keywords = self.as_keywords(
- ignore=(
- "axis_forward",
- "axis_up",
- "filter_glob",
- "split_mode",
- ),
- )
-
- global_matrix = axis_conversion(
- from_forward=self.axis_forward,
- from_up=self.axis_up,
- ).to_4x4()
- keywords["global_matrix"] = global_matrix
-
- if bpy.data.is_saved and context.preferences.filepaths.use_relative_paths:
- import os
- keywords["relpath"] = os.path.dirname(bpy.data.filepath)
-
- return import_obj.load(context, **keywords)
-
- def draw(self, context):
- pass
-
-
-class OBJ_PT_import_include(bpy.types.Panel):
- bl_space_type = 'FILE_BROWSER'
- bl_region_type = 'TOOL_PROPS'
- bl_label = "Include"
- bl_parent_id = "FILE_PT_operator"
-
- @classmethod
- def poll(cls, context):
- sfile = context.space_data
- operator = sfile.active_operator
-
- return operator.bl_idname == "IMPORT_SCENE_OT_obj"
-
- def draw(self, context):
- layout = self.layout
- layout.use_property_split = True
- layout.use_property_decorate = False # No animation.
-
- sfile = context.space_data
- operator = sfile.active_operator
-
- layout.prop(operator, 'use_image_search')
- layout.prop(operator, 'use_smooth_groups')
- layout.prop(operator, 'use_edges')
-
-
-class OBJ_PT_import_transform(bpy.types.Panel):
- bl_space_type = 'FILE_BROWSER'
- bl_region_type = 'TOOL_PROPS'
- bl_label = "Transform"
- bl_parent_id = "FILE_PT_operator"
-
- @classmethod
- def poll(cls, context):
- sfile = context.space_data
- operator = sfile.active_operator
-
- return operator.bl_idname == "IMPORT_SCENE_OT_obj"
-
- def draw(self, context):
- layout = self.layout
- layout.use_property_split = True
- layout.use_property_decorate = False # No animation.
-
- sfile = context.space_data
- operator = sfile.active_operator
-
- layout.prop(operator, "global_clamp_size")
- layout.prop(operator, "axis_forward")
- layout.prop(operator, "axis_up")
-
-
-class OBJ_PT_import_geometry(bpy.types.Panel):
- bl_space_type = 'FILE_BROWSER'
- bl_region_type = 'TOOL_PROPS'
- bl_label = "Geometry"
- bl_parent_id = "FILE_PT_operator"
- bl_options = {'DEFAULT_CLOSED'}
-
- @classmethod
- def poll(cls, context):
- sfile = context.space_data
- operator = sfile.active_operator
-
- return operator.bl_idname == "IMPORT_SCENE_OT_obj"
-
- def draw(self, context):
- layout = self.layout
-
- sfile = context.space_data
- operator = sfile.active_operator
-
- layout.row().prop(operator, "split_mode", expand=True)
-
- layout.use_property_split = True
- layout.use_property_decorate = False # No animation.
-
- col = layout.column()
- if operator.split_mode == 'ON':
- col.prop(operator, "use_split_objects", text="Split by Object")
- col.prop(operator, "use_split_groups", text="Split by Group")
- else:
- col.prop(operator, "use_groups_as_vgroups")
-
-
@orientation_helper(axis_forward='-Z', axis_up='Y')
class ExportOBJ(bpy.types.Operator, ExportHelper):
"""Save a Wavefront OBJ File"""
@@ -476,19 +289,11 @@ class OBJ_PT_export_geometry(bpy.types.Panel):
layout.prop(operator, 'keep_vertex_order')
-def menu_func_import(self, context):
- self.layout.operator(ImportOBJ.bl_idname, text="Wavefront (.obj)")
-
-
def menu_func_export(self, context):
- self.layout.operator(ExportOBJ.bl_idname, text="Wavefront (.obj)")
+ self.layout.operator(ExportOBJ.bl_idname, text="Wavefront (.obj) - Old")
classes = (
- ImportOBJ,
- OBJ_PT_import_include,
- OBJ_PT_import_transform,
- OBJ_PT_import_geometry,
ExportOBJ,
OBJ_PT_export_include,
OBJ_PT_export_transform,
@@ -500,12 +305,10 @@ def register():
for cls in classes:
bpy.utils.register_class(cls)
- bpy.types.TOPBAR_MT_file_import.append(menu_func_import)
bpy.types.TOPBAR_MT_file_export.append(menu_func_export)
def unregister():
- bpy.types.TOPBAR_MT_file_import.remove(menu_func_import)
bpy.types.TOPBAR_MT_file_export.remove(menu_func_export)
for cls in classes:
diff --git a/io_scene_obj/export_obj.py b/io_export_obj/export_obj.py
similarity index 100%
rename from io_scene_obj/export_obj.py
rename to io_export_obj/export_obj.py
diff --git a/io_import_obj/__init__.py b/io_import_obj/__init__.py
new file mode 100644
index 00000000..ee7faa83
--- /dev/null
+++ b/io_import_obj/__init__.py
@@ -0,0 +1,266 @@
+# ##### BEGIN GPL LICENSE BLOCK #####
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# ##### END GPL LICENSE BLOCK #####
+
+# <pep8-80 compliant>
+
+bl_info = {
+ "name": "Import Wavefront OBJ format",
+ "author": "Campbell Barton, Bastien Montagne",
+ "version": (3, 9, 0),
+ "blender": (3, 0, 0),
+ "location": "File > Import",
+ "description": "Import OBJ, Import OBJ mesh, UV's, materials and textures",
+ "warning": "",
+ "doc_url": "{BLENDER_MANUAL_URL}/addons/import_export/scene_obj.html",
+ "support": 'OFFICIAL',
+ "category": "Import-Export",
+}
+
+if "bpy" in locals():
+ import importlib
+ if "import_obj" in locals():
+ importlib.reload(import_obj)
+
+
+import bpy
+from bpy.props import (
+ BoolProperty,
+ FloatProperty,
+ StringProperty,
+ EnumProperty,
+)
+from bpy_extras.io_utils import (
+ ImportHelper,
+ orientation_helper,
+ path_reference_mode,
+ axis_conversion,
+)
+
+
+ at orientation_helper(axis_forward='-Z', axis_up='Y')
+class ImportOBJ(bpy.types.Operator, ImportHelper):
+ """Load a Wavefront OBJ File"""
+ bl_idname = "import_scene.obj"
+ bl_label = "Import OBJ"
+ bl_options = {'PRESET', 'UNDO'}
+
+ filename_ext = ".obj"
+ filter_glob: StringProperty(
+ default="*.obj;*.
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list