From ee39edf1f668308315485cc595265b8a94277c7b Mon Sep 17 00:00:00 2001 From: KirilStrezikozin Date: Wed, 21 Feb 2024 12:02:58 +0200 Subject: [PATCH 1/5] (all) update: bump version to 2.6.1 --- LICENSE | 2 +- __init__.py | 4 ++-- build_files/utils/make_build_archive.py | 2 +- decal.py | 2 +- docs/conf.py | 4 ++-- labels.py | 2 +- operator_bake.py | 2 +- operators.py | 2 +- presets.py | 2 +- properties.py | 2 +- shader.py | 2 +- tools/update_license.py | 2 +- ui_panel.py | 2 +- ui_panel_base.py | 2 +- utils.py | 2 +- 15 files changed, 17 insertions(+), 17 deletions(-) diff --git a/LICENSE b/LICENSE index 83f748a..bba52ae 100644 --- a/LICENSE +++ b/LICENSE @@ -1,7 +1,7 @@ # BEGIN LICENSE & COPYRIGHT BLOCK. # # Copyright (C) 2022-2024 Kiril Strezikozin -# BakeMaster Blender Add-on (version 2.6.0) +# BakeMaster Blender Add-on (version 2.6.1) # # This file is a part of BakeMaster Blender Add-on, a plugin for texture # baking in open-source Blender 3d modelling software. diff --git a/__init__.py b/__init__.py index d5efff1..d859066 100644 --- a/__init__.py +++ b/__init__.py @@ -1,7 +1,7 @@ # BEGIN LICENSE & COPYRIGHT BLOCK. # # Copyright (C) 2022-2024 Kiril Strezikozin -# BakeMaster Blender Add-on (version 2.6.0) +# BakeMaster Blender Add-on (version 2.6.1) # # 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, 0), + "version": (2, 6, 1), "blender": (2, 83, 0), "location": "View3D > Sidebar > BakeMaster", "warning": "", diff --git a/build_files/utils/make_build_archive.py b/build_files/utils/make_build_archive.py index 97b1e54..607c825 100755 --- a/build_files/utils/make_build_archive.py +++ b/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.0) +# BakeMaster Blender Add-on (version 2.6.1) # # This file is a part of BakeMaster Blender Add-on, a plugin for texture # baking in open-source Blender 3d modelling software. diff --git a/decal.py b/decal.py index dea6ccd..92ecaac 100644 --- a/decal.py +++ b/decal.py @@ -1,7 +1,7 @@ # BEGIN LICENSE & COPYRIGHT BLOCK. # # Copyright (C) 2022-2024 Kiril Strezikozin -# BakeMaster Blender Add-on (version 2.6.0) +# BakeMaster Blender Add-on (version 2.6.1) # # This file is a part of BakeMaster Blender Add-on, a plugin for texture # baking in open-source Blender 3d modelling software. diff --git a/docs/conf.py b/docs/conf.py index 0070d67..ee1ba83 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -16,7 +16,7 @@ # -- Local Varibles ---------------------------------------------------------- -bakemaster_version = '2.6.0' +bakemaster_version = '2.6.1' # -- Project information ----------------------------------------------------- @@ -24,7 +24,7 @@ copyright = ': 2022-2024, Kiril Strezikozin' author = 'kemplerart' version = bakemaster_version -branch = "release-2.6.0" +branch = "release-2.6.1" # The full version, including alpha/beta/rc tags release = bakemaster_version diff --git a/labels.py b/labels.py index de54c21..7a77edb 100644 --- a/labels.py +++ b/labels.py @@ -1,7 +1,7 @@ # BEGIN LICENSE & COPYRIGHT BLOCK. # # Copyright (C) 2022-2024 Kiril Strezikozin -# BakeMaster Blender Add-on (version 2.6.0) +# BakeMaster Blender Add-on (version 2.6.1) # # This file is a part of BakeMaster Blender Add-on, a plugin for texture # baking in open-source Blender 3d modelling software. diff --git a/operator_bake.py b/operator_bake.py index 2cb3dcc..98e4d99 100644 --- a/operator_bake.py +++ b/operator_bake.py @@ -1,7 +1,7 @@ # BEGIN LICENSE & COPYRIGHT BLOCK. # # Copyright (C) 2022-2024 Kiril Strezikozin -# BakeMaster Blender Add-on (version 2.6.0) +# BakeMaster Blender Add-on (version 2.6.1) # # This file is a part of BakeMaster Blender Add-on, a plugin for texture # baking in open-source Blender 3d modelling software. diff --git a/operators.py b/operators.py index 25a9edb..7ab11ee 100644 --- a/operators.py +++ b/operators.py @@ -1,7 +1,7 @@ # BEGIN LICENSE & COPYRIGHT BLOCK. # # Copyright (C) 2022-2024 Kiril Strezikozin -# BakeMaster Blender Add-on (version 2.6.0) +# BakeMaster Blender Add-on (version 2.6.1) # # This file is a part of BakeMaster Blender Add-on, a plugin for texture # baking in open-source Blender 3d modelling software. diff --git a/presets.py b/presets.py index e9adde8..0b3b546 100644 --- a/presets.py +++ b/presets.py @@ -1,7 +1,7 @@ # BEGIN LICENSE & COPYRIGHT BLOCK. # # Copyright (C) 2022-2024 Kiril Strezikozin -# BakeMaster Blender Add-on (version 2.6.0) +# BakeMaster Blender Add-on (version 2.6.1) # # This file is a part of BakeMaster Blender Add-on, a plugin for texture # baking in open-source Blender 3d modelling software. diff --git a/properties.py b/properties.py index 07987ec..a5685c5 100644 --- a/properties.py +++ b/properties.py @@ -1,7 +1,7 @@ # BEGIN LICENSE & COPYRIGHT BLOCK. # # Copyright (C) 2022-2024 Kiril Strezikozin -# BakeMaster Blender Add-on (version 2.6.0) +# BakeMaster Blender Add-on (version 2.6.1) # # This file is a part of BakeMaster Blender Add-on, a plugin for texture # baking in open-source Blender 3d modelling software. diff --git a/shader.py b/shader.py index 0ff3bdf..4e9f19a 100644 --- a/shader.py +++ b/shader.py @@ -1,7 +1,7 @@ # BEGIN LICENSE & COPYRIGHT BLOCK. # # Copyright (C) 2022-2024 Kiril Strezikozin -# BakeMaster Blender Add-on (version 2.6.0) +# BakeMaster Blender Add-on (version 2.6.1) # # This file is a part of BakeMaster Blender Add-on, a plugin for texture # baking in open-source Blender 3d modelling software. diff --git a/tools/update_license.py b/tools/update_license.py index 53cb8d3..547526a 100755 --- a/tools/update_license.py +++ b/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.0) +# BakeMaster Blender Add-on (version 2.6.1) # # This file is a part of BakeMaster Blender Add-on, a plugin for texture # baking in open-source Blender 3d modelling software. diff --git a/ui_panel.py b/ui_panel.py index 3b3fe73..d31db45 100644 --- a/ui_panel.py +++ b/ui_panel.py @@ -1,7 +1,7 @@ # BEGIN LICENSE & COPYRIGHT BLOCK. # # Copyright (C) 2022-2024 Kiril Strezikozin -# BakeMaster Blender Add-on (version 2.6.0) +# BakeMaster Blender Add-on (version 2.6.1) # # This file is a part of BakeMaster Blender Add-on, a plugin for texture # baking in open-source Blender 3d modelling software. diff --git a/ui_panel_base.py b/ui_panel_base.py index ac48809..3670c43 100644 --- a/ui_panel_base.py +++ b/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.0) +# BakeMaster Blender Add-on (version 2.6.1) # # This file is a part of BakeMaster Blender Add-on, a plugin for texture # baking in open-source Blender 3d modelling software. diff --git a/utils.py b/utils.py index cad1bc3..fdbb00b 100644 --- a/utils.py +++ b/utils.py @@ -1,7 +1,7 @@ # BEGIN LICENSE & COPYRIGHT BLOCK. # # Copyright (C) 2022-2024 Kiril Strezikozin -# BakeMaster Blender Add-on (version 2.6.0) +# BakeMaster Blender Add-on (version 2.6.1) # # This file is a part of BakeMaster Blender Add-on, a plugin for texture # baking in open-source Blender 3d modelling software. From 187348efa356b90adff0e48fcdd21174b75a145e Mon Sep 17 00:00:00 2001 From: KirilStrezikozin Date: Fri, 23 Feb 2024 13:26:49 +0200 Subject: [PATCH 2/5] (ui, props, utils) migrate: #75 from dev --- README.md | 4 ++-- labels.py | 2 +- presets.py | 3 +++ properties.py | 6 ++++++ ui_panel_base.py | 5 ++++- utils.py | 9 ++++++++- 6 files changed, 24 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 18e5f30..524f2f9 100644 --- a/README.md +++ b/README.md @@ -4,14 +4,14 @@

Welcome to
- BakeMaster 2.6.0 Blender Add-on + BakeMaster 2.6.1 Blender Add-on

BakeMaster is an add-on specified for baking various texture maps
and created for Blender - open-source 3D Computer graphics software.
Along with its intuitive and convenient workflow baking process becomes a pleasure.
Created from scratch for users who can't stand wasting time,
and yearn for most functionality and cutting-edge features. - + Documentation Status diff --git a/labels.py b/labels.py index 7a77edb..4645b88 100644 --- a/labels.py +++ b/labels.py @@ -72,7 +72,7 @@ class BM_Labels: # URLs # different documentation versions may have different pages setup - __addon_version__ = "2.6.0" + __addon_version__ = "2.6.1" 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/presets.py b/presets.py index 0b3b546..9f71a61 100644 --- a/presets.py +++ b/presets.py @@ -641,6 +641,7 @@ class BM_OT_FULL_OBJECT_Preset_Add(BM_AddPresetBase, bpy.types.Operator): "bm_item.decal_use_flip_horizontal", "bm_item.decal_use_adapt_res", "bm_item.decal_use_precise_bounds", + "bm_item.decal_use_scene_lights", "bm_item.decal_boundary_offset", # "bm_item.hl_highpoly_table", @@ -738,6 +739,7 @@ class BM_OT_OBJECT_Preset_Add(BM_AddPresetBase, bpy.types.Operator): "bm_item.decal_use_flip_horizontal", "bm_item.decal_use_adapt_res", "bm_item.decal_use_precise_bounds", + "bm_item.decal_use_scene_lights", "bm_item.decal_boundary_offset", # "bm_item.hl_highpoly_table", @@ -796,6 +798,7 @@ class BM_OT_DECAL_Preset_Add(BM_AddPresetBase, bpy.types.Operator): "bm_item.decal_use_flip_horizontal", "bm_item.decal_use_adapt_res", "bm_item.decal_use_precise_bounds", + "bm_item.decal_use_scene_lights", "bm_item.decal_boundary_offset", ] diff --git a/properties.py b/properties.py index a5685c5..f5969d6 100644 --- a/properties.py +++ b/properties.py @@ -2517,6 +2517,12 @@ class BM_Object(bpy.types.PropertyGroup): default=False, update=BM_ITEM_PROPS_decal_use_precise_bounds_Update) + decal_use_scene_lights: bpy.props.BoolProperty( + name="Scene Lights", + description="Use scene lighting and world lighting configured in world surface shading to bake this decal object", + default=False, + update=BM_ITEM_PROPS_decal_use_scene_lights_Update) + decal_use_adapt_res: bpy.props.BoolProperty( name="Adapt aspect ratio", description="Adapt output map resolution to match the aspect ration of decal's dimensions", diff --git a/ui_panel_base.py b/ui_panel_base.py index 3670c43..6cda436 100644 --- a/ui_panel_base.py +++ b/ui_panel_base.py @@ -541,7 +541,7 @@ def invoke(self, context, event): class BM_PT_MainBase(bpy.types.Panel): - bl_label = "BakeMaster v2.6.0" + bl_label = "BakeMaster v2.6.1" bl_idname = 'BM_PT_Main' def draw(self, context): @@ -786,6 +786,9 @@ def draw(self, context): scene.bm_props.global_active_index) or object.decal_use_precise_bounds) + col = d_col.column() + col.prop(object, 'decal_use_scene_lights') + if object.nm_uni_container_is_global is False or not draw_all: oti = BM_OT_DECAL_View.is_running_for( object.global_object_name) diff --git a/utils.py b/utils.py index fdbb00b..d47d7ce 100644 --- a/utils.py +++ b/utils.py @@ -666,6 +666,7 @@ def BM_ITEM_PROPS_nm_uni_container_is_global_Update(self, context): 'decal_use_flip_horizontal': self.decal_use_flip_horizontal, 'decal_use_adapt_res': self.decal_use_adapt_res, 'decal_use_precise_bounds': self.decal_use_precise_bounds, + 'decal_use_scene_lights': self.decal_use_scene_lights, 'decal_boundary_offset': self.decal_boundary_offset, 'hl_decals_use_separate_texset': self.hl_decals_use_separate_texset, 'hl_decals_separate_texset_prefix': self.hl_decals_separate_texset_prefix, @@ -6126,11 +6127,17 @@ def BM_ITEM_PROPS_decal_use_adapt_res_Update(self, context): def BM_ITEM_PROPS_decal_use_precise_bounds_Update(self, context): - name = "Object Decal: Adapt resolution" + name = "Object Decal: Precise bounds" BM_LastEditedProp_Write(context, name, "decal_use_precise_bounds", getattr( self, "decal_use_precise_bounds"), False) +def BM_ITEM_PROPS_decal_use_scene_lights_Update(self, context): + name = "Object Decal: Scene lights" + BM_LastEditedProp_Write(context, name, "decal_use_scene_lights", getattr( + self, "decal_use_scene_lights"), False) + + def BM_ITEM_PROPS_decal_boundary_offset_Update(self, context): name = "Object Decal: Boundary offset" BM_LastEditedProp_Write(context, name, "decal_boundary_offset", getattr( From 6b7aee6f0ca5cef1fd289ea91caf5ece2d64a7fd Mon Sep 17 00:00:00 2001 From: KirilStrezikozin Date: Fri, 23 Feb 2024 13:33:41 +0200 Subject: [PATCH 3/5] (docs) add: release 2.6.1 changelock for #75 --- docs/conf.py | 2 +- docs/pages/more/releases.rst | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/docs/conf.py b/docs/conf.py index ee1ba83..9318309 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -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 = '15/02/2024' +html_last_updated_fmt = '23/02/2024' # If true, the reST sources are included in the HTML build as _sources/name. html_copy_source = True diff --git a/docs/pages/more/releases.rst b/docs/pages/more/releases.rst index 38a0c4f..5d62f94 100644 --- a/docs/pages/more/releases.rst +++ b/docs/pages/more/releases.rst @@ -7,6 +7,18 @@ 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.1 Release +============= + +.. admonition:: Tag + :class: important + + `2.6.1 - February 23rd, 2024 `__ + +**New Features:** + +#. **A toggle to use Scene & World lighting to bake Decal objects** (`issue75 `__). + 2.6.0 Release ============= From 6c98435c7eab61d30dc9a742936105043184ac3e Mon Sep 17 00:00:00 2001 From: KirilStrezikozin Date: Sat, 24 Feb 2024 12:40:41 +0200 Subject: [PATCH 4/5] (ots, utils) fix(migrate from dev): sc not defined in create bake job group, report_msg mess --- operators.py | 21 +++++---------------- utils.py | 8 +++++--- 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/operators.py b/operators.py index 7ab11ee..7500fd2 100644 --- a/operators.py +++ b/operators.py @@ -1748,6 +1748,7 @@ class BM_OT_CreateArtificialUniContainer(bpy.types.Operator): bl_options = {'UNDO'} def execute(self, context): + sc = context.scene bm_props = context.scene.bm_props if bm_props.global_use_name_matching is False: @@ -2057,36 +2058,24 @@ class BM_OT_ReportMessage(bpy.types.Operator): bl_label = "BakeMaster Message" bl_idname = "bakemaster.report_message" bl_options = {'INTERNAL'} - - message_type : bpy.props.StringProperty( + + message_type: bpy.props.StringProperty( name="Type", description="Type of the Report Message", default="INFO", options={'SKIP_SAVE'}) - message : bpy.props.StringProperty( + message: bpy.props.StringProperty( name="Message", description="Text of the Report Message", default="Message not specified", options={'SKIP_SAVE'}) - @classmethod - def report_message(cls, message_type, message): - cls.report({message_type}, message) - def execute(self, context): self.report({self.message_type}, self.message) return {'FINISHED'} - def draw(self, context): - self.layout.label(text=self.message_type.capitilize()) - try: - self.layout.label(text=self.message, icon=self.message_type) - except TypeError: - self.layout.label(text=self.message) - def invoke(self, context, event): - wm = context.window_manager - return wm.invoke_props_dialog(self, width=300) + return self.execute(context) class BM_OT_Help(bpy.types.Operator): bl_label = "BakeMaster Help Source" diff --git a/utils.py b/utils.py index d47d7ce..d31f376 100644 --- a/utils.py +++ b/utils.py @@ -4133,7 +4133,7 @@ def BM_MAP_PROPS_MapPreview_CustomNodes_Add(self, context, map_tag): if context.scene.render.engine != 'CYCLES': bpy.ops.bakemaster.report_message( - message_type='INFO', + 'INVOKE_DEFAULT', message_type='INFO', message=BM_Labels.INFO_MAP_PREVIEWNOTCYCLES) material.node_tree.nodes['BM_OutputMaterial'].select = True @@ -4220,7 +4220,8 @@ def get_socket_default_color_value(socket, socket_name): for object in objects: if len(object.data.materials) == 0: bpy.ops.bakemaster.report_message( - message_type='WARNING', message="%s: No Materials" % object.name) + 'INVOKE_DEFAULT', message_type='WARNING', + message="%s: No Materials" % object.name) continue for material in object.data.materials: @@ -4382,7 +4383,8 @@ def get_socket_default_color_value(socket, socket_name): if context.scene.render.engine != 'CYCLES': bpy.ops.bakemaster.report_message( - message_type='INFO', message=BM_Labels.INFO_MAP_PREVIEWNOTCYCLES) + 'INVOKE_DEFAULT', message_type='INFO', + message=BM_Labels.INFO_MAP_PREVIEWNOTCYCLES) nodes['BM_OutputMaterial'].target = 'CYCLES' nodes['BM_OutputMaterial'].select = True From 2ba1b701a6ae3089dd284211cd05a628a9cdbf32 Mon Sep 17 00:00:00 2001 From: KirilStrezikozin Date: Sat, 24 Feb 2024 12:45:27 +0200 Subject: [PATCH 5/5] (docs) add: latest fix for 2.6.1. update: date --- docs/conf.py | 2 +- docs/pages/more/releases.rst | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index 9318309..c09bdbc 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -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 = '23/02/2024' +html_last_updated_fmt = '24/02/2024' # If true, the reST sources are included in the HTML build as _sources/name. html_copy_source = True diff --git a/docs/pages/more/releases.rst b/docs/pages/more/releases.rst index 5d62f94..81abf05 100644 --- a/docs/pages/more/releases.rst +++ b/docs/pages/more/releases.rst @@ -13,7 +13,11 @@ All BakeMaster Releases and Changelogs are listed on this page. Each new release .. admonition:: Tag :class: important - `2.6.1 - February 23rd, 2024 `__ + `2.6.1 - February 24th, 2024 `__ + +**Fixes:** + +#. Create Bake Job Group could not proceed. **New Features:**