Merge pull request #63 from MrClock8163/dev

v2.3.5

Author: MrClock8163

.gitattributes

@@ -1,3 +1,3 @@
 * text=auto
 
-*.py text eol=lf
+* text eol=lf

.gitignore

@@ -1,3 +1,156 @@
-*.blend1
+*.blend*
 *.bat
 *.zip
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+.pybuilder/
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# poetry
+#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
+#   This is especially recommended for binary packages to ensure reproducibility, and is more
+#   commonly ignored for libraries.
+#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
+#poetry.lock
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/
+
+# PyCharm
+#  JetBrains specific template is maintainted in a separate JetBrains.gitignore that can
+#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
+#  and can be added to the global gitignore or merged into this file.  For a more nuclear
+#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
+#.idea/

Arma3ObjectBuilder/CHANGELOG.md

@@ -1,5 +1,26 @@
 # Changelog
 
+## [v2.3.5](https://github.com/MrClock8163/Arma3ObjectBuilder/releases/tag/v2.3.5) (Blender 2.90 -> 4.2)
+
+### Added
+
+- autocomplete suggestions for LOD named properties (Blender 3.3 and above)
+
+### Fixed
+
+- sharp edges data block is no longer exported if no actual sharp edges are detected
+- `Driver: offroad` common proxy had incorrect path
+
+## v2.3.4 (Blender 2.90 -> 4.2)
+
+### Added
+
+- extension manifest `blender_manifest.toml`
+
+### Changed
+
+- updated internal references for compatibility with **Blender 4.2**+
+
 ## [v2.3.3](https://github.com/MrClock8163/Arma3ObjectBuilder/releases/tag/v2.3.3) (Blender 2.90 -> 4.1)
 
 ### Fixed

Arma3ObjectBuilder/__init__.py

@@ -2,13 +2,13 @@
     "name": "Arma 3 Object Builder",
     "description": "Collection of tools for editing Arma 3 content",
     "author": "MrClock (present add-on), Hans-Joerg \"Alwarren\" Frieden (original ArmaToolbox add-on)",
-    "version": (2, 3, 3),
+    "version": (2, 3, 5),
     "blender": (2, 90, 0),
     "location": "Object Builder panels",
     "warning": "",
     "doc_url": "https://mrcmodding.gitbook.io/arma-3-object-builder/home",
     "tracker_url": "https://github.com/MrClock8163/Arma3ObjectBuilder/issues",
-    "category": "3D View"
+    "category": "Import-Export"
 }
 
 
@@ -52,7 +52,7 @@ def execute(self, context):
             from winreg import OpenKey, QueryValueEx, HKEY_CURRENT_USER
             key = OpenKey(HKEY_CURRENT_USER, r"software\bohemia interactive\arma 3 tools")
             value, _type = QueryValueEx(key, "path")
-            prefs = context.preferences.addons["Arma3ObjectBuilder"].preferences
+            prefs = context.preferences.addons[__package__].preferences
             prefs.a3_tools = value
 
         except Exception:
@@ -123,13 +123,13 @@ def poll(cls, context):
         return True
 
     def invoke(self, context, event):
-        prefs = context.preferences.addons["Arma3ObjectBuilder"].preferences
+        prefs = context.preferences.addons[__package__].preferences
         flagutils.set_flag_vertex(self, prefs.flag_vertex)
 
         return context.window_manager.invoke_props_dialog(self)
 
     def execute(self, context):
-        prefs = context.preferences.addons["Arma3ObjectBuilder"].preferences
+        prefs = context.preferences.addons[__package__].preferences
         prefs.flag_vertex = flagutils.get_flag_vertex(self)
 
         return {'FINISHED'}
@@ -175,20 +175,20 @@ def poll(cls, context):
         return True
 
     def invoke(self, context, event):
-        prefs = context.preferences.addons["Arma3ObjectBuilder"].preferences
+        prefs = context.preferences.addons[__package__].preferences
         flagutils.set_flag_face(self, prefs.flag_face)
 
         return context.window_manager.invoke_props_dialog(self)
 
     def execute(self, context):
-        prefs = context.preferences.addons["Arma3ObjectBuilder"].preferences
+        prefs = context.preferences.addons[__package__].preferences
         prefs.flag_face = flagutils.get_flag_face(self)
 
         return {'FINISHED'}
 
 
 class A3OB_AT_preferences(bpy.types.AddonPreferences):
-    bl_idname = __name__
+    bl_idname = __package__
 
     tabs: bpy.props.EnumProperty(
         name = "Tabs",
@@ -348,7 +348,7 @@ def register():
     from bpy.utils import register_class
     from .utilities import generic
 
-    print("Registering Arma 3 Object Builder ( '" + __name__ + "' )")
+    print("Registering Arma 3 Object Builder ( '" + __package__ + "' )")
 
     for cls in classes:
         register_class(cls)
@@ -365,7 +365,7 @@ def unregister():
     from bpy.utils import unregister_class
     from .utilities import generic
 
-    print("Unregistering Arma 3 Object Builder ( '" + __name__ + "' )")
+    print("Unregistering Arma 3 Object Builder ( '" + __package__ + "' )")
 
     generic.unregister_icons()
 

Arma3ObjectBuilder/blender_manifest.toml

@@ -0,0 +1,15 @@
+schema_version = "1.0.0"
+
+maintainer = "MrClock"
+type = "add-on"
+id = "Arma3ObjectBuilder"
+name = "Arma 3 Object Builder"
+tagline = "Comprehensive add-on for modding Arma 3"
+version = "2.3.5"
+blender_version_min = "4.2.0"
+website = "https://mrcmodding.gitbook.io/arma-3-object-builder/home"
+tags = ["Import-Export", "Game Engine", "Object"]
+license = ["SPDX:GPL-3.0-or-later"]
+
+[permissions]
+files = "Import/export operations on supported file formats"

Arma3ObjectBuilder/io/__init__.py

@@ -11,4 +11,4 @@
 from . import import_asc
 from . import import_mcfg
 from . import import_p3d
-from . import import_rtm
+from . import import_rtm

Arma3ObjectBuilder/io/binary_handler.py

@@ -166,4 +166,4 @@ def write_lascii(file, value):
     if length > 255:
         raise ValueError("LASCII string cannot be longer than 255 characters")
 
-    file.write(struct.pack('B%ds' % length, length, value.encode('ascii')))
+    file.write(struct.pack('B%ds' % length, length, value.encode('ascii')))

Arma3ObjectBuilder/io/data_rap.py

@@ -430,4 +430,4 @@ def read_file(cls, filepath):
             except:
                 output = None
 
-        return output
+        return output

Arma3ObjectBuilder/io/data_rtm.py

@@ -466,4 +466,4 @@ def read_rtm_universal(file):
     elif signature == b"RTM_":
         return RTM_File.read(file)
     else:
-        raise ValueError("File is not a valid RTM file.")
+        raise ValueError("File is not a valid RTM file.")

Arma3ObjectBuilder/io/export_asc.py

@@ -113,4 +113,4 @@ def write_file(operator, context, file, obj):
     raster.write(file)
 
     logger.level_down()
-    logger.step("ASC export finished in %f sec" % (time.time() - time_start))
+    logger.step("ASC export finished in %f sec" % (time.time() - time_start))