Fix Tex node default values

1r3n33 · Aug 17, 2020 · a2cc624 · a2cc624
1 parent e75fe15
commit a2cc624
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/blend2niff/niff2/niff2_tex.py b/blend2niff/niff2/niff2_tex.py
@@ -100,12 +100,12 @@ def __init__(self, index, name_index, width, height):
         self.tex_tile_height = height
         self.tex_offset_x = 0
         self.tex_offset_y = 0
-        self.tex_img_index = index
+        self.tex_img_index = BAD_INDEX
         self.tex_filter = NIFF2_TEX_FILTER_BILERP
         self.use_perspective_correction = NIFF2_PERSPECTIVE_CORRECTION
         self.mipmap_level = NIFF2_NO_MIPMAP
         self.use_color_palette = NIFF2_NO_USE_COLOR_PALETTE
-        self.external_tex_img_num = BAD_INDEX
+        self.external_tex_img_num = 0  # Do not use BAD_INDEX
 
 
 def niff2_tex_node_builder(index, name_index, width, height):

diff --git a/tests/test_niff2_tex.py b/tests/test_niff2_tex.py
@@ -58,12 +58,12 @@ def test_niff2_tex_node_builder(self):
         self.assertEqual(tex_node.tex_tile_height, 78)
         self.assertEqual(tex_node.tex_offset_x, 0)
         self.assertEqual(tex_node.tex_offset_y, 0)
-        self.assertEqual(tex_node.tex_img_index, 12)
+        self.assertEqual(tex_node.tex_img_index, 0xFFFFFFFF)
         self.assertEqual(tex_node.tex_filter, 1)
         self.assertEqual(tex_node.use_perspective_correction, 1)
         self.assertEqual(tex_node.mipmap_level, 0)
         self.assertEqual(tex_node.use_color_palette, 0)
-        self.assertEqual(tex_node.external_tex_img_num, 0xFFFFFFFF)
+        self.assertEqual(tex_node.external_tex_img_num, 0)
 
     def test_niff2_tex_node_writer(self):
         tex_node = niff2_tex_node_builder(12, 34, 56, 78)
@@ -87,10 +87,10 @@ def test_niff2_tex_node_writer(self):
                      0x00, 0x00, 0x00, 0x4E,
                      0x00, 0x00, 0x00, 0x00,
                      0x00, 0x00, 0x00, 0x00,
-                     0x00, 0x00, 0x00, 0x0C,
+                     0xFF, 0xFF, 0xFF, 0xFF,
                      0x00, 0x00, 0x00, 0x01,
                      0x00, 0x00, 0x00, 0x01,
                      0x00, 0x00, 0x00, 0x00,
                      0x00, 0x00, 0x00, 0x00,
-                     0xFF, 0xFF, 0xFF, 0xFF]
+                     0x00, 0x00, 0x00, 0x00]
         self.assertEqual(list(buf), byte_list)