MR: release-2.6.2 -> master

Merge pull request #89 from KirilStrezikozin/release-2.6.2

LICENSE

@@ -1,7 +1,7 @@
 # BEGIN LICENSE & COPYRIGHT BLOCK.
 #
 # Copyright (C) 2022-2024 Kiril Strezikozin
-# BakeMaster Blender Add-on (version 2.6.1)
+# BakeMaster Blender Add-on (version 2.6.2)
 #
 # This file is a part of BakeMaster Blender Add-on, a plugin for texture
 # baking in open-source Blender 3d modelling software.

README.md

@@ -4,14 +4,14 @@
 <h1 id="page-top">
     <a href="#page-top">
         Welcome to <br />
-        BakeMaster 2.6.1 Blender Add-on
+        BakeMaster 2.6.2 Blender Add-on
     </a>
 </h1>
 
 <!-- Intro -->
 BakeMaster is an add-on specified for baking various texture maps <br/>and created for Blender - 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.6.1/'>
+<a href='https://bakemaster-blender-addon.readthedocs.io/en/2.6.2/'>
     <img src='https://readthedocs.org/projects/bakemaster-blender-addon/badge/?version=latest' alt='Documentation Status' />
 </a>
 

__init__.py

@@ -1,7 +1,7 @@
 # BEGIN LICENSE & COPYRIGHT BLOCK.
 #
 # Copyright (C) 2022-2024 Kiril Strezikozin
-# BakeMaster Blender Add-on (version 2.6.1)
+# BakeMaster Blender Add-on (version 2.6.2)
 #
 # This file is a part of BakeMaster Blender Add-on, a plugin for texture
 # baking in open-source Blender 3d modelling software.
@@ -38,7 +38,7 @@
     "description": "Bake various PBR, Masks, and Cycles maps with ease and "
                    "comfort",
     "author": "Kiril Strezikozin (aka kemplerart)",
-    "version": (2, 6, 1),
+    "version": (2, 6, 2),
     "blender": (2, 83, 0),
     "location": "View3D > Sidebar > BakeMaster",
     "warning": "",

build_files/utils/make_build_archive.py

@@ -2,7 +2,7 @@
 # BEGIN LICENSE & COPYRIGHT BLOCK.
 #
 # Copyright (C) 2022-2024 Kiril Strezikozin
-# BakeMaster Blender Add-on (version 2.6.1)
+# BakeMaster Blender Add-on (version 2.6.2)
 #
 # This file is a part of BakeMaster Blender Add-on, a plugin for texture
 # baking in open-source Blender 3d modelling software.

decal.py

@@ -1,7 +1,7 @@
 # BEGIN LICENSE & COPYRIGHT BLOCK.
 #
 # Copyright (C) 2022-2024 Kiril Strezikozin
-# BakeMaster Blender Add-on (version 2.6.1)
+# BakeMaster Blender Add-on (version 2.6.2)
 #
 # This file is a part of BakeMaster Blender Add-on, a plugin for texture
 # baking in open-source Blender 3d modelling software.

docs/conf.py

@@ -24,7 +24,7 @@
 copyright = ': 2022-2024, Kiril Strezikozin'
 author = 'kemplerart'
 version = bakemaster_version
-branch = "release-2.6.1"
+branch = "release-2.6.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 = '24/02/2024'
+html_last_updated_fmt = '17/03/2024'
 
 # If true, the reST sources are included in the HTML build as _sources/name.
 html_copy_source = True

docs/pages/more/releases.rst

@@ -7,6 +7,28 @@ 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.6.2 Release
+=============
+
+.. admonition:: Tag
+    :class: important
+
+    `2.6.2 - March 17th, 2024 <https://github.com/KirilStrezikozin/BakeMaster-Blender-Addon/releases>`__
+
+**Fixes:**
+
+#. **Multires bakes accidentally read wrong bake settings** (`issue81 <https://github.com/KirilStrezikozin/BakeMaster-Blender-Addon/issues/81>`__).
+#. Snap UV to pixels doesn't work (res_x undefined) (`issue83 <https://github.com/KirilStrezikozin/BakeMaster-Blender-Addon/issues/83>`__).
+
+**New Features:**
+
+#. Toggle hide/not hide ShaderNodes in baked materials (`issue84 <https://github.com/KirilStrezikozin/BakeMaster-Blender-Addon/issues/84>`__).
+#. ``$materialname`` **keyword for batch name** (`issue86 <https://github.com/KirilStrezikozin/BakeMaster-Blender-Addon/issues/86>`__).
+
+**Changes:**
+
+#. ``$mapname`` defaults to channel pack when map is in one (`issue87 <https://github.com/KirilStrezikozin/BakeMaster-Blender-Addon/issues/87>`__).
+
 2.6.1 Release
 =============
 

docs/pages/setup/compatibility.rst

@@ -21,5 +21,6 @@ BakeMaster is compatible with the following Blender versions:
 * ``Blender 3.4``
 * ``Blender 3.5``
 * ``Blender 3.6``
+* ``Blender 4.0``
 
 Using the addon on versions higher than specified may cause errors. If you face any compatibility errors, please `inform <../more/connect.html>`__.

labels.py

@@ -1,7 +1,7 @@
 # BEGIN LICENSE & COPYRIGHT BLOCK.
 #
 # Copyright (C) 2022-2024 Kiril Strezikozin
-# BakeMaster Blender Add-on (version 2.6.1)
+# BakeMaster Blender Add-on (version 2.6.2)
 #
 # This file is a part of BakeMaster Blender Add-on, a plugin for texture
 # baking in open-source Blender 3d modelling software.
@@ -68,11 +68,11 @@ class BM_Labels:
     PROP_ITEM_MAP_USESTT_NAME = "Affect this map by source-target settings configured in the item settings above.\nThis option won't be shown unless source-target settings are configured, or when baking smooth normals"
     PROP_ITEM_MAP_USEPREVIEW_DESCRIPTION = "Preview texture map in the viewport (Cycles only).\nIf current item's mesh has got no materials, a new one will be added.\nFor each item's mesh materials, custom nodes will be added to preview the map in the Rendered View.\nAfter disabling the preview, all those nodes will be removed without affecting original material(s)"
 
-    PROP_ITEM_bake_batchname_custom_Description = "Write keywords starting with $, any additional text can be added:\n\n$objectindex - Object index\n$objectname - Object name\n$containername - Container name if Object is in it\n$packname - Channel Pack name if map is in Channel Pack\n$texsetname - Texture Set chosen name type if Object is in it\n$mapindex - Map index\n$mapname - Map prefix\n$mapres - Map Resolution\n$mapbit - _32bit_ if map uses 32bit Float, else _8bit_\n$maptrans - _trans_ if map uses transparent bg\n$mapssaa - SSAA value used for the map\n$mapsamples - Number of map bake samples, max samples if Adaptive is used\n$mapdenoise - _denoised_ if map was denoised\n$mapnormal - For Normal map, write preset type\n$mapuv - Write UV Layer name used for baking map\n$engine - Write Bake Engine used for baking\n$autouv - _autouv_ if object was auto uv unwrapped\n\ntestbake1$objectname_$mapname_$mapdenoise_Final -> testbake1monsterhead_NM_denoised_Final"
+    PROP_ITEM_bake_batchname_custom_Description = "Write keywords starting with $, any additional text can be added:\n\n$objectindex - Object index\n$objectname - Object name\n$containername - Container name if object is in one\n$materialname/$matname - Name of the first object's material\n$packname - Channel Pack name if map is in one (Legacy, use $mapname)\n$texsetname - Texture Set naming if object is in one\n$mapindex - Map index\n$mapname - Map prefix or Channel Pack name if map is in one\n$mapres - Map Resolution\n$mapbit - Image bit depth used for baking a map\n$maptrans - _trans_ if map uses transparent bg\n$mapssaa - SSAA value used for the map\n$mapsamples - Number of map bake samples, max samples if Adaptive is used\n$mapdenoise - _denoised_ if map was denoised\n$mapnormal - For Normal map, write preset type\n$mapuv - UV Layer name used for baking a map\n$engine - Bake Engine used for baking\n$autouv - _autouv_ if object was auto uv unwrapped\n\ntestbake1$objectname_$mapname_$mapdenoise_Final -> testbake1monsterhead_NM_denoised_Final"
 
     # URLs
     # different documentation versions may have different pages setup
-    __addon_version__ = "2.6.1"
+    __addon_version__ = "2.6.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__

operator_bake.py

@@ -1,7 +1,7 @@
 # BEGIN LICENSE & COPYRIGHT BLOCK.
 #
 # Copyright (C) 2022-2024 Kiril Strezikozin
-# BakeMaster Blender Add-on (version 2.6.1)
+# BakeMaster Blender Add-on (version 2.6.2)
 #
 # This file is a part of BakeMaster Blender Add-on, a plugin for texture
 # baking in open-source Blender 3d modelling software.

operators.py

@@ -1,7 +1,7 @@
 # BEGIN LICENSE & COPYRIGHT BLOCK.
 #
 # Copyright (C) 2022-2024 Kiril Strezikozin
-# BakeMaster Blender Add-on (version 2.6.1)
+# BakeMaster Blender Add-on (version 2.6.2)
 #
 # This file is a part of BakeMaster Blender Add-on, a plugin for texture
 # baking in open-source Blender 3d modelling software.
@@ -1361,8 +1361,50 @@ class BM_OT_ITEM_BatchNaming_Preview(bpy.types.Operator):
     bl_options = {'INTERNAL'}
 
     def execute(self, context):
-        object = BM_Object_Get(None, context)[0]
-        preview = BM_ITEM_PROPS_bake_batchname_GetPreview(object, context)
+        sc = context.scene
+        g_index = sc.bm_props.global_active_index
+        container = BM_Object_Get(None, context)[0]
+
+        if not sc.bm_props.global_use_name_matching:
+            preview = BM_ITEM_PROPS_bake_batchname_GetPreview(
+                container, context, container)
+            self.report({'INFO'}, preview)
+            return {'FINISHED'}
+
+        if container.nm_is_universal_container:
+            bm_obj = None
+            for bm_obj_i in range(g_index + 1, len(sc.bm_table_of_objects), 1):
+                object = sc.bm_table_of_objects[bm_obj_i]
+                if (object.nm_item_uni_container_master_index == container.nm_master_index
+                        and not object.nm_is_local_container):
+                    bm_obj = sc.bm_table_of_objects[bm_obj_i]
+                    break
+
+            preview = BM_ITEM_PROPS_bake_batchname_GetPreview(
+                container, context, bm_obj)
+            self.report({'INFO'}, preview)
+            return {'FINISHED'}
+
+        # Name Matching is used, and container is a detached object
+        if container.nm_item_uni_container_master_index == -1:
+            preview = BM_ITEM_PROPS_bake_batchname_GetPreview(
+                container, context, container)
+            self.report({'INFO'}, preview)
+            return {'FINISHED'}
+
+        # Name Matching is used, and container is a child object
+        parent = None
+        for bm_obj_i in range(g_index - 1, -1, -1):
+            object = sc.bm_table_of_objects[bm_obj_i]
+            if not object.nm_is_universal_container:
+                continue
+            if (container.nm_item_uni_container_master_index == object.nm_master_index
+                    and object.nm_is_local_container is False):
+                parent = object
+                break
+
+        preview = BM_ITEM_PROPS_bake_batchname_GetPreview(
+            parent, context, container)  # Container is a child object
         self.report({'INFO'}, preview)
         return {'FINISHED'}
 

presets.py

@@ -1,7 +1,7 @@
 # BEGIN LICENSE & COPYRIGHT BLOCK.
 #
 # Copyright (C) 2022-2024 Kiril Strezikozin
-# BakeMaster Blender Add-on (version 2.6.1)
+# BakeMaster Blender Add-on (version 2.6.2)
 #
 # This file is a part of BakeMaster Blender Add-on, a plugin for texture
 # baking in open-source Blender 3d modelling software.

properties.py

@@ -1,7 +1,7 @@
 # BEGIN LICENSE & COPYRIGHT BLOCK.
 #
 # Copyright (C) 2022-2024 Kiril Strezikozin
-# BakeMaster Blender Add-on (version 2.6.1)
+# BakeMaster Blender Add-on (version 2.6.2)
 #
 # This file is a part of BakeMaster Blender Add-on, a plugin for texture
 # baking in open-source Blender 3d modelling software.
@@ -647,6 +647,11 @@ class BM_SceneProps(bpy.types.PropertyGroup):
         precision=3,
         subtype='COLOR')  # noqa: F405
 
+    global_use_collapse_nodes: bpy.props.BoolProperty(
+        name="Collapse Nodes",
+        description="Collapse added shader nodes in baked materials",
+        default=False)
+
 ##################################################
 ### MAP PROPS ###
 ##################################################

shader.py

@@ -1,7 +1,7 @@
 # BEGIN LICENSE & COPYRIGHT BLOCK.
 #
 # Copyright (C) 2022-2024 Kiril Strezikozin
-# BakeMaster Blender Add-on (version 2.6.1)
+# BakeMaster Blender Add-on (version 2.6.2)
 #
 # This file is a part of BakeMaster Blender Add-on, a plugin for texture
 # baking in open-source Blender 3d modelling software.

tools/update_license.py

@@ -2,7 +2,7 @@
 # BEGIN LICENSE & COPYRIGHT BLOCK.
 #
 # Copyright (C) 2022-2024 Kiril Strezikozin
-# BakeMaster Blender Add-on (version 2.6.1)
+# BakeMaster Blender Add-on (version 2.6.2)
 #
 # This file is a part of BakeMaster Blender Add-on, a plugin for texture
 # baking in open-source Blender 3d modelling software.

ui_panel.py

@@ -1,7 +1,7 @@
 # BEGIN LICENSE & COPYRIGHT BLOCK.
 #
 # Copyright (C) 2022-2024 Kiril Strezikozin
-# BakeMaster Blender Add-on (version 2.6.1)
+# BakeMaster Blender Add-on (version 2.6.2)
 #
 # This file is a part of BakeMaster Blender Add-on, a plugin for texture
 # baking in open-source Blender 3d modelling software.

ui_panel_base.py

@@ -1,7 +1,7 @@
 # BEGIN LICENSE & COPYRIGHT BLOCK.
 #
 # Copyright (C) 2022-2024 Kiril Strezikozin
-# BakeMaster Blender Add-on (version 2.6.1)
+# BakeMaster Blender Add-on (version 2.6.2)
 #
 # This file is a part of BakeMaster Blender Add-on, a plugin for texture
 # baking in open-source Blender 3d modelling software.
@@ -69,6 +69,16 @@ def draw(self, context):
         layout.prop(bm_props, 'global_cage_color_solid')
         layout.prop(bm_props, 'global_cage_color_wire')
 
+        if bpy.app.version >= (2, 90, 0):
+            col = self.layout.column(align=True, heading="Baked Materials")
+            col.prop(bm_props, 'global_use_collapse_nodes')
+        else:
+            layout = self.layout.column(align=True)
+            split = layout.split(factor=0.4)
+            split.row()
+            split.label(text="Baked Materials")
+            layout.prop(bm_props, 'global_use_collapse_nodes')
+
 
 class BM_ALEP_UL_Objects_Item(bpy.types.UIList):
     def draw_item(self, context, layout, data, item, active_data, active_propname, index):
@@ -541,7 +551,7 @@ def invoke(self, context, event):
 
 
 class BM_PT_MainBase(bpy.types.Panel):
-    bl_label = "BakeMaster v2.6.1"
+    bl_label = "BakeMaster v2.6.2"
     bl_idname = 'BM_PT_Main'
 
     def draw(self, context):
@@ -773,9 +783,16 @@ def draw(self, context):
 
                     d_col.prop(object, "decal_rotation")
 
-                col = d_col.column(align=True, heading="Flip")
-                col.prop(object, 'decal_use_flip_vertical')
-                col.prop(object, 'decal_use_flip_horizontal')
+                if bpy.app.version >= (2, 90, 0):
+                    col = d_col.column(align=True, heading="Flip")
+                    col.prop(object, 'decal_use_flip_vertical')
+                    col.prop(object, 'decal_use_flip_horizontal')
+                else:
+                    col = d_col.column(align=True)
+                    col.prop(object, 'decal_use_flip_vertical',
+                             text="Flip Vertically")
+                    col.prop(object, 'decal_use_flip_horizontal',
+                             text="Flip Horizontally")
 
                 col = d_col.column()
                 col.prop(object, 'decal_use_adapt_res')