Merge pull request #615 from niftools/develop

Develop to master

Author: Candoran2

CHANGELOG.rst

@@ -1,4 +1,30 @@
-Version v0.1.00
+Version v0.1.1
+===============
+
+- #591 Expansion of DisplayList processing and small fixes.
+    - Rigged meshes with DisplayLists will now have functional weights.
+    - 4-component normals are now handled correctly for DisplayLists.
+    - Added multiple UV layer support for DisplayLists.
+    - Rudimentary support for Fallout NV (Fallout New Vegas) by treating it the same as Fallout 3.
+    - Fixes #582
+    - Fixes #589
+    - Fix for animation support for Shin Megami Tensei: Imagine.
+    - Fixes #584
+    - Fixes #554 and overhauls/isolates the way the nif geometry data is obtained during export.
+    - Added option for splitting on tangents (did not happen before). Needs to be disabled for Oblivion head meshes.
+    - Warn rather than silent fail during egm import.
+    - Export: Move UV coordinates that are completely in another UV tile to the 0-1 tile.
+    - Added support for weighted Fallout 4 meshes, fixing #598
+    - Fixes #599
+    - Fixes #600
+    - Add exported tangents to Bully SE.
+    - Always return copy for get_object_bind to prevent accidental modification.
+    - Added support for basic (unweighted) Skyrim SE export.
+    - Change generated module name from generated to nifgen to prevent collision with cobra-tools.
+- #592 Update to documentation
+- #593 Supported export for Sid Meier's Pirates!.
+
+Version v0.1.0
 ===============
 
 - #576 Updates to documentation, changelog and makezip.bat (copies over generated folder from cobra-tools).

install/install.bat

@@ -9,7 +9,8 @@ for %%I in ("%DIR%\..") do set "ROOT=%%~fI"
 set "NAME=blender_niftools_addon"
 set /p VERSION=<%ROOT%\io_scene_niftools\VERSION.txt
 for /f %%i in ('git rev-parse --short HEAD') do set HASH=%%i
-for /f %%i in ('echo %date%') do set DATE=%%i
+:: Use PowerShell to get current date in YYYY-MM-DD format independent of local format
+for /f %%i in ('powershell -executionpolicy bypass -Command Get-Date -Format "yyyy-MM-dd"') do set DATE=%%i
 set "ZIP_NAME=%NAME%-%VERSION%-%DATE%-%HASH%"
 
 if "%BLENDER_ADDONS_DIR%" == "" if not exist "%BLENDER_ADDONS_DIR%" (

install/makezip.bat

@@ -26,7 +26,7 @@ mkdir "%DEPS%"
 
 python -m pip install "PyFFI==%PYFFI_VERSION%" --target="%DEPS%"
 
-xcopy "%GENERATED_FOLDER%" "%DEPS%\generated" /s /q /i
+xcopy "%GENERATED_FOLDER%" "%DEPS%\nifgen" /s /q /i
 
 xcopy "%ROOT%"\AUTHORS.rst io_scene_niftools
 xcopy "%ROOT%"\CHANGELOG.rst io_scene_niftools

install/makezip.sh

@@ -34,7 +34,7 @@ echo "Creating dependencies folder ${DEPS_OUT:-${BUILD_DIR}/dependencies}"
 python -m pip install "PyFFI==${PYFFI_VERSION}" --target="${DEPS_OUT:-${BUILD_DIR}/dependencies}"
 
 echo "Copying loose files"
-cp -r "$GENERATED_FOLDER" "${DEPS_OUT:-${BUILD_DIR}/dependencies}/generated"
+cp -r "$GENERATED_FOLDER" "${DEPS_OUT:-${BUILD_DIR}/dependencies}/nifgen"
 cp "${ROOT}"/AUTHORS.rst "${ADDON_OUT}"
 cp "${ROOT}"/CHANGELOG.rst "${ADDON_OUT}"
 cp "${ROOT}"/LICENSE.rst "${ADDON_OUT}"

install/zip.ps1

@@ -13,7 +13,20 @@ write ("Existing archive removed successfully")
 }
 
 Add-Type -assembly "system.io.compression.filesystem"
-[io.compression.zipfile]::CreateFromDirectory($source, $destination, 1, 1)
+
+$EncoderClass=@"
+  public class FixedEncoder : System.Text.UTF8Encoding {
+    public FixedEncoder() : base(true) { }
+    public override byte[] GetBytes(string s) {
+      s = s.Replace("\\", "/");
+      return base.GetBytes(s);
+    }
+  }
+"@
+Add-Type -TypeDefinition $EncoderClass
+
+$Encoder = New-Object FixedEncoder
+[io.compression.zipfile]::CreateFromDirectory($source, $destination, 1, 1, $Encoder)
 If(Test-path $destination) {
     write("File successully written")
 }

io_scene_niftools/VERSION.txt

@@ -1 +1 @@
-v0.1.0
+v0.1.1

io_scene_niftools/__init__.py

@@ -49,7 +49,7 @@
     "description": "Import and export files in the NetImmerse/Gamebryo formats (.nif, .kf, .egm)",
     "author": "Niftools team",
     "blender": (2, 82, 0),
-    "version": (0, 1, 0),  # can't read from VERSION, blender wants it hardcoded
+    "version": (0, 1, 1),  # can't read from VERSION, blender wants it hardcoded
     "api": 39257,
     "location": "File > Import-Export",
     "warning": "Generally stable port of the Niftool's Blender NifScripts, many improvements, still work in progress",
@@ -72,7 +72,7 @@ def locate_dependencies():
 
     with open(os.path.join(current_dir, "VERSION.txt")) as version:
         NifLog.info(f"Loading: Blender Niftools Addon: {version.read()}")
-        import generated.formats.nif as NifFormat
+        import nifgen.formats.nif as NifFormat
         NifLog.info(f"Loading: NifFormat: {NifFormat.__xml_version__}") # todo [generated] update this and library to have actual versioning
 
 

io_scene_niftools/egm_import.py

@@ -69,6 +69,8 @@ def execute(self):
                 b_obj = bpy.context.view_layer.objects.active
                 if b_obj and b_obj.type == "MESH":
                     self.morph_anim.import_egm_morphs(b_obj)
+                else:
+                    NifLog.warn(f'Selected object {b_obj.name} is not a mesh object, nothing will be imported.')
         except NifError:
             return {'CANCELLED'}
 

io_scene_niftools/file_io/nif.py

@@ -39,7 +39,7 @@
 
 import os.path as path
 
-import generated.formats.nif as NifFormat
+import nifgen.formats.nif as NifFormat
 
 from io_scene_niftools.utils.logging import NifLog, NifError
 

io_scene_niftools/kf_export.py

@@ -89,7 +89,7 @@ def execute(self):
         data.neosteam = (bpy.context.scene.niftools_scene.game == 'NEOSTEAM')
 
         # scale correction for the skeleton
-        self.apply_scale(data, round(1 / NifOp.props.scale_correction))
+        self.apply_scale(data, 1 / NifOp.props.scale_correction)
 
         data.validate()