Merge pull request #8 from neomonkeus/release/2.2.3

Release/2.2.3

.gitmodules

@@ -1,9 +1,9 @@
 [submodule "pyffi/formats/nif/nifxml"]
 	path = pyffi/formats/nif/nifxml
-	url = git://niftools.git.sourceforge.net/gitroot/niftools/nifxml
+	url = git://github.com/niftools/nifxml.git
 [submodule "pyffi/formats/kfm/kfmxml"]
 	path = pyffi/formats/kfm/kfmxml
-	url = git://niftools.git.sourceforge.net/gitroot/niftools/kfmxml
+	url = git://github.com/niftools/kfmxml.git
 [submodule "external"]
 	path = external
 	url = git://github.com/amorilia/pyffi-external.git

.project

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>pyffi</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>

AUTHORS.rst

@@ -3,8 +3,8 @@ Main author
 
 * Amorilia ([email protected])
 
-Contributors
-------------
+Previous Developers
+-------------------
 
 * wz ([email protected])
 
@@ -15,10 +15,6 @@ Contributors
 
   - extraction of DXT compressed embedded textures for the nif format
 
-* seith ([email protected])
-
-  - logo design for the Windows installer
-
 * tazpn ([email protected])
 
   - mopp generator using the Havok SDK
@@ -32,10 +28,21 @@ Contributors
 
   - EGM & TRI format xml
 
+Contributors
+------------
+
 * PacificMorrowind ([email protected])
 
   - some nif/kf modifying spells
 
 * Ulrim/Arthmoor
 
   - optimization kit
+
+* seith ([email protected])
+
+  - logo design for the Windows installer
+
+* MorCroft
+
+  - Patch for BSSTextureSet texture path substitution

CHANGELOG.rst

@@ -1,3 +1,11 @@
+Release 2.2.3 (Mar 17, 2014)
+============================
+
+* Update spell texture_path_substitution for BSTextureSet blocks (fix contributed by MorCroft)
+
+* Updated to latest nif.xml, submodules moved to github.
+
+
 Release 2.2.2 (Nov 17, 2012)
 ============================
 

pyffi/VERSION

@@ -1 +1 @@
-2.2.2
+2.2.3

pyffi/spells/nif/dump.py

@@ -157,7 +157,9 @@ def branchinspect(self, branch):
         # stick to main tree nodes, and material and texture properties
         return isinstance(branch, (NifFormat.NiAVObject,
                                    NifFormat.NiTexturingProperty,
-                                   NifFormat.NiMaterialProperty))
+                                   NifFormat.NiMaterialProperty,
+                                   NifFormat.BSLightingShaderProperty,
+                                   NifFormat.BSShaderTextureSet))
 
     def branchentry(self, branch):
         if isinstance(branch, NifFormat.NiTexturingProperty):
@@ -189,6 +191,14 @@ def branchentry(self, branch):
             self.toaster.msg('alpha      %f' % branch.alpha)
             # stop recursion
             return False
+        elif isinstance(branch, NifFormat.BSShaderTextureSet):
+            textures = [path.decode() for path in branch.textures if path.decode() != '']
+            if len(textures) > 0:
+                for n, tex in enumerate (textures):
+                    self.toaster.msg('%i: %s' % (n, tex))
+            else: 
+                self.toaster.msg('BSShaderTextureSet has no Textures')
+            return False
         else:
             # keep looking for blocks of interest
             return True

pyffi/spells/nif/fix.py

@@ -233,20 +233,34 @@ def substitute(self, old_path):
         return old_path
 
     def datainspect(self):
-        # only run the spell if there are NiSourceTexture blocks
-        return self.inspectblocktype(NifFormat.NiSourceTexture)
+        # only run the spell if contains 
+        # NiSourceTexture or BSShaderTextureSet blocks
+        if self.inspectblocktype(NifFormat.BSShaderTextureSet):
+            return True
+        elif self.inspectblocktype(NifFormat.NiSourceTexture):
+            return True
+        else:
+            return False
+
 
     def branchinspect(self, branch):
         # only inspect the NiAVObject branch, texturing properties and source
         # textures
         return isinstance(branch, (NifFormat.NiAVObject,
                                    NifFormat.NiTexturingProperty,
-                                   NifFormat.NiSourceTexture))
+                                   NifFormat.NiSourceTexture,
+                                   NifFormat.BSLightingShaderProperty,
+                                   NifFormat.BSShaderTextureSet))
 
     def branchentry(self, branch):
         if isinstance(branch, NifFormat.NiSourceTexture):
             branch.file_name = self.substitute(branch.file_name)
             return False
+
+        elif isinstance(branch, NifFormat.BSShaderTextureSet):
+            for n, tex in enumerate (branch.textures):
+                branch.textures[n] = self.substitute(tex)
+            return False
         else:
             return True
 
@@ -261,7 +275,7 @@ class SpellFixTexturePath(SpellParseTexturePath):
     """
 
     SPELLNAME = "fix_texturepath"
-	
+    
     def substitute(self, old_path):
         new_path = old_path
         new_path = new_path.replace(b'\n', b'\\n')