(no task-id build) demo 2.5.2: ui fixes and feat for #44, #41, #43

KirilStrezikozin · Aug 18, 2023 · 6d65e29 · 6d65e29
1 parent f3e85e6
commit 6d65e29
Show file tree

Hide file tree

Showing 16 changed files with 148 additions and 43 deletions.
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,6 +1,6 @@
 # ##### BEGIN LICENSE BLOCK #####
 #
-# "BakeMaster" Blender Add-on (version 2.5.1)
+# "BakeMaster" Blender Add-on (version 2.5.2)
 # Copyright (C) 2023 Kiril Strezikozin aka kemplerart
 #
 # This License permits you to use this software for any purpose including

diff --git a/README.md b/README.md
@@ -4,14 +4,14 @@
 <h1 id="page-top">
     <a href="#page-top">
         Welcome to <br />
-        BakeMaster 2.5.1 Blender Add-on
+        BakeMaster 2.5.2 Blender Add-on
     </a>
 </h1>
 
 <!-- Intro -->
 BakeMaster is an add-on specified for baking various texture maps <br/>and created for Blender - an open-source 3D Computer graphics software. <br/>Along with its intuitive and convenient workflow baking process becomes a pleasure. <br/>Created from scratch for users who can't stand wasting time, <br />and yearn for most functionality and cutting-edge features.
 
-<a href='https://bakemaster-blender-addon.readthedocs.io/en/2.5.1/'>
+<a href='https://bakemaster-blender-addon.readthedocs.io/en/2.5.2/'>
     <img src='https://readthedocs.org/projects/bakemaster-blender-addon/badge/?version=latest' alt='Documentation Status' />
 </a>
 

diff --git a/__init__.py b/__init__.py
@@ -1,6 +1,6 @@
 # ##### BEGIN LICENSE BLOCK #####
 #
-# "BakeMaster" Blender Add-on (version 2.5.1)
+# "BakeMaster" Blender Add-on (version 2.5.2)
 # Copyright (C) 2023 Kiril Strezikozin aka kemplerart
 #
 # This License permits you to use this software for any purpose including
@@ -31,7 +31,7 @@
     "name" : "BakeMaster",
     "description" : "Bake various PBR, Masks, and Cycles maps with ease and comfort.",
     "author" : "kemplerart",
-    "version" : (2, 5, 1),
+    "version" : (2, 5, 2),
     "blender" : (2, 83, 0),
     "location" : "View3D > Sidebar > BakeMaster",
     "warning" : "",

diff --git a/docs/conf.py b/docs/conf.py
@@ -16,15 +16,15 @@
 
 # -- Local Varibles ----------------------------------------------------------
 
-bakemaster_version = '2.5.1'
+bakemaster_version = '2.5.2'
 
 # -- Project information -----------------------------------------------------
 
 project = 'BakeMaster %s Documentation' % bakemaster_version
 copyright = ': 2023, Kiril Strezikozin'
 author = 'kemplerart'
 version = bakemaster_version
-branch = "release-2.5.1"
+branch = "release-2.5.2"
 
 # The full version, including alpha/beta/rc tags
 release = bakemaster_version
@@ -216,7 +216,7 @@
 # every page bottom, using the given strftime() format.
 # The empty string is equivalent to '%b %d, %Y'
 # (or a locale-dependent equivalent).
-html_last_updated_fmt = '8/17/2023'
+html_last_updated_fmt = '8/18/2023'
 
 # If true, the reST sources are included in the HTML build as _sources/name.
 html_copy_source = True

diff --git a/docs/index.rst b/docs/index.rst
@@ -7,7 +7,7 @@
     :alt: Teaser
 
 ==============================
-BakeMaster 2.5.1 Documentation
+BakeMaster 2.5.2 Documentation
 ==============================
 
 |teaser|

diff --git a/docs/pages/more/releases.rst b/docs/pages/more/releases.rst
@@ -4,6 +4,25 @@ Releases
 
 All BakeMaster Releases and Changelogs are listed on this page. Each new release comes with new features, improvements, or fixes. For clarity, each section has a ``tag`` to identify the changes.
 
+2.5.2 Release
+=============
+
+.. admonition:: Tag
+    :class: important
+
+    `2.5.2 - August 18th, 2023 <https://github.com/KirilStrezikozin/BakeMaster-Blender-Addon/releases>`__
+
+**Fixes:**
+
+#. Global presets did not include map formats (`issue-41 <https://github.com/KirilStrezikozin/BakeMaster-Blender-Addon/issues/41>`__).
+#. Full Object Preset caused blender to crash (`issue-44 <https://github.com/KirilStrezikozin/BakeMaster-Blender-Addon/issues/44>`__).
+
+**New Features:**
+
+#. Texture upscaling by factor (`issue-43 <https://github.com/KirilStrezikozin/BakeMaster-Blender-Addon/issues/43>`__).
+
+`Features <https://bakemaster-blender-addon.readthedocs.io/en/2.5.2/pages/about.html#key-features>`__.
+
 2.5.1 Release
 =============
 

diff --git a/install/bakemaster_blender_addon_v2_5_1_demo.zip b/install/bakemaster_blender_addon_v2_5_1_demo.zip
diff --git a/install/bakemaster_blender_addon_v2_5_2_demo.zip b/install/bakemaster_blender_addon_v2_5_2_demo.zip
diff --git a/labels.py b/labels.py
@@ -1,6 +1,6 @@
 # ##### BEGIN LICENSE BLOCK #####
 #
-# "BakeMaster" Blender Add-on (version 2.5.1)
+# "BakeMaster" Blender Add-on (version 2.5.2)
 # Copyright (C) 2023 Kiril Strezikozin aka kemplerart
 #
 # This License permits you to use this software for any purpose including
@@ -66,7 +66,7 @@ class BM_Labels:
 
     # URLs
     # different documentation versions may have different pages setup
-    __addon_version__ = "2.5.1"
+    __addon_version__ = "2.5.2"
     URL_HELP_MAIN = "https://bakemaster-blender-addon.readthedocs.io/en/%s/" % __addon_version__
     URL_HELP_OBJS = "https://bakemaster-blender-addon.readthedocs.io/en/%s/pages/start/objects.html" % __addon_version__
     URL_HELP_MAPS = "https://bakemaster-blender-addon.readthedocs.io/en/%s/pages/start/maps.html" % __addon_version__

diff --git a/operator_bake.py b/operator_bake.py
@@ -1,6 +1,6 @@
 # ##### BEGIN LICENSE BLOCK #####
 #
-# "BakeMaster" Blender Add-on (version 2.5.1)
+# "BakeMaster" Blender Add-on (version 2.5.2)
 # Copyright (C) 2023 Kiril Strezikozin aka kemplerart
 #
 # This License permits you to use this software for any purpose including

diff --git a/operators.py b/operators.py
@@ -1,6 +1,6 @@
 # ##### BEGIN LICENSE BLOCK #####
 #
-# "BakeMaster" Blender Add-on (version 2.5.1)
+# "BakeMaster" Blender Add-on (version 2.5.2)
 # Copyright (C) 2023 Kiril Strezikozin aka kemplerart
 #
 # This License permits you to use this software for any purpose including

diff --git a/presets.py b/presets.py
@@ -1,6 +1,6 @@
 # ##### BEGIN LICENSE BLOCK #####
 #
-# "BakeMaster" Blender Add-on (version 2.5.1)
+# "BakeMaster" Blender Add-on (version 2.5.2)
 # Copyright (C) 2023 Kiril Strezikozin aka kemplerart
 #
 # This License permits you to use this software for any purpose including
@@ -204,6 +204,8 @@ def rna_recursive_attr_expand(value, rna_path_step, level, add_except, except_ty
                                     file_preset.write("\t%s = %r\n" % (rna_path_step, 'NONE'))
                                 elif "_data" in except_for_in_rna_all:
                                     file_preset.write("\tpass\n")
+                                elif "out_bit_depth" in except_for_in_rna_all:
+                                    file_preset.write("\tpass\n")
 
                             else:
                                 file_preset.write("%s = %r\n" % (rna_path_step, value))
@@ -234,7 +236,7 @@ def rna_recursive_attr_expand(value, rna_path_step, level, add_except, except_ty
 
                     add_except = False
                     except_type = ""
-                    except_for = []
+                    except_for = ["out_bit_depth"]
                     if hasattr(self, "preset_tag"):
                         # add try except TypeError for channel pack maps for chnl preset
                         if getattr(self, "preset_tag") in ["full_object", "chnlp"]:
@@ -495,6 +497,41 @@ def rna_recursive_attr_expand(value, rna_path_step, level, add_except, except_ty
                                     # "map_WIREFRAME_use_preview",
                                     "map_wireframemask_line_thickness",
                                     "map_wireframemask_use_invert",
+
+                                    "out_use_denoise",
+                                    "out_file_format",
+                                    "out_tga_use_raw",
+                                    "out_dpx_use_log",
+                                    "out_tiff_compression",
+                                    "out_exr_codec",
+                                    "out_compression",
+                                    "out_quality",
+                                    "out_res",
+                                    "out_res_height",
+                                    "out_res_width",
+                                    "out_margin",
+                                    "out_margin_type",
+                                    "out_bit_depth",
+                                    "out_use_alpha",
+                                    "out_use_transbg",
+                                    "out_udim_start_tile",
+                                    "out_udim_end_tile",
+                                    "out_super_sampling_aa",
+                                    "out_upscaling",
+                                    "out_samples",
+                                    "out_use_adaptive_sampling",
+                                    "out_adaptive_threshold",
+                                    "out_min_samples",
+
+                                    "uv_bake_data",
+                                    "uv_bake_target",
+                                    # "uv_active_layer",
+                                    "uv_type",
+                                    "uv_snap_islands_to_pixels",
+
+                                    "hl_cage_type",
+                                    "hl_cage_extrusion",
+                                    "hl_max_ray_distance",
                                 }
                                 for key in map_data:
                                     self.preset_values.append("bm_item.global_maps[%d].%s" % (map_index, key))
@@ -596,7 +633,6 @@ class BM_OT_FULL_OBJECT_Preset_Add(BM_AddPresetBase, bpy.types.Operator):
         "bm_item.decal_upper_coordinate",
         "bm_item.decal_boundary_offset",
 
-        # "bm_item.hl_use_unique_per_map",
         # "bm_item.hl_highpoly_table",
         "bm_item.hl_decals_use_separate_texset",
         "bm_item.hl_decals_separate_texset_prefix",
@@ -605,6 +641,7 @@ class BM_OT_FULL_OBJECT_Preset_Add(BM_AddPresetBase, bpy.types.Operator):
         "bm_item.hl_cage_extrusion",
         "bm_item.hl_max_ray_distance",
         # "bm_item.hl_cage",
+        "bm_item.hl_use_unique_per_map",
 
         "bm_item.uv_bake_data",
         "bm_item.uv_bake_target",
@@ -648,6 +685,7 @@ class BM_OT_FULL_OBJECT_Preset_Add(BM_AddPresetBase, bpy.types.Operator):
         "bm_item.out_udim_start_tile",
         "bm_item.out_udim_end_tile",
         "bm_item.out_super_sampling_aa",
+        "bm_item.out_upscaling",
         "bm_item.out_samples",
         "bm_item.out_use_adaptive_sampling",
         "bm_item.out_adaptive_threshold",
@@ -687,7 +725,6 @@ class BM_OT_OBJECT_Preset_Add(BM_AddPresetBase, bpy.types.Operator):
         "bm_item.decal_upper_coordinate",
         "bm_item.decal_boundary_offset",
 
-        # "bm_item.hl_use_unique_per_map",
         # "bm_item.hl_highpoly_table",
         "bm_item.hl_decals_use_separate_texset",
         "bm_item.hl_decals_separate_texset_prefix",
@@ -696,11 +733,12 @@ class BM_OT_OBJECT_Preset_Add(BM_AddPresetBase, bpy.types.Operator):
         "bm_item.hl_cage_extrusion",
         "bm_item.hl_max_ray_distance",
         # "bm_item.hl_cage",
+        "bm_item.hl_use_unique_per_map",
 
         "bm_item.uv_bake_data",
         "bm_item.uv_bake_target",
         # "bm_item.uv_active_layer",
-        # "bm_item.uv_type",
+        "bm_item.uv_type",
         "bm_item.uv_snap_islands_to_pixels",
         "bm_item.uv_use_auto_unwrap",
         "bm_item.uv_auto_unwrap_angle_limit",
@@ -854,6 +892,7 @@ class BM_OT_OUT_Preset_Add(BM_AddPresetBase, bpy.types.Operator):
         "bm_map.out_udim_start_tile",
         "bm_map.out_udim_end_tile",
         "bm_map.out_super_sampling_aa",
+        "bm_map.out_upscaling",
         "bm_map.out_samples",
         "bm_map.out_use_adaptive_sampling",
         "bm_map.out_adaptive_threshold",
@@ -1425,7 +1464,7 @@ class BM_OT_ExecutePreset(bpy.types.Operator):
     """Execute BakeMaster preset"""
     bl_idname = "bakemaster.execute_preset_bakemaster"
     bl_label = "Load BakeMaster Preset"
-    bl_options = {'INTERNAL', 'REGISTER', 'UNDO'}
+    bl_options = {'INTERNAL', 'UNDO'}
 
     filepath: bpy.props.StringProperty(
         subtype='FILE_PATH',

diff --git a/properties.py b/properties.py
@@ -1,6 +1,6 @@
 # ##### BEGIN LICENSE BLOCK #####
 #
-# "BakeMaster" Blender Add-on (version 2.5.1)
+# "BakeMaster" Blender Add-on (version 2.5.2)
 # Copyright (C) 2023 Kiril Strezikozin aka kemplerart
 #
 # This License permits you to use this software for any purpose including
@@ -896,6 +896,17 @@ class BM_Map(bpy.types.PropertyGroup):
                ('16', "16x16", "Bake at 16x the chosen resolution and then downscale")],
         update=BM_MAP_PROPS_out_super_sampling_aa_Update)
 
+    out_upscaling : bpy.props.EnumProperty(
+        name="Upscaling",
+        description="Upscaling factor. Bake at a lower resolution and upscale image resolution by the chosen factor after. Results in decreased baked time to get a higher resolution, but be aware that blurring might appear",
+        default='1',
+        items=[('1', "1x1", "No upscaling. Bake and save with chosen resolution"),
+               ('2', "2x2", "Bake at the chosen resolution and then upscale by 2x"),
+               ('4', "4x4", "Bake at the chosen resolution and then upscale by 4x"),
+               ('8', "8x8", "Bake at the chosen resolution and then upscale by 8x"),
+               ('16', "16x16", "Bake at the chosen resolution and then upscale by 16x")],
+        update=BM_MAP_PROPS_out_upscaling_Update)
+
     out_samples : bpy.props.IntProperty(
         name="Bake Samples",
         description="Number of samples to render per each pixel",
@@ -2748,6 +2759,17 @@ class BM_Object(bpy.types.PropertyGroup):
                ('16', "16x16", "Bake at 16x the chosen resolution and then downscale")],
         update=BM_ITEM_PROPS_out_super_sampling_aa_Update)
 
+    out_upscaling : bpy.props.EnumProperty(
+        name="Upscaling",
+        description="Upscaling factor. Bake at a lower resolution and upscale image resolution by the chosen factor after. Results in decreased baked time to get a higher resolution, but be aware that blurring might appear",
+        default='1',
+        items=[('1', "1x1", "No upscaling. Bake and save with chosen resolution"),
+               ('2', "2x2", "Bake at the chosen resolution and then upscale by 2x"),
+               ('4', "4x4", "Bake at the chosen resolution and then upscale by 4x"),
+               ('8', "8x8", "Bake at the chosen resolution and then upscale by 8x"),
+               ('16', "16x16", "Bake at the chosen resolution and then upscale by 16x")],
+        update=BM_ITEM_PROPS_out_upscaling_Update)
+
     out_samples : bpy.props.IntProperty(
         name="Bake Samples",
         description="Number of samples to render per each pixel",

diff --git a/ui_panel.py b/ui_panel.py
@@ -1,6 +1,6 @@
 # ##### BEGIN LICENSE BLOCK #####
 #
-# "BakeMaster" Blender Add-on (version 2.5.1)
+# "BakeMaster" Blender Add-on (version 2.5.2)
 # Copyright (C) 2023 Kiril Strezikozin aka kemplerart
 #
 # This License permits you to use this software for any purpose including

diff --git a/ui_panel_base.py b/ui_panel_base.py
@@ -1,6 +1,6 @@
 # ##### BEGIN LICENSE BLOCK #####
 #
-# "BakeMaster" Blender Add-on (version 2.5.1)
+# "BakeMaster" Blender Add-on (version 2.5.2)
 # Copyright (C) 2023 Kiril Strezikozin aka kemplerart
 #
 # This License permits you to use this software for any purpose including
@@ -978,9 +978,13 @@ def draw(self, context):
                         format_box_column = format_box.column(align=True)
                         format_box_column.prop(format_prop_collection, 'out_udim_start_tile', text="Start Tile")
                         format_box_column.prop(format_prop_collection, 'out_udim_end_tile', text="End Tile")
-                    format_box_ssaa_row = format_box.row(align=True)
+                    format_box_scalecol = format_box.column(align=True)
+                    format_box_ssaa_row = format_box_scalecol.row(align=True)
                     format_box_ssaa_row.prop(format_prop_collection, 'out_super_sampling_aa')
                     format_box_ssaa_row.active = format_prop_collection.out_super_sampling_aa != '1'
+                    format_box_upscale_row = format_box_scalecol.row(align=True)
+                    format_box_upscale_row.prop(format_prop_collection, 'out_upscaling')
+                    format_box_upscale_row.active = format_prop_collection.out_upscaling != '1'
                     format_box_column = format_box.column(align=True)
                     format_box_column.prop(format_prop_collection, 'out_use_adaptive_sampling')
                     if format_prop_collection.out_use_adaptive_sampling: