[Bf-extensions-cvs] [b000492c] blender2.8: Merge branch 'master' into blender2.8
Campbell Barton
noreply at git.blender.org
Fri Sep 7 22:12:16 CEST 2018
Commit: b000492c4f8eded8da5e502741cccc7def1ecb52
Author: Campbell Barton
Date: Sat Sep 8 06:21:30 2018 +1000
Branches: blender2.8
https://developer.blender.org/rBACb000492c4f8eded8da5e502741cccc7def1ecb52
Merge branch 'master' into blender2.8
===================================================================
===================================================================
diff --cc io_directx_bel/__init__.py
index e9e73611,f8a346ea..3ce38646
--- a/io_directx_bel/__init__.py
+++ b/io_directx_bel/__init__.py
@@@ -288,8 -288,8 +288,8 @@@ def register()
def unregister():
bpy.utils.unregister_module(__name__)
- bpy.types.INFO_MT_file_import.remove(menu_func_import)
- #bpy.types.INFO_MT_file_export.remove(menu_func_export)
+ bpy.types.TOPBAR_MT_file_import.remove(menu_func_import)
+ #bpy.types.TOPBAR_MT_file_export.remove(menu_func_export)
if __name__ == "__main__":
- register()
+ register()
diff --cc io_points_pcd/__init__.py
index f2328aa9,b5ca0dd0..dfe547b0
--- a/io_points_pcd/__init__.py
+++ b/io_points_pcd/__init__.py
@@@ -1,130 -1,129 +1,129 @@@
- # ##### 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 #####
-
- bl_info = {
- "name": "PCD",
- "author": "Aurel Wildfellner",
- "version": (0, 2),
- "blender": (2, 57, 0),
- "location": "File > Import-Export > Point Cloud Data",
- "description": "Imports and Exports PCD (Point Cloud Data) files. PCD files are the default format used by pcl (Point Cloud Library).",
- "warning": "",
- "wiki_url": "http://wiki.blender.org/index.php?title=Extensions:2.6/Py/Scripts/Import-Export/Point_Cloud_Data_IO",
- "tracker_url": "https://developer.blender.org/maniphest/task/edit/form/2/",
- # "support": 'OFFICAL',
- "category": "Import-Export"}
-
-
- if "bpy" in locals():
- import imp
- imp.reload(pcd_utils)
- else:
- from . import pcd_utils
-
- import itertools
- import os
-
-
- import bpy
- from bpy.props import *
- from bpy_extras.io_utils import ExportHelper, ImportHelper
-
-
- class ImportPCD(bpy.types.Operator, ImportHelper):
- """Load PCD (Point Cloud Data) files"""
- bl_idname = "import_points.stl"
- bl_label = "Import PCD"
-
- filename_ext = ".pcd"
-
- filter_glob = StringProperty(default="*.pcd", options={'HIDDEN'})
- object_name = StringProperty(default="", options={'HIDDEN'})
-
- files = CollectionProperty(name="File Path",
- description="File path used for importing "
- "the PCD file",
- type=bpy.types.OperatorFileListElement)
-
- directory = StringProperty(subtype='DIR_PATH')
-
- def execute(self, context):
- paths = [os.path.join(self.directory, name.name) for name in self.files]
- if not paths:
- paths.append(self.filepath)
-
- for path in paths:
-
- objname = ""
-
- if self.object_name == "":
- # name the object with the filename exluding .pcd
- objname = os.path.basename(path)[:-4]
- else:
- # use name set by calling the operator with the arg
- objname = self.object_name
-
- pcd_utils.import_pcd(path, objname)
-
- return {'FINISHED'}
-
-
-
-
- class ExportPCD(bpy.types.Operator, ExportHelper):
- """Save PCD (Point Cloud Data) files"""
- bl_idname = "export_points.pcd"
- bl_label = "Export PCD"
-
- filename_ext = ".pcd"
-
- filter_glob = StringProperty(default="*.pcd", options={'HIDDEN'})
-
-
- def execute(self, context):
- pcd_utils.export_pcd(self.filepath)
-
- return {'FINISHED'}
-
-
-
-
- def menu_func_import(self, context):
- self.layout.operator(ImportPCD.bl_idname, text="Point Cloud Data (.pcd)").filepath = "*.pcd"
-
-
- def menu_func_export(self, context):
- self.layout.operator(ExportPCD.bl_idname, text="Point Cloud Data (.pcd)")
-
-
- def register():
- bpy.utils.register_module(__name__)
-
- bpy.types.TOPBAR_MT_file_import.append(menu_func_import)
- bpy.types.TOPBAR_MT_file_export.append(menu_func_export)
-
-
- def unregister():
- bpy.utils.unregister_module(__name__)
-
- bpy.types.TOPBAR_MT_file_import.remove(menu_func_import)
- bpy.types.TOPBAR_MT_file_export.remove(menu_func_export)
-
-
- if __name__ == "__main__":
- register()
-
+ # ##### 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 #####
+
+ bl_info = {
+ "name": "PCD",
+ "author": "Aurel Wildfellner",
+ "version": (0, 2),
+ "blender": (2, 57, 0),
+ "location": "File > Import-Export > Point Cloud Data",
+ "description": "Imports and Exports PCD (Point Cloud Data) files. PCD files are the default format used by pcl (Point Cloud Library).",
+ "warning": "",
+ "wiki_url": "http://wiki.blender.org/index.php?title=Extensions:2.6/Py/Scripts/Import-Export/Point_Cloud_Data_IO",
+ "tracker_url": "https://developer.blender.org/maniphest/task/edit/form/2/",
+ # "support": 'OFFICAL',
+ "category": "Import-Export"}
+
+
+ if "bpy" in locals():
+ import imp
+ imp.reload(pcd_utils)
+ else:
+ from . import pcd_utils
+
+ import itertools
+ import os
+
+
+ import bpy
+ from bpy.props import *
+ from bpy_extras.io_utils import ExportHelper, ImportHelper
+
+
+ class ImportPCD(bpy.types.Operator, ImportHelper):
+ """Load PCD (Point Cloud Data) files"""
+ bl_idname = "import_points.stl"
+ bl_label = "Import PCD"
+
+ filename_ext = ".pcd"
+
+ filter_glob = StringProperty(default="*.pcd", options={'HIDDEN'})
+ object_name = StringProperty(default="", options={'HIDDEN'})
+
+ files = CollectionProperty(name="File Path",
+ description="File path used for importing "
+ "the PCD file",
+ type=bpy.types.OperatorFileListElement)
+
+ directory = StringProperty(subtype='DIR_PATH')
+
+ def execute(self, context):
+ paths = [os.path.join(self.directory, name.name) for name in self.files]
+ if not paths:
+ paths.append(self.filepath)
+
+ for path in paths:
+
+ objname = ""
+
+ if self.object_name == "":
+ # name the object with the filename exluding .pcd
+ objname = os.path.basename(path)[:-4]
+ else:
+ # use name set by calling the operator with the arg
+ objname = self.object_name
+
+ pcd_utils.import_pcd(path, objname)
+
+ return {'FINISHED'}
+
+
+
+
+ class ExportPCD(bpy.types.Operator, ExportHelper):
+ """Save PCD (Point Cloud Data) files"""
+ bl_idname = "export_points.pcd"
+ bl_label = "Export PCD"
+
+ filename_ext = ".pcd"
+
+ filter_glob = StringProperty(default="*.pcd", options={'HIDDEN'})
+
+
+ def execute(self, context):
+ pcd_utils.export_pcd(self.filepath)
+
+ return {'FINISHED'}
+
+
+
+
+ def menu_func_import(self, context):
+ self.layout.operator(ImportPCD.bl_idname, text="Point Cloud Data (.pcd)").filepath = "*.pcd"
+
+
+ def menu_func_export(self, context):
+ self.layout.operator(ExportPCD.bl_idname, text="Point Cloud Data (.pcd)")
+
+
+ def register():
+ bpy.utils.register_module(__name__)
+
- bpy.types.INFO_MT_file_import.append(menu_func_import)
- bpy.types.INFO_MT_file_export.append(menu_func_export)
++ bpy.types.TOPBAR_MT_file_import.append(menu_func_import)
++ bpy.types.TOPBAR_MT_file_export.append(menu_func_export)
+
+
+ def unregister():
+ bpy.utils.unregister_module(__name__)
+
- bpy.types.INFO_MT_file_import.remove(menu_func_import)
- bpy.types.INFO_MT_file_export.remove(menu_func_export)
++ bpy.types.TOPBAR_MT_file_import.remove(menu_func_import)
++ bpy.types.TOPBAR_MT_file_export.remove(menu_func_export)
+
+
+ if __name__ == "__main__":
+ register()
diff --cc mesh_ktools.py
index 418df810,7a18485e..c4ed08f4
--- a/mesh_ktools.py
+++ b/mesh_ktools.py
@@@ -556,16 -556,16 +556,16 @@@ class quickbool(bpy.types.Operator)
bpy.ops.mesh.select_all(action='SELECT')
bpy.ops.mesh.delete(type='VERT')
bpy.ops.object.mode_set(mode = 'OBJECT', toggle = False)
-
+
bpy.ops.object.delete(use_global=False)
- bpy.context.scene.objects.active = bpy.data.objects[original]
- else:
+ bpy.context.scene.objects.active = bpy.data.objects[original]
+ else:
bpy.ops.object.select_all(action='DESELECT')
bpy.ops.object.select_pattern(pattern=name)
- bpy.context.sc
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list