Merge branch 'v1.2.0'

__init__.py

@@ -43,6 +43,9 @@
 
 # TODO: Importing BLB files.
 # TODO: Render brick preview.
+# TODO: Panels in the UI?
+# TODO: Brick quad limit?
+# TODO: Check that all docstrings and comments are still up to date.
 
 
 class ExportBLB(bpy.types.Operator, ExportHelper):
@@ -265,7 +268,7 @@ class ExportBLB(bpy.types.Operator, ExportHelper):
     auto_sort_quads = BoolProperty(
         name="Automatic Quad Sorting",
         description="Automatically sorts the quads of the meshes into the 7 sections. Coverage must be enabled for this to be of any use.",
-        default=False,
+        default=True,
     )
 
     # -------------
@@ -274,7 +277,7 @@ class ExportBLB(bpy.types.Operator, ExportHelper):
     use_materials = BoolProperty(
         name="Use Material Colors",
         description="Read quad colors from materials (recommended method, overrides object colors)",
-        default=True,
+        default=False,
     )
 
     # -----------------
@@ -283,7 +286,7 @@ class ExportBLB(bpy.types.Operator, ExportHelper):
     use_vertex_colors = BoolProperty(
         name="Use Vertex Colors",
         description="Read quad colors from the first vertex color layer (overrides material colors)",
-        default=True,
+        default=False,
     )
 
     # -----------------
@@ -295,6 +298,24 @@ class ExportBLB(bpy.types.Operator, ExportHelper):
         default=False,
     )
 
+    # -------------
+    # Calculate UVs
+    # -------------
+    calculate_uvs = BoolProperty(
+        name="Calculate UVs",
+        description="Calculate correct UV coordinates based on the brick texture name specified in the material name",
+        default=True,
+    )
+
+    # ---------
+    # Store UVs
+    # ---------
+    store_uvs = BoolProperty(
+        name="Store UVs",
+        description="Write calculated UVs into Blender objects (data in existing generated UV layers will be overwritten)",
+        default=True,
+    )
+
     # -------------
     # Round Normals
     # -------------
@@ -545,11 +566,16 @@ def execute(self, context):
 
             # Show an error popup in the UI.
             self.report({"ERROR"}, message)
-        # Else: No error message, everything is OK.
 
-        logger.clear_log()
+            logger.clear_log()
+
+            return {"CANCELLED"}
+        else:
+            # No error message, everything is OK.
+
+            logger.clear_log()
 
-        return {"FINISHED"}
+            return {"FINISHED"}
 
     # ==============
     # User Interface
@@ -713,6 +739,19 @@ def draw_coverage_property(label_text):
         # Property: Use Object Colors
         layout.prop(self, "use_object_colors")
 
+        # Property: UVs
+        row = layout.row()
+        split = row.split(percentage=0.53)
+        col = split.column()
+        col.prop(self, "calculate_uvs")
+
+        # Property: Store UVs
+        if self.calculate_uvs:
+            split = split.split()
+            split.active = self.calculate_uvs
+            col = split.column()
+            col.prop(self, "store_uvs")
+
         # Property: Round Normals
         layout.prop(self, "round_normals")