NiPixelData.save_as_dds fourcc flag bugfix.

amorilia · Jan 30, 2011 · ca640ce · ca640ce
1 parent 3097591
commit ca640ce
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -12,6 +12,8 @@ Release 2.1.8 (in development)
 * Added CStreamableAssetData for Divinity 2 (reported by pertinen,
   niftools issue #3164929).
 
+* NiPixelData.save_as_dds fourcc flag bugfix.
+
 Release 2.1.7 (23 January 2011)
 ===============================
 

diff --git a/pyffi/formats/nif/__init__.py b/pyffi/formats/nif/__init__.py
@@ -5775,7 +5775,7 @@ def save_as_dds(self, stream):
                     # used in newer nif versions
                     pixeldata.set_value(''.join(self.pixel_data_matrix))
             elif self.pixel_format == NifFormat.PixelFormat.PX_FMT_DXT1:
-                # format used in Megami Tensei: Imagine
+                # format used in Megami Tensei: Imagine and Bully SE
                 header.flags.caps = 1
                 header.flags.height = 1
                 header.flags.width = 1
@@ -5786,8 +5786,8 @@ def save_as_dds(self, stream):
                 header.width = self.mipmaps[0].width
                 header.linear_size = 0
                 header.mipmap_count = len(self.mipmaps)
-                header.pixel_format.flags.fourcc = 1
-                header.pixel_format.fourcc = pyffi.formats.dds.DdsFormat.FourCC.DXT1
+                header.pixel_format.flags.four_c_c = 1
+                header.pixel_format.four_c_c = pyffi.formats.dds.DdsFormat.FourCC.DXT1
                 header.pixel_format.bit_count = 0
                 header.pixel_format.r_mask = 0
                 header.pixel_format.g_mask = 0
@@ -5817,8 +5817,8 @@ def save_as_dds(self, stream):
                 header.width = self.mipmaps[0].width
                 header.linear_size = 0
                 header.mipmap_count = len(self.mipmaps)
-                header.pixel_format.flags.fourcc = 1
-                header.pixel_format.fourcc = pyffi.formats.dds.DdsFormat.FourCC.DXT5
+                header.pixel_format.flags.four_c_c = 1
+                header.pixel_format.four_c_c = pyffi.formats.dds.DdsFormat.FourCC.DXT5
                 header.pixel_format.bit_count = 0
                 header.pixel_format.r_mask = 0
                 header.pixel_format.g_mask = 0