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/README.md b/README.md
index 18e5f30..524f2f9 100644
--- a/README.md
+++ b/README.md
@@ -4,14 +4,14 @@
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.
-
+
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..c09bdbc 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
@@ -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 = '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 38a0c4f..81abf05 100644
--- a/docs/pages/more/releases.rst
+++ b/docs/pages/more/releases.rst
@@ -7,6 +7,22 @@ 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 24th, 2024 `__
+
+**Fixes:**
+
+#. Create Bake Job Group could not proceed.
+
+**New Features:**
+
+#. **A toggle to use Scene & World lighting to bake Decal objects** (`issue75 `__).
+
2.6.0 Release
=============
diff --git a/labels.py b/labels.py
index de54c21..4645b88 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.
@@ -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/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..7500fd2 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.
@@ -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/presets.py b/presets.py
index e9adde8..9f71a61 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.
@@ -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 07987ec..f5969d6 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.
@@ -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/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..6cda436 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.
@@ -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 cad1bc3..d31f376 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.
@@ -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,
@@ -4132,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
@@ -4219,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:
@@ -4381,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
@@ -6126,11 +6129,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(