[Bf-blender-cvs] [f31f7e3ef0b] master: Cleanup: Remove unused light_sample_is_light() function.

[Thomas Dinges]

Commit: f31f7e3ef0bd0a079182328eef5458fcef38f7b0
Author: Thomas Dinges
Date:   Fri Jan 20 17:36:48 2023 +0100
Branches: master
https://developer.blender.org/rBf31f7e3ef0bd0a079182328eef5458fcef38f7b0

Cleanup: Remove unused light_sample_is_light() function.

This also fixes compile warnings on MSVC.

===

M   intern/cycles/kernel/integrator/shade_surface.h
M   intern/cycles/kernel/integrator/shade_volume.h
M   intern/cycles/kernel/light/sample.h

===

diff --git a/intern/cycles/kernel/integrator/shade_surface.h 
b/intern/cycles/kernel/integrator/shade_surface.h
index 09433caa063..dbeb5f91ce7 100644
--- a/intern/cycles/kernel/integrator/shade_surface.h
+++ b/intern/cycles/kernel/integrator/shade_surface.h
@@ -235,8 +235,6 @@ ccl_device_forceinline void 
integrate_surface_direct_light(KernelGlobals kg,
 light_sample_to_surface_shadow_ray(kg, sd, , );
   }
 
-  const bool is_light = light_sample_is_light();
-
   /* Branch off shadow kernel. */
   IntegratorShadowState shadow_state = integrator_shadow_path_init(
   kg, state, DEVICE_KERNEL_INTEGRATOR_INTERSECT_SHADOW, false);
diff --git a/intern/cycles/kernel/integrator/shade_volume.h 
b/intern/cycles/kernel/integrator/shade_volume.h
index 98dc5603a78..5b460a2fe7a 100644
--- a/intern/cycles/kernel/integrator/shade_volume.h
+++ b/intern/cycles/kernel/integrator/shade_volume.h
@@ -821,7 +821,6 @@ ccl_device_forceinline void integrate_volume_direct_light(
   /* Create shadow ray. */
   Ray ray ccl_optional_struct_init;
   light_sample_to_volume_shadow_ray(kg, sd, , P, );
-  const bool is_light = light_sample_is_light();
 
   /* Branch off shadow kernel. */
   IntegratorShadowState shadow_state = integrator_shadow_path_init(
diff --git a/intern/cycles/kernel/light/sample.h 
b/intern/cycles/kernel/light/sample.h
index 423024c6b3d..f56ca19e968 100644
--- a/intern/cycles/kernel/light/sample.h
+++ b/intern/cycles/kernel/light/sample.h
@@ -88,13 +88,6 @@ light_sample_shader_eval(KernelGlobals kg,
   return eval;
 }
 
-/* Test if light sample is from a light or emission from geometry. */
-ccl_device_inline bool light_sample_is_light(ccl_private const LightSample 
*ccl_restrict ls)
-{
-  /* return if it's a lamp for shadow pass */
-  return (ls->prim == PRIM_NONE && ls->type != LIGHT_BACKGROUND);
-}
-
 /* Early path termination of shadow rays. */
 ccl_device_inline bool light_sample_terminate(KernelGlobals kg,
   ccl_private const LightSample 
*ccl_restrict ls,

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [c1d360f7fb8] master: Fix urls in LTS script.

[Thomas Dinges]

Commit: c1d360f7fb88ea842829d84c2bbf345e956f58ad
Author: Thomas Dinges
Date:   Wed Jan 18 10:38:01 2023 +0100
Branches: master
https://developer.blender.org/rBc1d360f7fb88ea842829d84c2bbf345e956f58ad

Fix urls in LTS script.

The urls were missing /release/, leading to 404 links on the LTS download page.

===

M   release/lts/create_download_urls.py

===

diff --git a/release/lts/create_download_urls.py 
b/release/lts/create_download_urls.py
index 753e05c98b4..c6b01acdf60 100755
--- a/release/lts/create_download_urls.py
+++ b/release/lts/create_download_urls.py
@@ -41,7 +41,7 @@ def get_download_url(version: Version, file_name: str) -> str:
 """
 Get the download url for the given version and file_name
 """
-return (f"https://www.blender.org/download/Blender{version.major};
+return (f"https://www.blender.org/download/release/Blender{version.major};
 f".{version.minor}/{file_name}")

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [6db644cca71] blender-v2.93-release: Update submodule hashes for 2.93.14 release.

[Thomas Dinges]

Commit: 6db644cca71831d053c7d1ec8898d03ee80ab2ee
Author: Thomas Dinges
Date:   Tue Jan 17 12:59:24 2023 +0100
Branches: blender-v2.93-release
https://developer.blender.org/rB6db644cca71831d053c7d1ec8898d03ee80ab2ee

Update submodule hashes for 2.93.14 release.

===

M   release/scripts/addons

===

diff --git a/release/scripts/addons b/release/scripts/addons
index f0dd4aaf880..f2d0c03fdad 16
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit f0dd4aaf8800ce48e589f8e35403d6aa687b16ed
+Subproject commit f2d0c03fdade9c484908451573b328bed325e81b

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [09febafb97b] blender-v3.3-release: Updating submodule hashes for 3.3.3 release.

[Thomas Dinges]

Commit: 09febafb97bab3baa09480d921327e4417b33371
Author: Thomas Dinges
Date:   Tue Jan 17 12:50:44 2023 +0100
Branches: blender-v3.3-release
https://developer.blender.org/rB09febafb97bab3baa09480d921327e4417b33371

Updating submodule hashes for 3.3.3 release.

===

M   release/scripts/addons

===

diff --git a/release/scripts/addons b/release/scripts/addons
index 1c1b05efd36..16ff2985ba3 16
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 1c1b05efd36bc245ea4d5292ca93e33dfa6447e8
+Subproject commit 16ff2985ba3fadb9ea31262dabd25c812b918b6e

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [5bbee76cff0] blender-v2.93-release: Bump to 2.93.13 immediately due to a regression in 2.93.12.

[Thomas Dinges]

Commit: 5bbee76cff0d5094303eb44304a49650f6c6ccd7
Author: Thomas Dinges
Date:   Tue Dec 20 20:35:23 2022 +0100
Branches: blender-v2.93-release
https://developer.blender.org/rB5bbee76cff0d5094303eb44304a49650f6c6ccd7

Bump to 2.93.13 immediately due to a regression in 2.93.12.

===

M   source/blender/blenkernel/BKE_blender_version.h

===

diff --git a/source/blender/blenkernel/BKE_blender_version.h 
b/source/blender/blenkernel/BKE_blender_version.h
index 5b38458c8ce..2c4e5bc12a3 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -33,7 +33,7 @@ extern "C" {
 /* Blender major and minor version. */
 #define BLENDER_VERSION 293
 /* Blender patch version for bugfix releases. */
-#define BLENDER_VERSION_PATCH 12
+#define BLENDER_VERSION_PATCH 13
 /** Blender release cycle stage: alpha/beta/rc/release. */
 #define BLENDER_VERSION_CYCLE release

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [90e4c8436d2] blender-v2.93-release: Updating submodule hash before tagging Blender 2.93.12

[Thomas Dinges]

Commit: 90e4c8436d24519e5f3a2dd11dac000be1bfcb5c
Author: Thomas Dinges
Date:   Tue Dec 20 11:41:27 2022 +0100
Branches: blender-v2.93-release
https://developer.blender.org/rB90e4c8436d24519e5f3a2dd11dac000be1bfcb5c

Updating submodule hash before tagging Blender 2.93.12

===

M   release/scripts/addons

===

diff --git a/release/scripts/addons b/release/scripts/addons
index ce25c08d472..f0dd4aaf880 16
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit ce25c08d472f9f7d295b1735b1b6c321a4fc2a13
+Subproject commit f0dd4aaf8800ce48e589f8e35403d6aa687b16ed

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [ef9ca44dee7] blender-v3.4-release: Update submodule hashes before tagging Blender 3.4.1 release.

[Thomas Dinges]

Commit: ef9ca44dee7fe3e25089dbfc49c69e9eff83ba5a
Author: Thomas Dinges
Date:   Tue Dec 20 09:50:50 2022 +0100
Branches: blender-v3.4-release
https://developer.blender.org/rBef9ca44dee7fe3e25089dbfc49c69e9eff83ba5a

Update submodule hashes before tagging Blender 3.4.1 release.

===

M   release/scripts/addons
M   release/scripts/addons_contrib

===

diff --git a/release/scripts/addons b/release/scripts/addons
index b83a135675f..7408fc7283f 16
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit b83a135675f2e9b4b9cd7923d86c3afb0f1fce1b
+Subproject commit 7408fc7283fd98a88db1383f45f5d15680472a7f
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index 69b1305f4b7..886ea86bd9a 16
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit 69b1305f4b74fbd7e847acc6a5566755b9803d78
+Subproject commit 886ea86bd9a0fd2761260a46356b728d51f2298a

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [3cc1875d237] blender-v2.93-release: Version char bump for Blender 2.93.12, release.

[Thomas Dinges]

Commit: 3cc1875d237d147219b69452b62c9be379cf75e7
Author: Thomas Dinges
Date:   Mon Dec 19 18:01:48 2022 +0100
Branches: blender-v2.93-release
https://developer.blender.org/rB3cc1875d237d147219b69452b62c9be379cf75e7

Version char bump for Blender 2.93.12, release.

===

M   source/blender/blenkernel/BKE_blender_version.h

===

diff --git a/source/blender/blenkernel/BKE_blender_version.h 
b/source/blender/blenkernel/BKE_blender_version.h
index d5bdbf0ec01..5b38458c8ce 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -35,7 +35,7 @@ extern "C" {
 /* Blender patch version for bugfix releases. */
 #define BLENDER_VERSION_PATCH 12
 /** Blender release cycle stage: alpha/beta/rc/release. */
-#define BLENDER_VERSION_CYCLE rc
+#define BLENDER_VERSION_CYCLE release
 
 /* Blender file format version. */
 #define BLENDER_FILE_VERSION BLENDER_VERSION

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [55485cb379f] blender-v3.4-release: Version char bump for Blender 3.4.1, release.

[Thomas Dinges]

Commit: 55485cb379f7d3870c8f754815879c4705c1d061
Author: Thomas Dinges
Date:   Mon Dec 19 18:00:38 2022 +0100
Branches: blender-v3.4-release
https://developer.blender.org/rB55485cb379f7d3870c8f754815879c4705c1d061

Version char bump for Blender 3.4.1, release.

===

M   source/blender/blenkernel/BKE_blender_version.h

===

diff --git a/source/blender/blenkernel/BKE_blender_version.h 
b/source/blender/blenkernel/BKE_blender_version.h
index f1c57f3c910..4f0e06559b3 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -21,7 +21,7 @@ extern "C" {
 /* Blender patch version for bugfix releases. */
 #define BLENDER_VERSION_PATCH 1
 /** Blender release cycle stage: alpha/beta/rc/release. */
-#define BLENDER_VERSION_CYCLE rc
+#define BLENDER_VERSION_CYCLE release
 
 /* Blender file format version. */
 #define BLENDER_FILE_VERSION BLENDER_VERSION

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [ba347d7c9e4] master: Fix Cycles UI for Scrambling Distance, only works with Tabulated Sobol.

[Thomas Dinges]

Commit: ba347d7c9e4ae53d98cce1231fc919591b3c5d81
Author: Thomas Dinges
Date:   Thu Dec 15 10:44:56 2022 +0100
Branches: master
https://developer.blender.org/rBba347d7c9e4ae53d98cce1231fc919591b3c5d81

Fix Cycles UI for Scrambling Distance, only works with Tabulated Sobol.

Thanks to Alaska for finding this.

===

M   intern/cycles/blender/addon/ui.py

===

diff --git a/intern/cycles/blender/addon/ui.py 
b/intern/cycles/blender/addon/ui.py
index d45d7afb16f..6ac97a32f61 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -370,7 +370,7 @@ class 
CYCLES_RENDER_PT_sampling_advanced(CyclesButtonsPanel, Panel):
 layout.separator()
 
 heading = layout.column(align=True, heading="Scrambling Distance")
-heading.active = cscene.sampling_pattern != 'TABULATED_SOBOL'
+heading.active = cscene.sampling_pattern == 'TABULATED_SOBOL'
 heading.prop(cscene, "auto_scrambling_distance", text="Automatic")
 heading.prop(cscene, "preview_scrambling_distance", text="Viewport")
 heading.prop(cscene, "scrambling_distance", text="Multiplier")

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [69d1ddd4c64] master: Fix Cycles Light Tree UI after recent changes.

[Thomas Dinges]

Commit: 69d1ddd4c64056048a8d71fe7db5f878cefe4614
Author: Thomas Dinges
Date:   Thu Dec 15 10:25:06 2022 +0100
Branches: master
https://developer.blender.org/rB69d1ddd4c64056048a8d71fe7db5f878cefe4614

Fix Cycles Light Tree UI after recent changes.

===

M   intern/cycles/blender/addon/ui.py

===

diff --git a/intern/cycles/blender/addon/ui.py 
b/intern/cycles/blender/addon/ui.py
index 4746790aae8..d45d7afb16f 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -395,9 +395,13 @@ class CYCLES_RENDER_PT_sampling_lights(CyclesButtonsPanel, 
Panel):
 
 def draw(self, context):
 layout = self.layout
+layout.use_property_split = True
+layout.use_property_decorate = False
+
 scene = context.scene
 cscene = scene.cycles
 
+col = layout.column(align=True)
 col.prop(cscene, "use_light_tree")
 sub = col.row()
 sub.prop(cscene, "light_sampling_threshold", text="Light Threshold")

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [28235df7096] blender-v3.4-release: Version bump for Blender 3.4.1, rc.

[Thomas Dinges]

Commit: 28235df70969f6d27a4fb73e0007a0028e27d70a
Author: Thomas Dinges
Date:   Wed Dec 14 21:27:52 2022 +0100
Branches: blender-v3.4-release
https://developer.blender.org/rB28235df70969f6d27a4fb73e0007a0028e27d70a

Version bump for Blender 3.4.1, rc.

===

M   source/blender/blenkernel/BKE_blender_version.h

===

diff --git a/source/blender/blenkernel/BKE_blender_version.h 
b/source/blender/blenkernel/BKE_blender_version.h
index 3ad2631ca2b..f1c57f3c910 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -19,9 +19,9 @@ extern "C" {
 /* Blender major and minor version. */
 #define BLENDER_VERSION 304
 /* Blender patch version for bugfix releases. */
-#define BLENDER_VERSION_PATCH 0
+#define BLENDER_VERSION_PATCH 1
 /** Blender release cycle stage: alpha/beta/rc/release. */
-#define BLENDER_VERSION_CYCLE release
+#define BLENDER_VERSION_CYCLE rc
 
 /* Blender file format version. */
 #define BLENDER_FILE_VERSION BLENDER_VERSION

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [e8c7866608b] master: Add-ons: Exclude contrib for beta, rc and release builds.

[Thomas Dinges]

Commit: e8c7866608bb71b674afd9420a22b993e066f873
Author: Thomas Dinges
Date:   Tue Dec 13 11:12:36 2022 +0100
Branches: master
https://developer.blender.org/rBe8c7866608bb71b674afd9420a22b993e066f873

Add-ons: Exclude contrib for beta, rc and release builds.

* Make it clearer that contrib isn't shipped with releases, by already 
excluding it in beta.
* Improve the UI by hiding the "Testing" enum item in these case.

Differential Revision: https://developer.blender.org/D16729

===

M   release/scripts/startup/bl_ui/__init__.py
M   source/creator/CMakeLists.txt

===

diff --git a/release/scripts/startup/bl_ui/__init__.py 
b/release/scripts/startup/bl_ui/__init__.py
index eaf61b58e6d..4822370c9ea 100644
--- a/release/scripts/startup/bl_ui/__init__.py
+++ b/release/scripts/startup/bl_ui/__init__.py
@@ -94,6 +94,16 @@ _namespace = globals()
 _modules_loaded = [_namespace[name] for name in _modules]
 del _namespace
 
+def _addon_support_items():
+"""Return the addon support levels suitable for this Blender build."""
+
+items = [
+('OFFICIAL', "Official", "Officially supported"),
+('COMMUNITY', "Community", "Maintained by community developers"),
+]
+if bpy.app.version_cycle == 'alpha':
+items.append(('TESTING', "Testing", "Newly contributed scripts 
(excluded from release builds)"))
+return items
 
 def register():
 from bpy.utils import register_class
@@ -141,11 +151,7 @@ def register():
 )
 
 WindowManager.addon_support = EnumProperty(
-items=[
-('OFFICIAL', "Official", "Officially supported"),
-('COMMUNITY', "Community", "Maintained by community developers"),
-('TESTING', "Testing", "Newly contributed scripts (excluded from 
release builds)")
-],
+items=_addon_support_items(),
 name="Support",
 description="Display support level",
 default={'OFFICIAL', 'COMMUNITY'},
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 6837bc0da9e..82a37614841 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -394,9 +394,10 @@ install(
 if(WITH_PYTHON)
   # install(CODE "message(\"copying blender scripts...\")")
 
-  # exclude addons_contrib if release
+  # exclude addons_contrib if release branch
   if("${BLENDER_VERSION_CYCLE}" STREQUAL "release" OR
- "${BLENDER_VERSION_CYCLE}" STREQUAL "rc")
+ "${BLENDER_VERSION_CYCLE}" STREQUAL "rc" OR
+ "${BLENDER_VERSION_CYCLE}" STREQUAL "beta")
 set(ADDON_EXCLUDE_CONDITIONAL "addons_contrib/*")
   else()
 set(ADDON_EXCLUDE_CONDITIONAL "_addons_contrib/*")  # Dummy, won't do 
anything.

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [54aec4629ec] master: Cleanup: Remove unused code in Cycles

[Thomas Dinges]

Commit: 54aec4629ecd5d679daff167fc9eb7b7d99a3daa
Author: Thomas Dinges
Date:   Mon Dec 12 18:15:41 2022 +0100
Branches: master
https://developer.blender.org/rB54aec4629ecd5d679daff167fc9eb7b7d99a3daa

Cleanup: Remove unused code in Cycles

* preempt_attr was copied from CUDA, but not used in HIP.
* Remove shadowed variable before conditional in EnvironmentTextureNode code.

Differential Revision: https://developer.blender.org/D16741

===

M   intern/cycles/device/hip/device.cpp
M   intern/cycles/scene/light.cpp

===

diff --git a/intern/cycles/device/hip/device.cpp 
b/intern/cycles/device/hip/device.cpp
index 518239f9877..d3566347834 100644
--- a/intern/cycles/device/hip/device.cpp
+++ b/intern/cycles/device/hip/device.cpp
@@ -163,10 +163,10 @@ void device_hip_info(vector )
 /* If device has a kernel timeout and no compute preemption, we assume
  * it is connected to a display and will freeze the display while doing
  * computations. */
-int timeout_attr = 0, preempt_attr = 0;
+int timeout_attr = 0;
 hipDeviceGetAttribute(_attr, hipDeviceAttributeKernelExecTimeout, 
num);
 
-if (timeout_attr && !preempt_attr) {
+if (timeout_attr) {
   VLOG_INFO << "Device is recognized as display.";
   info.description += " (Display)";
   info.display_device = true;
diff --git a/intern/cycles/scene/light.cpp b/intern/cycles/scene/light.cpp
index f6e9098cd2b..b8addeaffd6 100644
--- a/intern/cycles/scene/light.cpp
+++ b/intern/cycles/scene/light.cpp
@@ -726,7 +726,6 @@ void LightManager::device_update_background(Device *device,
   foreach (ShaderNode *node, shader->graph->nodes) {
 if (node->type == EnvironmentTextureNode::get_node_type()) {
   EnvironmentTextureNode *env = (EnvironmentTextureNode *)node;
-  ImageMetaData metadata;
   if (!env->handle.empty()) {
 ImageMetaData metadata = env->handle.metadata();
 environment_res.x = max(environment_res.x, (int)metadata.width);

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [ed4fc6aabe0] blender-v2.93-release: Release cycle: Version bump to 2.93.12 rc

[Thomas Dinges]

Commit: ed4fc6aabe02482be2059c79059870d4294d586a
Author: Thomas Dinges
Date:   Fri Dec 9 12:23:54 2022 +0100
Branches: blender-v2.93-release
https://developer.blender.org/rBed4fc6aabe02482be2059c79059870d4294d586a

Release cycle: Version bump to 2.93.12 rc

===

M   source/blender/blenkernel/BKE_blender_version.h

===

diff --git a/source/blender/blenkernel/BKE_blender_version.h 
b/source/blender/blenkernel/BKE_blender_version.h
index edcbc6949cc..d5bdbf0ec01 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -33,9 +33,9 @@ extern "C" {
 /* Blender major and minor version. */
 #define BLENDER_VERSION 293
 /* Blender patch version for bugfix releases. */
-#define BLENDER_VERSION_PATCH 11
+#define BLENDER_VERSION_PATCH 12
 /** Blender release cycle stage: alpha/beta/rc/release. */
-#define BLENDER_VERSION_CYCLE release
+#define BLENDER_VERSION_CYCLE rc
 
 /* Blender file format version. */
 #define BLENDER_FILE_VERSION BLENDER_VERSION

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [dd444323f31] blender-v2.93-release: Fix Cycles integrator presets.

[Thomas Dinges]

Commit: dd444323f31ab4a9515acea4ed97711f51e7f4cf
Author: Thomas Dinges
Date:   Mon Nov 1 19:52:27 2021 +0100
Branches: blender-v2.93-release
https://developer.blender.org/rBdd444323f31ab4a9515acea4ed97711f51e7f4cf

Fix Cycles integrator presets.

New presets couldn't be added.

===

M   intern/cycles/blender/addon/presets.py

===

diff --git a/intern/cycles/blender/addon/presets.py 
b/intern/cycles/blender/addon/presets.py
index bf33e5dc010..a28f41a0288 100644
--- a/intern/cycles/blender/addon/presets.py
+++ b/intern/cycles/blender/addon/presets.py
@@ -40,10 +40,10 @@ class AddPresetIntegrator(AddPresetBase, Operator):
 "cycles.transparent_max_bounces",
 "cycles.caustics_reflective",
 "cycles.caustics_refractive",
-"cycles.blur_glossy"
-"cycles.use_fast_gi"
-"cycles.ao_bounces"
-"cycles.ao_bounces_render"
+"cycles.blur_glossy",
+"cycles.use_fast_gi",
+"cycles.ao_bounces",
+"cycles.ao_bounces_render",
 ]
 
 preset_subdir = "cycles/integrator"

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [6b8bb26c457] master: EEVEE: Port existing EEVEE shaders and generated materials to use GPUShaderCreateInfo.

[Thomas Dinges]

Commit: 6b8bb26c457446875e0782a1701ec35c78b33308
Author: Thomas Dinges
Date:   Thu Dec 8 21:07:28 2022 +0100
Branches: master
https://developer.blender.org/rB6b8bb26c457446875e0782a1701ec35c78b33308

EEVEE: Port existing EEVEE shaders and generated materials to use 
GPUShaderCreateInfo.

Required by Metal backend for efficient shader compilation. EEVEE material
resource binding permutations now controlled via CreateInfo and selected
based on material options. Other existing CreateInfo's also modified to
ensure explicitness for depth-writing mode. Other missing bindings also
addressed to ensure full compliance with the Metal backend.

Authored by Apple: Michael Parkin-White

Ref T96261

Reviewed By: fclem

Differential Revision: https://developer.blender.org/D16243

===

M   source/blender/draw/CMakeLists.txt
M   source/blender/draw/engines/eevee/eevee_lightcache.c
M   source/blender/draw/engines/eevee/eevee_lut_gen.c
M   source/blender/draw/engines/eevee/eevee_private.h
M   source/blender/draw/engines/eevee/eevee_shaders.cc
M   source/blender/draw/engines/eevee/eevee_shaders_extra.cc
A   source/blender/draw/engines/eevee/engine_eevee_shared_defines.h
M   source/blender/draw/engines/eevee/shaders/ambient_occlusion_lib.glsl
M   source/blender/draw/engines/eevee/shaders/background_vert.glsl
M   source/blender/draw/engines/eevee/shaders/bsdf_lut_frag.glsl
M   source/blender/draw/engines/eevee/shaders/btdf_lut_frag.glsl
M   source/blender/draw/engines/eevee/shaders/closure_type_lib.glsl
M   source/blender/draw/engines/eevee/shaders/common_uniforms_lib.glsl
M   source/blender/draw/engines/eevee/shaders/common_utiltex_lib.glsl
M   source/blender/draw/engines/eevee/shaders/cryptomatte_frag.glsl
D   source/blender/draw/engines/eevee/shaders/cryptomatte_lib.glsl
M   source/blender/draw/engines/eevee/shaders/cryptomatte_vert.glsl
M   source/blender/draw/engines/eevee/shaders/cubemap_lib.glsl
M   source/blender/draw/engines/eevee/shaders/effect_bloom_frag.glsl
M   source/blender/draw/engines/eevee/shaders/effect_dof_bokeh_frag.glsl
M   
source/blender/draw/engines/eevee/shaders/effect_dof_dilate_tiles_frag.glsl
M   
source/blender/draw/engines/eevee/shaders/effect_dof_downsample_frag.glsl
M   source/blender/draw/engines/eevee/shaders/effect_dof_filter_frag.glsl
M   
source/blender/draw/engines/eevee/shaders/effect_dof_flatten_tiles_frag.glsl
M   source/blender/draw/engines/eevee/shaders/effect_dof_gather_frag.glsl
M   source/blender/draw/engines/eevee/shaders/effect_dof_lib.glsl
M   source/blender/draw/engines/eevee/shaders/effect_dof_reduce_frag.glsl
M   source/blender/draw/engines/eevee/shaders/effect_dof_resolve_frag.glsl
M   source/blender/draw/engines/eevee/shaders/effect_dof_scatter_frag.glsl
M   source/blender/draw/engines/eevee/shaders/effect_dof_scatter_vert.glsl
M   source/blender/draw/engines/eevee/shaders/effect_dof_setup_frag.glsl
M   
source/blender/draw/engines/eevee/shaders/effect_downsample_cube_frag.glsl
M   source/blender/draw/engines/eevee/shaders/effect_downsample_frag.glsl
M   source/blender/draw/engines/eevee/shaders/effect_gtao_frag.glsl
M   source/blender/draw/engines/eevee/shaders/effect_minmaxz_frag.glsl
M   source/blender/draw/engines/eevee/shaders/effect_mist_frag.glsl
M   source/blender/draw/engines/eevee/shaders/effect_motion_blur_frag.glsl
M   source/blender/draw/engines/eevee/shaders/effect_reflection_lib.glsl
M   
source/blender/draw/engines/eevee/shaders/effect_reflection_resolve_frag.glsl
M   
source/blender/draw/engines/eevee/shaders/effect_reflection_trace_frag.glsl
M   source/blender/draw/engines/eevee/shaders/effect_subsurface_frag.glsl
M   source/blender/draw/engines/eevee/shaders/effect_temporal_aa.glsl
M   source/blender/draw/engines/eevee/shaders/effect_translucency_frag.glsl
M   
source/blender/draw/engines/eevee/shaders/effect_velocity_resolve_frag.glsl
M   source/blender/draw/engines/eevee/shaders/effect_velocity_tile_frag.glsl
A   
source/blender/draw/engines/eevee/shaders/infos/eevee_legacy_bloom_info.hh
A   
source/blender/draw/engines/eevee/shaders/infos/eevee_legacy_common_info.hh
A   source/blender/draw/engines/eevee/shaders/infos/eevee_legacy_dof_info.hh
A   
source/blender/draw/engines/eevee/shaders/infos/eevee_legacy_effects_info.hh
A   
source/blender/draw/engines/eevee/shaders/infos/eevee_legacy_lightprobe_info.hh
A   
source/blender/draw/engines/eevee/shaders/infos/eevee_legacy_material_info.hh
A   
source/blender/draw/engines/eevee/shaders/infos/eevee_legacy_motion_blur_info.hh
A   
source/blender/draw/engines/eevee/shaders/infos/eevee_legacy_shadow_info.hh
A   
source/blender/draw/engines/eevee/shaders/infos/eevee_legacy_volume_info.hh
A   
source/blender/draw/engines/eevee

[Bf-blender-cvs] [bd3a7b41e2b] blender-v3.3-release: Update submodule references before tagging v3.3.2

[Thomas Dinges]

Commit: bd3a7b41e2b32b808d3c49a131c0fc83bbe4d125
Author: Thomas Dinges
Date:   Wed Dec 7 13:12:06 2022 +0100
Branches: blender-v3.3-release
https://developer.blender.org/rBbd3a7b41e2b32b808d3c49a131c0fc83bbe4d125

Update submodule references before tagging v3.3.2

===

M   release/datafiles/locale
M   release/scripts/addons
M   source/tools

===

diff --git a/release/datafiles/locale b/release/datafiles/locale
index a2eb5078914..9f02d935c98 16
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit a2eb507891449a0b67582be9561840075513661d
+Subproject commit 9f02d935c98ac435eccfbf35ad1b76095dc33771
diff --git a/release/scripts/addons b/release/scripts/addons
index 67f1fbca148..1c1b05efd36 16
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 67f1fbca1482d9d9362a4001332e785c3fd5d230
+Subproject commit 1c1b05efd36bc245ea4d5292ca93e33dfa6447e8
diff --git a/source/tools b/source/tools
index da8bdd7244c..bb73c0b6f0f 16
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit da8bdd7244c7b6c2eadf4c949ff391d0cc430275
+Subproject commit bb73c0b6f0f4587db5a1379c96947034ddcdbe10

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [175bd382015] blender-v3.4-release: Update subrepository references before tagging.

[Thomas Dinges]

Commit: 175bd3820151bf9973198daa92f3fe2035f02102
Author: Thomas Dinges
Date:   Wed Dec 7 12:39:39 2022 +0100
Branches: blender-v3.4-release
https://developer.blender.org/rB175bd3820151bf9973198daa92f3fe2035f02102

Update subrepository references before tagging.

===

M   release/datafiles/locale
M   release/scripts/addons
M   release/scripts/addons_contrib
M   source/tools

===

diff --git a/release/datafiles/locale b/release/datafiles/locale
index 4a581c54af9..e398d3c4969 16
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 4a581c54af9b92cb670d750951b9382160f10f3e
+Subproject commit e398d3c4969a37ae2ecff388344dd780bc1cfe82
diff --git a/release/scripts/addons b/release/scripts/addons
index 0b0052bd53a..b83a135675f 16
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 0b0052bd53ad8249ed07dfb87705c338af698bde
+Subproject commit b83a135675f2e9b4b9cd7923d86c3afb0f1fce1b
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index 96143b1a8b0..69b1305f4b7 16
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit 96143b1a8b037ea3c81f065f557025db9fe1ace3
+Subproject commit 69b1305f4b74fbd7e847acc6a5566755b9803d78
diff --git a/source/tools b/source/tools
index 9e33a8678a3..dfa16042bf7 16
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit 9e33a8678a3b97d2fdb833349657c3cc1c04811f
+Subproject commit dfa16042bf7149475ad318d29a8202d969982abb

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [a95bf1ac01b] blender-v3.4-release: Blender 3.4.0: Splash and cycle bump.

[Thomas Dinges]

Commit: a95bf1ac01be7017007f6d1112a7a994db2e01fd
Author: Thomas Dinges
Date:   Tue Dec 6 19:46:15 2022 +0100
Branches: blender-v3.4-release
https://developer.blender.org/rBa95bf1ac01be7017007f6d1112a7a994db2e01fd

Blender 3.4.0: Splash and cycle bump.

Splash: Blender Studio, Project Heist.

===

M   release/datafiles/splash.png
M   source/blender/blenkernel/BKE_blender_version.h

===

diff --git a/release/datafiles/splash.png b/release/datafiles/splash.png
index eb1250cf5a5..7169dc900ad 100644
Binary files a/release/datafiles/splash.png and b/release/datafiles/splash.png 
differ
diff --git a/source/blender/blenkernel/BKE_blender_version.h 
b/source/blender/blenkernel/BKE_blender_version.h
index c6acc1d9f2c..3ad2631ca2b 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -21,7 +21,7 @@ extern "C" {
 /* Blender patch version for bugfix releases. */
 #define BLENDER_VERSION_PATCH 0
 /** Blender release cycle stage: alpha/beta/rc/release. */
-#define BLENDER_VERSION_CYCLE rc
+#define BLENDER_VERSION_CYCLE release
 
 /* Blender file format version. */
 #define BLENDER_FILE_VERSION BLENDER_VERSION

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [bf24652e38a] blender-v3.3-release: Release cycle: Bump char for Blender 3.3.2 release.

[Thomas Dinges]

Commit: bf24652e38a2b3731f7af4a05cf51c4f0c51b90e
Author: Thomas Dinges
Date:   Tue Dec 6 19:19:59 2022 +0100
Branches: blender-v3.3-release
https://developer.blender.org/rBbf24652e38a2b3731f7af4a05cf51c4f0c51b90e

Release cycle: Bump char for Blender 3.3.2 release.

===

M   source/blender/blenkernel/BKE_blender_version.h

===

diff --git a/source/blender/blenkernel/BKE_blender_version.h 
b/source/blender/blenkernel/BKE_blender_version.h
index de3cfb9693c..a8704fb9111 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -21,7 +21,7 @@ extern "C" {
 /* Blender patch version for bugfix releases. */
 #define BLENDER_VERSION_PATCH 2
 /** Blender release cycle stage: alpha/beta/rc/release. */
-#define BLENDER_VERSION_CYCLE rc
+#define BLENDER_VERSION_CYCLE release
 
 /* Blender file format version. */
 #define BLENDER_FILE_VERSION BLENDER_VERSION

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [3124241256b] master: Fix Cycles SSE4 define for fast math rint function.

[Thomas Dinges]

Commit: 3124241256bfb10fc2e7b0cd9b39d65f3979b1e2
Author: Thomas Dinges
Date:   Tue Dec 6 19:06:43 2022 +0100
Branches: master
https://developer.blender.org/rB3124241256bfb10fc2e7b0cd9b39d65f3979b1e2

Fix Cycles SSE4 define for fast math rint function.

Differential Revision: https://developer.blender.org/D16708

===

M   intern/cycles/util/math_fast.h

===

diff --git a/intern/cycles/util/math_fast.h b/intern/cycles/util/math_fast.h
index fc7eadb112b..f7576668151 100644
--- a/intern/cycles/util/math_fast.h
+++ b/intern/cycles/util/math_fast.h
@@ -58,7 +58,7 @@ ccl_device_inline float4 madd4(const float4 a, const float4 
b, const float4 c)
 ccl_device_inline int fast_rint(float x)
 {
   /* used by sin/cos/tan range reduction. */
-#ifdef __KERNEL_SSE4__
+#ifdef __KERNEL_SSE41__
   /* Single `roundps` instruction on SSE4.1+ (for gcc/clang at least). */
   return float_to_int(rintf(x));
 #else

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [de9f32a666b] master: Merge branch 'blender-v3.4-release'

[Thomas Dinges]

Commit: de9f32a666b2d9e405142a07ba7c2e16e25d1709
Author: Thomas Dinges
Date:   Tue Dec 6 18:27:44 2022 +0100
Branches: master
https://developer.blender.org/rBde9f32a666b2d9e405142a07ba7c2e16e25d1709

Merge branch 'blender-v3.4-release'

===



===



___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [adea6681c01] master: Merge branch 'blender-v3.4-release'

[Thomas Dinges]

Commit: adea6681c0160e3a6c69e64aab3328d60ba34e7b
Author: Thomas Dinges
Date:   Tue Dec 6 16:35:44 2022 +0100
Branches: master
https://developer.blender.org/rBadea6681c0160e3a6c69e64aab3328d60ba34e7b

Merge branch 'blender-v3.4-release'

===



===



___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [212b054bb36] blender-v3.4-release: Update freedesktop file with Blender 3.4 features.

[Thomas Dinges]

Commit: 212b054bb3608b85387f861d917365fbf86aba2e
Author: Thomas Dinges
Date:   Tue Dec 6 16:34:53 2022 +0100
Branches: blender-v3.4-release
https://developer.blender.org/rB212b054bb3608b85387f861d917365fbf86aba2e

Update freedesktop file with Blender 3.4 features.

===

M   release/freedesktop/org.blender.Blender.appdata.xml

===

diff --git a/release/freedesktop/org.blender.Blender.appdata.xml 
b/release/freedesktop/org.blender.Blender.appdata.xml
index 0f1aa5099b6..6b64535ab1f 100644
--- a/release/freedesktop/org.blender.Blender.appdata.xml
+++ b/release/freedesktop/org.blender.Blender.appdata.xml
@@ -40,6 +40,25 @@
 
 
 
+
+
+New features:
+
+Cycles Path Guiding
+Sculpt geometry-based relax brush
+Viewport overlay for Geometry Nodes Viewer Node
+EEVEE headless rendering support on Linux
+
+Enhancements:
+
+Many new Geometry Nodes for meshes, curves and 
more
+NLA editor usability improvements
+FFmpeg AV1 codec encoding
+Improved font thumbnails
+Blender as a Python Module
+
+
+
 
 
 New features:

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [5f0120cd357] master: Merge branch 'blender-v3.4-release'

[Thomas Dinges]

Commit: 5f0120cd35785d956a0bf6eabce79b1a432687ac
Author: Thomas Dinges
Date:   Fri Dec 2 08:47:05 2022 +0100
Branches: master
https://developer.blender.org/rB5f0120cd35785d956a0bf6eabce79b1a432687ac

Merge branch 'blender-v3.4-release'

===



===



___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [0197b524e47] master: Update THIRD-PARTY-LICENSES.txt for Blender 3.4.

[Thomas Dinges]

Commit: 0197b524e47477f57100b35436a741212e916c52
Author: Thomas Dinges
Date:   Thu Dec 1 15:21:43 2022 +0100
Branches: master
https://developer.blender.org/rB0197b524e47477f57100b35436a741212e916c52

Update THIRD-PARTY-LICENSES.txt for Blender 3.4.

===

M   release/license/THIRD-PARTY-LICENSES.txt

===

diff --git a/release/license/THIRD-PARTY-LICENSES.txt 
b/release/license/THIRD-PARTY-LICENSES.txt
index e0ac2bdf226..e574f74e27b 100644
--- a/release/license/THIRD-PARTY-LICENSES.txt
+++ b/release/license/THIRD-PARTY-LICENSES.txt
@@ -23,14 +23,16 @@ PERFORMANCE OF THIS SOFTWARE.
 ** Cuda Wrangler; version cbf465b -- https://github.com/CudaWrangler/cuew
 ** Draco; version 1.3.6 -- https://google.github.io/draco/
 ** Embree; version 3.13.4 -- https://github.com/embree/embree
-** Intel® Open Path Guiding Library; version v0.3.1-beta --
+** Intel(R) oneAPI DPC++ compiler; version 20221019 --
+https://github.com/intel/llvm#oneapi-dpc-compiler
+** Intel® Open Path Guiding Library; version v0.4.1-beta --
 http://www.openpgl.org/
 ** Mantaflow; version 0.13 -- http://mantaflow.com/
 ** oneAPI Threading Building Block; version 2020_U3 --
 https://software.intel.com/en-us/oneapi/onetbb
 ** OpenCL Wrangler; version 27a6867 -- https://github.com/OpenCLWrangler/clew
 ** OpenImageDenoise; version 1.4.3 -- https://www.openimagedenoise.org/
-** OpenSSL; version 1.1.1 -- https://www.openssl.org/
+** OpenSSL; version 1.1.1q -- https://www.openssl.org/
 ** OpenXR SDK; version 1.0.17 -- https://khronos.org/openxr
 ** RangeTree; version 40ebed8aa209 -- https://github.com/ideasman42/rangetree-c
 ** SDL Extension Wrangler; version 15edf8e --
@@ -242,6 +244,8 @@ limitations under the License.
 Copyright 2018 The Draco Authors
 * For Embree see also this required NOTICE:
 Copyright 2009-2020 Intel Corporation
+* For Intel(R) oneAPI DPC++ compiler see also this required NOTICE:
+Copyright (C) 2021 Intel Corporation
 * For Intel® Open Path Guiding Library see also this required NOTICE:
 Copyright 2020 Intel Corporation.
 * For Mantaflow see also this required NOTICE:
@@ -273,7 +277,7 @@ limitations under the License.
 Copyright (c) 2016, Alliance for Open Media. All rights reserved.
 ** NASM; version 2.15.02 -- https://www.nasm.us/
 Contributions since 2008-12-15 are Copyright Intel Corporation.
-** OpenJPEG; version 2.4.0 -- https://github.com/uclouvain/openjpeg
+** OpenJPEG; version 2.5.0 -- https://github.com/uclouvain/openjpeg
 Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
 Copyright (c) 2002-2014, Professor Benoit Macq
 Copyright (c) 2003-2014, Antonin Descampe
@@ -330,7 +334,7 @@ Copyright Intel Corporation
 Copyright (c) 2005-2021, NumPy Developers.
 ** Ogg; version 1.3.5 -- https://www.xiph.org/ogg/
 COPYRIGHT (C) 1994-2019 by the Xiph.Org Foundation https://www.xiph.org/
-** Open Shading Language; version 1.11.17.0 --
+** Open Shading Language; version 1.12.6.2 --
 https://github.com/imageworks/OpenShadingLanguage
 Copyright Contributors to the Open Shading Language project.
 ** OpenColorIO; version 2.1.1 --
@@ -339,7 +343,7 @@ Copyright Contributors to the OpenColorIO Project.
 ** OpenEXR; version 3.1.5 --
 https://github.com/AcademySoftwareFoundation/openexr
 Copyright Contributors to the OpenEXR Project. All rights reserved.
-** OpenImageIO; version 2.3.13.0 -- http://www.openimageio.org
+** OpenImageIO; version 2.3.20.0 -- http://www.openimageio.org
 Copyright (c) 2008-present by Contributors to the OpenImageIO project. All
 Rights Reserved.
 ** Pystring; version 1.1.3 -- https://github.com/imageworks/pystring
@@ -1183,7 +1187,7 @@ Copyright (C) 2003-2021 x264 project
 ** miniLZO; version 2.08 -- http://www.oberhumer.com/opensource/lzo/
 LZO and miniLZO are Copyright (C) 1996-2014 Markus Franz Xaver Oberhumer
 All Rights Reserved.
-** The FreeType Project; version 2.11.1 --
+** The FreeType Project; version 2.12.1 --
 https://sourceforge.net/projects/freetype
 Copyright (C) 1996-2020 by David Turner, Robert Wilhelm, and Werner Lemberg.
 ** X Drag and Drop; version 2000-08-08 --
@@ -2186,8 +2190,10 @@ of this License. But first, please read http://ffmpeg.org/
+** FFmpeg; version 5.1.2 -- http://ffmpeg.org/
 -
+** Libsndfile; version 1.1.0 -- http://libsndfile.github.io/libsndfile/
+Copyright (C) 2011-2016 Erik de Castro Lopo 
 
 GNU LESSER GENERAL PUBLIC LICENSE
 
@@ -2675,171 +2681,6 @@ That's all there is to it!
 
 --
 
-** Libsndfile; version 1.0.28 -- http://www.mega-nerd.com/libsndfile/
-Copyright (C) 2011-2016 Erik de Castro Lopo 
-
-GNU LESSER GENERAL PUBLIC LICENSE
-
-Version 3, 29 June 2007
-
-Copyright (C) 2007 Free Software Foundation, Inc. 
-
-Everyone is permitted to copy and distribute verbatim copies of this license
-document, but changing it is not allowed.
-
-This version of the GNU Lesser General Public License incorporates

[Bf-blender-cvs] [f95768d1e07] blender-v3.4-release: Update THIRD-PARTY-LICENSES.txt for Blender 3.4.

[Thomas Dinges]

Commit: f95768d1e07bf2f25145cacab4c16dcb43a704bf
Author: Thomas Dinges
Date:   Thu Dec 1 15:21:43 2022 +0100
Branches: blender-v3.4-release
https://developer.blender.org/rBf95768d1e07bf2f25145cacab4c16dcb43a704bf

Update THIRD-PARTY-LICENSES.txt for Blender 3.4.

===

M   release/license/THIRD-PARTY-LICENSES.txt

===

diff --git a/release/license/THIRD-PARTY-LICENSES.txt 
b/release/license/THIRD-PARTY-LICENSES.txt
index e0ac2bdf226..e574f74e27b 100644
--- a/release/license/THIRD-PARTY-LICENSES.txt
+++ b/release/license/THIRD-PARTY-LICENSES.txt
@@ -23,14 +23,16 @@ PERFORMANCE OF THIS SOFTWARE.
 ** Cuda Wrangler; version cbf465b -- https://github.com/CudaWrangler/cuew
 ** Draco; version 1.3.6 -- https://google.github.io/draco/
 ** Embree; version 3.13.4 -- https://github.com/embree/embree
-** Intel® Open Path Guiding Library; version v0.3.1-beta --
+** Intel(R) oneAPI DPC++ compiler; version 20221019 --
+https://github.com/intel/llvm#oneapi-dpc-compiler
+** Intel® Open Path Guiding Library; version v0.4.1-beta --
 http://www.openpgl.org/
 ** Mantaflow; version 0.13 -- http://mantaflow.com/
 ** oneAPI Threading Building Block; version 2020_U3 --
 https://software.intel.com/en-us/oneapi/onetbb
 ** OpenCL Wrangler; version 27a6867 -- https://github.com/OpenCLWrangler/clew
 ** OpenImageDenoise; version 1.4.3 -- https://www.openimagedenoise.org/
-** OpenSSL; version 1.1.1 -- https://www.openssl.org/
+** OpenSSL; version 1.1.1q -- https://www.openssl.org/
 ** OpenXR SDK; version 1.0.17 -- https://khronos.org/openxr
 ** RangeTree; version 40ebed8aa209 -- https://github.com/ideasman42/rangetree-c
 ** SDL Extension Wrangler; version 15edf8e --
@@ -242,6 +244,8 @@ limitations under the License.
 Copyright 2018 The Draco Authors
 * For Embree see also this required NOTICE:
 Copyright 2009-2020 Intel Corporation
+* For Intel(R) oneAPI DPC++ compiler see also this required NOTICE:
+Copyright (C) 2021 Intel Corporation
 * For Intel® Open Path Guiding Library see also this required NOTICE:
 Copyright 2020 Intel Corporation.
 * For Mantaflow see also this required NOTICE:
@@ -273,7 +277,7 @@ limitations under the License.
 Copyright (c) 2016, Alliance for Open Media. All rights reserved.
 ** NASM; version 2.15.02 -- https://www.nasm.us/
 Contributions since 2008-12-15 are Copyright Intel Corporation.
-** OpenJPEG; version 2.4.0 -- https://github.com/uclouvain/openjpeg
+** OpenJPEG; version 2.5.0 -- https://github.com/uclouvain/openjpeg
 Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
 Copyright (c) 2002-2014, Professor Benoit Macq
 Copyright (c) 2003-2014, Antonin Descampe
@@ -330,7 +334,7 @@ Copyright Intel Corporation
 Copyright (c) 2005-2021, NumPy Developers.
 ** Ogg; version 1.3.5 -- https://www.xiph.org/ogg/
 COPYRIGHT (C) 1994-2019 by the Xiph.Org Foundation https://www.xiph.org/
-** Open Shading Language; version 1.11.17.0 --
+** Open Shading Language; version 1.12.6.2 --
 https://github.com/imageworks/OpenShadingLanguage
 Copyright Contributors to the Open Shading Language project.
 ** OpenColorIO; version 2.1.1 --
@@ -339,7 +343,7 @@ Copyright Contributors to the OpenColorIO Project.
 ** OpenEXR; version 3.1.5 --
 https://github.com/AcademySoftwareFoundation/openexr
 Copyright Contributors to the OpenEXR Project. All rights reserved.
-** OpenImageIO; version 2.3.13.0 -- http://www.openimageio.org
+** OpenImageIO; version 2.3.20.0 -- http://www.openimageio.org
 Copyright (c) 2008-present by Contributors to the OpenImageIO project. All
 Rights Reserved.
 ** Pystring; version 1.1.3 -- https://github.com/imageworks/pystring
@@ -1183,7 +1187,7 @@ Copyright (C) 2003-2021 x264 project
 ** miniLZO; version 2.08 -- http://www.oberhumer.com/opensource/lzo/
 LZO and miniLZO are Copyright (C) 1996-2014 Markus Franz Xaver Oberhumer
 All Rights Reserved.
-** The FreeType Project; version 2.11.1 --
+** The FreeType Project; version 2.12.1 --
 https://sourceforge.net/projects/freetype
 Copyright (C) 1996-2020 by David Turner, Robert Wilhelm, and Werner Lemberg.
 ** X Drag and Drop; version 2000-08-08 --
@@ -2186,8 +2190,10 @@ of this License. But first, please read http://ffmpeg.org/
+** FFmpeg; version 5.1.2 -- http://ffmpeg.org/
 -
+** Libsndfile; version 1.1.0 -- http://libsndfile.github.io/libsndfile/
+Copyright (C) 2011-2016 Erik de Castro Lopo 
 
 GNU LESSER GENERAL PUBLIC LICENSE
 
@@ -2675,171 +2681,6 @@ That's all there is to it!
 
 --
 
-** Libsndfile; version 1.0.28 -- http://www.mega-nerd.com/libsndfile/
-Copyright (C) 2011-2016 Erik de Castro Lopo 
-
-GNU LESSER GENERAL PUBLIC LICENSE
-
-Version 3, 29 June 2007
-
-Copyright (C) 2007 Free Software Foundation, Inc. 
-
-Everyone is permitted to copy and distribute verbatim copies of this license
-document, but changing it is not allowed.
-
-This version of the GNU Lesser General Public License

[Bf-blender-cvs] [f37e8c2e96d] master: Merge branch 'blender-v3.4-release'

[Thomas Dinges]

Commit: f37e8c2e96df97980de8fe14a11bc7cbb41bd10c
Author: Thomas Dinges
Date:   Wed Nov 30 20:08:31 2022 +0100
Branches: master
https://developer.blender.org/rBf37e8c2e96df97980de8fe14a11bc7cbb41bd10c

Merge branch 'blender-v3.4-release'

===



===



___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [692474ccf92] blender-v3.4-release: Release cycle: Bump BLENDER_VERSION_CYCLE to rc for 3.4.

[Thomas Dinges]

Commit: 692474ccf921716862d65c3c708bead7fdefa057
Author: Thomas Dinges
Date:   Wed Nov 30 20:04:37 2022 +0100
Branches: blender-v3.4-release
https://developer.blender.org/rB692474ccf921716862d65c3c708bead7fdefa057

Release cycle: Bump BLENDER_VERSION_CYCLE to rc for 3.4.

===

M   source/blender/blenkernel/BKE_blender_version.h

===

diff --git a/source/blender/blenkernel/BKE_blender_version.h 
b/source/blender/blenkernel/BKE_blender_version.h
index a7150913290..c6acc1d9f2c 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -21,7 +21,7 @@ extern "C" {
 /* Blender patch version for bugfix releases. */
 #define BLENDER_VERSION_PATCH 0
 /** Blender release cycle stage: alpha/beta/rc/release. */
-#define BLENDER_VERSION_CYCLE beta
+#define BLENDER_VERSION_CYCLE rc
 
 /* Blender file format version. */
 #define BLENDER_FILE_VERSION BLENDER_VERSION

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [f47daa7ec9e] master: Merge branch 'blender-v3.4-release'

[Thomas Dinges]

Commit: f47daa7ec9ea32e29acdfbce166799d17c5489e1
Author: Thomas Dinges
Date:   Thu Nov 24 15:33:25 2022 +0100
Branches: master
https://developer.blender.org/rBf47daa7ec9ea32e29acdfbce166799d17c5489e1

Merge branch 'blender-v3.4-release'

===



===



___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [2124bfb2113] blender-v3.3-release: Windows: Run blender-launcher.exe instead of blender.exe

[Thomas Dinges]

Commit: 2124bfb2113902b027fc5479c37e7c5425f626d2
Author: Thomas Dinges
Date:   Wed Nov 23 15:14:13 2022 +0100
Branches: blender-v3.3-release
https://developer.blender.org/rB2124bfb2113902b027fc5479c37e7c5425f626d2

Windows: Run blender-launcher.exe instead of blender.exe

With this change Blender, delivered via the Microsoft store, will launch 
without the console window flashing.

Ref T88613

Differential Revision: https://developer.blender.org/D16589

===

M   release/windows/msix/AppxManifest.xml.template

===

diff --git a/release/windows/msix/AppxManifest.xml.template 
b/release/windows/msix/AppxManifest.xml.template
index e1b267472a3..5bf56f5a50a 100644
--- a/release/windows/msix/AppxManifest.xml.template
+++ b/release/windows/msix/AppxManifest.xml.template
@@ -17,7 +17,7 @@
 
   
   
-
+
   
   
 
-
+
   
-
+
   
 
   

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [6e37f14489e] blender-v3.4-release: Windows: Run blender-launcher.exe instead of blender.exe

[Thomas Dinges]

Commit: 6e37f14489e4eb4b08fa1ed3346c246128304a98
Author: Thomas Dinges
Date:   Wed Nov 23 15:14:13 2022 +0100
Branches: blender-v3.4-release
https://developer.blender.org/rB6e37f14489e4eb4b08fa1ed3346c246128304a98

Windows: Run blender-launcher.exe instead of blender.exe

With this change Blender, delivered via the Microsoft store, will launch 
without the console window flashing.

Ref T88613

Differential Revision: https://developer.blender.org/D16589

===

M   release/windows/msix/AppxManifest.xml.template

===

diff --git a/release/windows/msix/AppxManifest.xml.template 
b/release/windows/msix/AppxManifest.xml.template
index e1b267472a3..5bf56f5a50a 100644
--- a/release/windows/msix/AppxManifest.xml.template
+++ b/release/windows/msix/AppxManifest.xml.template
@@ -17,7 +17,7 @@
 
   
   
-
+
   
   
 
-
+
   
-
+
   
 
   

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [b7b9e670ce0] blender-v3.3-release: Fix T101020: Cycles Add Performance Preset is broken

[Thomas Dinges]

Commit: b7b9e670ce0a6b6b167fb74e556bbef39f6e895d
Author: Thomas Dinges
Date:   Thu Nov 24 10:13:57 2022 +0100
Branches: blender-v3.3-release
https://developer.blender.org/rBb7b9e670ce0a6b6b167fb74e556bbef39f6e895d

Fix T101020: Cycles Add Performance Preset is broken

===

M   intern/cycles/blender/addon/presets.py

===

diff --git a/intern/cycles/blender/addon/presets.py 
b/intern/cycles/blender/addon/presets.py
index e1f08c07eaf..6ad22d765aa 100644
--- a/intern/cycles/blender/addon/presets.py
+++ b/intern/cycles/blender/addon/presets.py
@@ -91,7 +91,7 @@ class AddPresetPerformance(AddPresetBase, Operator):
 preset_menu = "CYCLES_PT_performance_presets"
 
 preset_defines = [
-"render = bpy.context.scene.render"
+"render = bpy.context.scene.render",
 "cycles = bpy.context.scene.cycles"
 ]

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [bbf09eb59ce] master: Merge branch 'blender-v3.4-release'

[Thomas Dinges]

Commit: bbf09eb59ce22efbfc170bb7e7465b2eb7546e69
Author: Thomas Dinges
Date:   Thu Nov 24 10:15:36 2022 +0100
Branches: master
https://developer.blender.org/rBbbf09eb59ce22efbfc170bb7e7465b2eb7546e69

Merge branch 'blender-v3.4-release'

===



===



___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [b3daf61ddfc] blender-v3.4-release: Fix T101020: Cycles Add Performance Preset is broken

[Thomas Dinges]

Commit: b3daf61ddfc0471f9d06d9f84428300462779f12
Author: Thomas Dinges
Date:   Thu Nov 24 10:13:57 2022 +0100
Branches: blender-v3.4-release
https://developer.blender.org/rBb3daf61ddfc0471f9d06d9f84428300462779f12

Fix T101020: Cycles Add Performance Preset is broken

===

M   intern/cycles/blender/addon/presets.py

===

diff --git a/intern/cycles/blender/addon/presets.py 
b/intern/cycles/blender/addon/presets.py
index e1f08c07eaf..6ad22d765aa 100644
--- a/intern/cycles/blender/addon/presets.py
+++ b/intern/cycles/blender/addon/presets.py
@@ -91,7 +91,7 @@ class AddPresetPerformance(AddPresetBase, Operator):
 preset_menu = "CYCLES_PT_performance_presets"
 
 preset_defines = [
-"render = bpy.context.scene.render"
+"render = bpy.context.scene.render",
 "cycles = bpy.context.scene.cycles"
 ]

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [460f7ec7aac] master: Windows: Run blender-launcher.exe instead of blender.exe

[Thomas Dinges]

Commit: 460f7ec7aacf23f391dacd7839c8c160679ad62d
Author: Thomas Dinges
Date:   Wed Nov 23 15:14:13 2022 +0100
Branches: master
https://developer.blender.org/rB460f7ec7aacf23f391dacd7839c8c160679ad62d

Windows: Run blender-launcher.exe instead of blender.exe

With this change Blender, delivered via the Microsoft store, will launch 
without the console window flashing.

Ref T88613

Differential Revision: https://developer.blender.org/D16589

===

M   release/windows/msix/AppxManifest.xml.template

===

diff --git a/release/windows/msix/AppxManifest.xml.template 
b/release/windows/msix/AppxManifest.xml.template
index e1b267472a3..5bf56f5a50a 100644
--- a/release/windows/msix/AppxManifest.xml.template
+++ b/release/windows/msix/AppxManifest.xml.template
@@ -17,7 +17,7 @@
 
   
   
-
+
   
   
 
-
+
   
-
+
   
 
   

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [f74234895a4] master: Merge branch 'blender-v3.4-release'

[Thomas Dinges]

Commit: f74234895a491409ace47c1bf0b992e422b9b652
Author: Thomas Dinges
Date:   Thu Nov 17 17:05:03 2022 +0100
Branches: master
https://developer.blender.org/rBf74234895a491409ace47c1bf0b992e422b9b652

Merge branch 'blender-v3.4-release'

===



===



___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [a16dd407b3d] master: Revert "Blender 3.4 - Beta"

[Thomas Dinges]

Commit: a16dd407b3d3f830c40646fcda5ea5b89b3ad4ee
Author: Thomas Dinges
Date:   Thu Nov 3 10:12:46 2022 +0100
Branches: master
https://developer.blender.org/rBa16dd407b3d3f830c40646fcda5ea5b89b3ad4ee

Revert "Blender 3.4 - Beta"

This reverts commit 666135c32af3032d1e6c62ee953d65f399da7d0f.

===

M   build_files/build_environment/cmake/download.cmake
M   build_files/config/pipeline_config.yaml
M   source/blender/blenkernel/BKE_blender_version.h

===

diff --git a/build_files/build_environment/cmake/download.cmake 
b/build_files/build_environment/cmake/download.cmake
index 5db1a4e56fa..8d75f0ff0ed 100644
--- a/build_files/build_environment/cmake/download.cmake
+++ b/build_files/build_environment/cmake/download.cmake
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 ## Update and uncomment this in the release branch
-set(BLENDER_VERSION 3.4)
+# set(BLENDER_VERSION 3.1)
 
 function(download_source dep)
   set(TARGET_FILE ${${dep}_FILE})
diff --git a/build_files/config/pipeline_config.yaml 
b/build_files/config/pipeline_config.yaml
index 7c8f15de777..3359f89c41e 100644
--- a/build_files/config/pipeline_config.yaml
+++ b/build_files/config/pipeline_config.yaml
@@ -5,38 +5,38 @@
 update-code:
 git:
 submodules:
--   branch: blender-v3.4-release
+-   branch: master
 commit_id: HEAD
 path: release/scripts/addons
--   branch: blender-v3.4-release
+-   branch: master
 commit_id: HEAD
 path: release/scripts/addons_contrib
--   branch: blender-v3.4-release
+-   branch: master
 commit_id: HEAD
 path: release/datafiles/locale
--   branch: blender-v3.4-release
+-   branch: master
 commit_id: HEAD
 path: source/tools
 svn:
 libraries:
 darwin-arm64:
-branch: tags/blender-3.4-release
+branch: trunk
 commit_id: HEAD
 path: lib/darwin_arm64
 darwin-x86_64:
-branch: tags/blender-3.4-release
+branch: trunk
 commit_id: HEAD
 path: lib/darwin
 linux-x86_64:
-branch: tags/blender-3.4-release
+branch: trunk
 commit_id: HEAD
 path: lib/linux_centos7_x86_64
 windows-amd64:
-branch: tags/blender-3.4-release
+branch: trunk
 commit_id: HEAD
 path: lib/win64_vc15
 tests:
-branch: tags/blender-3.4-release
+branch: trunk
 commit_id: HEAD
 path: lib/tests
 benchmarks:
diff --git a/source/blender/blenkernel/BKE_blender_version.h 
b/source/blender/blenkernel/BKE_blender_version.h
index 82b75d5b598..4bffa5492b5 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -21,7 +21,7 @@ extern "C" {
 /* Blender patch version for bugfix releases. */
 #define BLENDER_VERSION_PATCH 0
 /** Blender release cycle stage: alpha/beta/rc/release. */
-#define BLENDER_VERSION_CYCLE beta
+#define BLENDER_VERSION_CYCLE alpha
 
 /* Blender file format version. */
 #define BLENDER_FILE_VERSION BLENDER_VERSION

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [31c52bc34ef] master: Merge branch 'blender-v3.4-release'

[Thomas Dinges]

Commit: 31c52bc34efa91da895f7aa5cff86d0274858141
Author: Thomas Dinges
Date:   Thu Nov 3 10:12:17 2022 +0100
Branches: master
https://developer.blender.org/rB31c52bc34efa91da895f7aa5cff86d0274858141

Merge branch 'blender-v3.4-release'

===



===



___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [ba8754cf112] master: Blender 3.5 Alpha: Start of new release cycle.

[Thomas Dinges]

Commit: ba8754cf1122d911dd804c330e1a9c423ba2c918
Author: Thomas Dinges
Date:   Thu Nov 3 10:11:13 2022 +0100
Branches: master
https://developer.blender.org/rBba8754cf1122d911dd804c330e1a9c423ba2c918

Blender 3.5 Alpha: Start of new release cycle.

===

M   doc/doxygen/Doxyfile
M   source/blender/blenkernel/BKE_blender_version.h

===

diff --git a/doc/doxygen/Doxyfile b/doc/doxygen/Doxyfile
index 18c16a60993..e1d8ac39bcf 100644
--- a/doc/doxygen/Doxyfile
+++ b/doc/doxygen/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME   = Blender
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER = V3.4
+PROJECT_NUMBER = V3.5
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/source/blender/blenkernel/BKE_blender_version.h 
b/source/blender/blenkernel/BKE_blender_version.h
index 1a642cf4eb3..4bffa5492b5 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -17,7 +17,7 @@ extern "C" {
  */
 
 /* Blender major and minor version. */
-#define BLENDER_VERSION 304
+#define BLENDER_VERSION 305
 /* Blender patch version for bugfix releases. */
 #define BLENDER_VERSION_PATCH 0
 /** Blender release cycle stage: alpha/beta/rc/release. */
@@ -25,7 +25,7 @@ extern "C" {
 
 /* Blender file format version. */
 #define BLENDER_FILE_VERSION BLENDER_VERSION
-#define BLENDER_FILE_SUBVERSION 6
+#define BLENDER_FILE_SUBVERSION 0
 
 /* Minimum Blender version that supports reading file written with the current
  * version. Older Blender versions will test this and show a warning if the 
file

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [666135c32af] blender-v3.4-release: Blender 3.4 - Beta

[Thomas Dinges]

Commit: 666135c32af3032d1e6c62ee953d65f399da7d0f
Author: Thomas Dinges
Date:   Thu Nov 3 10:08:10 2022 +0100
Branches: blender-v3.4-release
https://developer.blender.org/rB666135c32af3032d1e6c62ee953d65f399da7d0f

Blender 3.4 - Beta

* BLENDER_VERSION_CYCLE set to beta
* Update pipeline_config.yaml to point to 3.2 branches and svn tags
* Update and uncomment BLENDER_VERSION in download.cmake

===

M   build_files/build_environment/cmake/download.cmake
M   build_files/config/pipeline_config.yaml
M   source/blender/blenkernel/BKE_blender_version.h

===

diff --git a/build_files/build_environment/cmake/download.cmake 
b/build_files/build_environment/cmake/download.cmake
index 8d75f0ff0ed..5db1a4e56fa 100644
--- a/build_files/build_environment/cmake/download.cmake
+++ b/build_files/build_environment/cmake/download.cmake
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 ## Update and uncomment this in the release branch
-# set(BLENDER_VERSION 3.1)
+set(BLENDER_VERSION 3.4)
 
 function(download_source dep)
   set(TARGET_FILE ${${dep}_FILE})
diff --git a/build_files/config/pipeline_config.yaml 
b/build_files/config/pipeline_config.yaml
index 3359f89c41e..7c8f15de777 100644
--- a/build_files/config/pipeline_config.yaml
+++ b/build_files/config/pipeline_config.yaml
@@ -5,38 +5,38 @@
 update-code:
 git:
 submodules:
--   branch: master
+-   branch: blender-v3.4-release
 commit_id: HEAD
 path: release/scripts/addons
--   branch: master
+-   branch: blender-v3.4-release
 commit_id: HEAD
 path: release/scripts/addons_contrib
--   branch: master
+-   branch: blender-v3.4-release
 commit_id: HEAD
 path: release/datafiles/locale
--   branch: master
+-   branch: blender-v3.4-release
 commit_id: HEAD
 path: source/tools
 svn:
 libraries:
 darwin-arm64:
-branch: trunk
+branch: tags/blender-3.4-release
 commit_id: HEAD
 path: lib/darwin_arm64
 darwin-x86_64:
-branch: trunk
+branch: tags/blender-3.4-release
 commit_id: HEAD
 path: lib/darwin
 linux-x86_64:
-branch: trunk
+branch: tags/blender-3.4-release
 commit_id: HEAD
 path: lib/linux_centos7_x86_64
 windows-amd64:
-branch: trunk
+branch: tags/blender-3.4-release
 commit_id: HEAD
 path: lib/win64_vc15
 tests:
-branch: trunk
+branch: tags/blender-3.4-release
 commit_id: HEAD
 path: lib/tests
 benchmarks:
diff --git a/source/blender/blenkernel/BKE_blender_version.h 
b/source/blender/blenkernel/BKE_blender_version.h
index 1a642cf4eb3..a7150913290 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -21,7 +21,7 @@ extern "C" {
 /* Blender patch version for bugfix releases. */
 #define BLENDER_VERSION_PATCH 0
 /** Blender release cycle stage: alpha/beta/rc/release. */
-#define BLENDER_VERSION_CYCLE alpha
+#define BLENDER_VERSION_CYCLE beta
 
 /* Blender file format version. */
 #define BLENDER_FILE_VERSION BLENDER_VERSION

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] SVN commit: bf-blender [63085] tags/blender-3.4-release/lib/: Copy libs to Blender 3.4 tag

[Thomas Dinges]

Revision: 63085
  https://developer.blender.org/rBL63085
Author:   dingto
Date: 2022-11-03 09:44:09 +0100 (Thu, 03 Nov 2022)
Log Message:
---
Copy libs to Blender 3.4 tag

Added Paths:
---
tags/blender-3.4-release/lib/

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] SVN commit: bf-blender [63084] tags/blender-3.4-release/: Create tag for Blender 3.4

[Thomas Dinges]

Revision: 63084
  https://developer.blender.org/rBL63084
Author:   dingto
Date: 2022-11-03 09:43:42 +0100 (Thu, 03 Nov 2022)
Log Message:
---
Create tag for Blender 3.4

Added Paths:
---
tags/blender-3.4-release/

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [b292cfe5a93] blender-v3.3-release: Bump version cycle for Blender 3.3.1 release.

[Thomas Dinges]

Commit: b292cfe5a936f816f9a3567b39995ba3c7b82f8a
Author: Thomas Dinges
Date:   Tue Oct 4 20:35:22 2022 +0200
Branches: blender-v3.3-release
https://developer.blender.org/rBb292cfe5a936f816f9a3567b39995ba3c7b82f8a

Bump version cycle for Blender 3.3.1 release.

===

M   source/blender/blenkernel/BKE_blender_version.h

===

diff --git a/source/blender/blenkernel/BKE_blender_version.h 
b/source/blender/blenkernel/BKE_blender_version.h
index fce340ae5f2..e0efb95c094 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -21,7 +21,7 @@ extern "C" {
 /* Blender patch version for bugfix releases. */
 #define BLENDER_VERSION_PATCH 1
 /** Blender release cycle stage: alpha/beta/rc/release. */
-#define BLENDER_VERSION_CYCLE rc
+#define BLENDER_VERSION_CYCLE release
 
 /* Blender file format version. */
 #define BLENDER_FILE_VERSION BLENDER_VERSION

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [d52a0fa1159] blender-v2.93-release: Bump version cycle for Blender 2.93.11 release.

[Thomas Dinges]

Commit: d52a0fa1159580137e37403eca54ef931805ad9b
Author: Thomas Dinges
Date:   Tue Oct 4 20:12:35 2022 +0200
Branches: blender-v2.93-release
https://developer.blender.org/rBd52a0fa1159580137e37403eca54ef931805ad9b

Bump version cycle for Blender 2.93.11 release.

===

M   source/blender/blenkernel/BKE_blender_version.h

===

diff --git a/source/blender/blenkernel/BKE_blender_version.h 
b/source/blender/blenkernel/BKE_blender_version.h
index 13318b92a29..edcbc6949cc 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -35,7 +35,7 @@ extern "C" {
 /* Blender patch version for bugfix releases. */
 #define BLENDER_VERSION_PATCH 11
 /** Blender release cycle stage: alpha/beta/rc/release. */
-#define BLENDER_VERSION_CYCLE rc
+#define BLENDER_VERSION_CYCLE release
 
 /* Blender file format version. */
 #define BLENDER_FILE_VERSION BLENDER_VERSION

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [697b447c206] master: Metal: MTLContext implementation and immediate mode rendering support.

[Thomas Dinges]

Commit: 697b447c2069aa9929aab0ea1f66ef8bf4d0
Author: Thomas Dinges
Date:   Thu Sep 22 17:27:51 2022 +0200
Branches: master
https://developer.blender.org/rB697b447c2069aa9929aab0ea1f66ef8bf4d0

Metal: MTLContext implementation and immediate mode rendering support.

MTLContext provides functionality for command encoding, binding management and 
graphics device management. MTLImmediate provides simple draw enablement with 
dynamically encoded data. These draws utilise temporary scratch buffer memory 
to provide minimal bandwidth overhead during workload submission.

This patch also contains empty placeholders for MTLBatch and MTLDrawList to 
enable testing of first pixels on-screen without failure.

The Metal API also requires access to the GHOST_Context to ensure the same 
pre-initialized Metal GPU device is used by the viewport. Given the explicit 
nature of Metal, explicit control is also needed over presentation, to ensure 
correct work scheduling and rendering pipeline state.

Authored by Apple: Michael Parkin-White

Ref T96261

(The diff is based on 043f59cb3b5835ba1a0bbf6f1cbad080b527f7f6)

Reviewed By: fclem

Differential Revision: https://developer.blender.org/D15953

===

M   intern/ghost/intern/GHOST_Context.h
M   intern/ghost/intern/GHOST_ContextCGL.h
M   intern/ghost/intern/GHOST_ContextCGL.mm
M   intern/ghost/intern/GHOST_Window.cpp
M   intern/ghost/intern/GHOST_Window.h
M   intern/ghost/test/multitest/MultiTest.c
M   source/blender/draw/DRW_engine.h
M   source/blender/draw/engines/eevee/eevee_lightcache.c
M   source/blender/draw/engines/eevee_next/eevee_shader.cc
M   source/blender/draw/intern/DRW_render.h
M   source/blender/draw/intern/draw_manager.c
M   source/blender/draw/intern/draw_manager_shader.c
M   source/blender/gpu/CMakeLists.txt
M   source/blender/gpu/GPU_context.h
M   source/blender/gpu/GPU_material.h
M   source/blender/gpu/intern/gpu_backend.hh
M   source/blender/gpu/intern/gpu_codegen.cc
M   source/blender/gpu/intern/gpu_codegen.h
M   source/blender/gpu/intern/gpu_context.cc
M   source/blender/gpu/intern/gpu_material.c
M   source/blender/gpu/intern/gpu_node_graph.c
M   source/blender/gpu/intern/gpu_node_graph.h
M   source/blender/gpu/intern/gpu_shader_builder.cc
M   source/blender/gpu/intern/gpu_shader_interface.cc
M   source/blender/gpu/metal/mtl_backend.hh
M   source/blender/gpu/metal/mtl_backend.mm
A   source/blender/gpu/metal/mtl_batch.hh
M   source/blender/gpu/metal/mtl_command_buffer.mm
M   source/blender/gpu/metal/mtl_common.hh
M   source/blender/gpu/metal/mtl_context.hh
M   source/blender/gpu/metal/mtl_context.mm
A   source/blender/gpu/metal/mtl_drawlist.hh
A   source/blender/gpu/metal/mtl_immediate.hh
A   source/blender/gpu/metal/mtl_immediate.mm
M   source/blender/gpu/metal/mtl_memory.hh
M   source/blender/gpu/metal/mtl_shader.hh
M   source/blender/gpu/metal/mtl_shader.mm
M   source/blender/gpu/metal/mtl_shader_generator.mm
M   source/blender/gpu/metal/mtl_texture.mm
M   source/blender/gpu/metal/mtl_texture_util.mm
M   source/blender/gpu/opengl/gl_backend.hh
M   source/blender/gpu/tests/gpu_testing.cc
M   source/blender/render/intern/pipeline.cc
M   source/blender/windowmanager/intern/wm_playanim.c
M   source/blender/windowmanager/intern/wm_window.c

===

diff --git a/intern/ghost/intern/GHOST_Context.h 
b/intern/ghost/intern/GHOST_Context.h
index 3546fb6bbc7..04d445e7f85 100644
--- a/intern/ghost/intern/GHOST_Context.h
+++ b/intern/ghost/intern/GHOST_Context.h
@@ -36,19 +36,19 @@ class GHOST_Context : public GHOST_IContext {
* Swaps front and back buffers of a window.
* \return A boolean success indicator.
*/
-  virtual GHOST_TSuccess swapBuffers() = 0;
+  virtual GHOST_TSuccess swapBuffers() override = 0;
 
   /**
* Activates the drawing context of this window.
* \return A boolean success indicator.
*/
-  virtual GHOST_TSuccess activateDrawingContext() = 0;
+  virtual GHOST_TSuccess activateDrawingContext() override = 0;
 
   /**
* Release the drawing context of the calling thread.
* \return A boolean success indicator.
*/
-  virtual GHOST_TSuccess releaseDrawingContext() = 0;
+  virtual GHOST_TSuccess releaseDrawingContext() override = 0;
 
   /**
* Call immediately after new to initialize.  If this fails then immediately 
delete the object.
@@ -130,7 +130,7 @@ class GHOST_Context : public GHOST_IContext {
* Gets the OpenGL frame-buffer associated with the OpenGL context
* \return The ID of an OpenGL frame-buffer object.
*/
-  virtual unsigned int getDefaultFramebuffer()
+  virtual unsigned int getDefaultFramebuffer() override
   {
 return 0;
   }
diff --git a/intern/ghost/intern/GHOST_ContextCGL.h 
b

[Bf-blender-cvs] [bb63b98d1ff] master: Metal: MTLVertBuf implementation and support for texture creation from vertex buffers.

[Thomas Dinges]

Commit: bb63b98d1ff5acfd24dff9b5e72175f82f5bca26
Author: Thomas Dinges
Date:   Thu Sep 22 17:13:07 2022 +0200
Branches: master
https://developer.blender.org/rBbb63b98d1ff5acfd24dff9b5e72175f82f5bca26

Metal: MTLVertBuf implementation and support for texture creation from vertex 
buffers.

Metal: MTLVertBuf implementation and support for texture creation from vertex 
buffers.

Authored by Apple: Michael Parkin-White

Reviewed By: fclem

Maniphest Tasks: T96261

Differential Revision: https://developer.blender.org/D15452

===

M   source/blender/gpu/CMakeLists.txt
M   source/blender/gpu/metal/mtl_backend.mm
M   source/blender/gpu/metal/mtl_texture.hh
M   source/blender/gpu/metal/mtl_texture.mm
A   source/blender/gpu/metal/mtl_vertex_buffer.hh
A   source/blender/gpu/metal/mtl_vertex_buffer.mm

===

diff --git a/source/blender/gpu/CMakeLists.txt 
b/source/blender/gpu/CMakeLists.txt
index 8b38c22ae28..18da5169620 100644
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@ -202,6 +202,7 @@ set(METAL_SRC
   metal/mtl_texture.mm
   metal/mtl_texture_util.mm
   metal/mtl_uniform_buffer.mm
+  metal/mtl_vertex_buffer.mm
 
   metal/mtl_backend.hh
   metal/mtl_capabilities.hh
@@ -222,6 +223,7 @@ set(METAL_SRC
   metal/mtl_state.hh
   metal/mtl_texture.hh
   metal/mtl_uniform_buffer.hh
+  metal/mtl_vertex_buffer.hh
 )
 
 # Select Backend source based on availability
diff --git a/source/blender/gpu/metal/mtl_backend.mm 
b/source/blender/gpu/metal/mtl_backend.mm
index 3cd7794f6c9..ec9e8ab4d15 100644
--- a/source/blender/gpu/metal/mtl_backend.mm
+++ b/source/blender/gpu/metal/mtl_backend.mm
@@ -14,6 +14,7 @@
 #include "mtl_query.hh"
 #include "mtl_shader.hh"
 #include "mtl_uniform_buffer.hh"
+#include "mtl_vertex_buffer.hh"
 
 #include "gpu_capabilities_private.hh"
 #include "gpu_platform_private.hh"
@@ -94,8 +95,7 @@ StorageBuf *MTLBackend::storagebuf_alloc(int size, 
GPUUsageType usage, const cha
 
 VertBuf *MTLBackend::vertbuf_alloc()
 {
-  /* TODO(Metal): Implement MTLVertBuf. */
-  return nullptr;
+  return new MTLVertBuf();
 }
 
 void MTLBackend::render_begin()
diff --git a/source/blender/gpu/metal/mtl_texture.hh 
b/source/blender/gpu/metal/mtl_texture.hh
index 766f01d9018..88d09e4e133 100644
--- a/source/blender/gpu/metal/mtl_texture.hh
+++ b/source/blender/gpu/metal/mtl_texture.hh
@@ -200,7 +200,7 @@ class MTLTexture : public Texture {
 TEXTURE_VIEW_SWIZZLE_DIRTY = (1 << 0),
 TEXTURE_VIEW_MIP_DIRTY = (1 << 1)
   };
-  id mip_swizzle_view_;
+  id mip_swizzle_view_ = nil;
   char tex_swizzle_mask_[4];
   MTLTextureSwizzleChannels mtl_swizzle_mask_;
   bool mip_range_dirty_ = false;
@@ -216,7 +216,6 @@ class MTLTexture : public Texture {
   /* VBO. */
   MTLVertBuf *vert_buffer_;
   id vert_buffer_mtl_;
-  int vert_buffer_offset_;
 
   /* Core parameters and sub-resources. */
   eGPUTextureUsage gpu_image_usage_flags_;
@@ -256,6 +255,14 @@ class MTLTexture : public Texture {
 return name_;
   }
 
+  id get_vertex_buffer() const
+  {
+if (resource_mode_ == MTL_TEXTURE_MODE_VBO) {
+  return vert_buffer_mtl_;
+}
+return nil;
+  }
+
  protected:
   bool init_internal() override;
   bool init_internal(GPUVertBuf *vbo) override;
@@ -324,8 +331,6 @@ class MTLTexture : public Texture {
 int height);
   GPUFrameBuffer *get_blit_framebuffer(uint dst_slice, uint dst_mip);
 
-  MEM_CXX_CLASS_ALLOC_FUNCS("gpu::MTLTexture")
-
   /* Texture Update function Utilities. */
   /* Metal texture updating does not provide the same range of functionality 
for type conversion
* and format compatibility as are available in OpenGL. To achieve the same 
level of
@@ -415,6 +420,8 @@ class MTLTexture : public Texture {
 
   /* fullscreen blit utilities. */
   GPUShader *fullscreen_blit_sh_get();
+
+  MEM_CXX_CLASS_ALLOC_FUNCS("MTLTexture")
 };
 
 /* Utility */
diff --git a/source/blender/gpu/metal/mtl_texture.mm 
b/source/blender/gpu/metal/mtl_texture.mm
index 2b7c2333bff..4af46c13751 100644
--- a/source/blender/gpu/metal/mtl_texture.mm
+++ b/source/blender/gpu/metal/mtl_texture.mm
@@ -20,6 +20,7 @@
 #include "mtl_context.hh"
 #include "mtl_debug.hh"
 #include "mtl_texture.hh"
+#include "mtl_vertex_buffer.hh"
 
 #include "GHOST_C-api.h"
 
@@ -50,7 +51,6 @@ void gpu::MTLTexture::mtl_texture_init()
   /* VBO. */
   vert_buffer_ = nullptr;
   vert_buffer_mtl_ = nil;
-  vert_buffer_offset_ = -1;
 
   /* Default Swizzle. */
   tex_swizzle_mask_[0] = 'r';
@@ -169,26 +169,39 @@ void gpu::MTLTexture::bake_mip_swizzle_view()
 id gpu::MTLTexture::get_metal_handle()
 {
 
-  /* ensure up to date and baked. */
-  this->ensure_baked();
-
   /* Verify VBO texture shares same buffer. */
   if (res

[Bf-blender-cvs] [64b10c43c4d] blender-v3.3-release: Blender 3.3 release version bump.

[Thomas Dinges]

Commit: 64b10c43c4d94d83931974e61d26cae50ec49825
Author: Thomas Dinges
Date:   Tue Sep 6 16:34:45 2022 +0200
Branches: blender-v3.3-release
https://developer.blender.org/rB64b10c43c4d94d83931974e61d26cae50ec49825

Blender 3.3 release version bump.

Branch is frozen now and in Bcon5.

===

M   source/blender/blenkernel/BKE_blender_version.h

===

diff --git a/source/blender/blenkernel/BKE_blender_version.h 
b/source/blender/blenkernel/BKE_blender_version.h
index 9cfbc5355d7..d9337199d77 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -21,7 +21,7 @@ extern "C" {
 /* Blender patch version for bugfix releases. */
 #define BLENDER_VERSION_PATCH 0
 /** Blender release cycle stage: alpha/beta/rc/release. */
-#define BLENDER_VERSION_CYCLE rc
+#define BLENDER_VERSION_CYCLE release
 
 /* Blender file format version. */
 #define BLENDER_FILE_VERSION BLENDER_VERSION

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [cc8ea6ac67a] master: Metal: MTLShader and MTLShaderGenerator implementation.

[Thomas Dinges]

Commit: cc8ea6ac67a108fcb96e4a8373ac02faf9ccea3d
Author: Thomas Dinges
Date:   Thu Sep 1 22:22:32 2022 +0200
Branches: master
https://developer.blender.org/rBcc8ea6ac67a108fcb96e4a8373ac02faf9ccea3d

Metal: MTLShader and MTLShaderGenerator implementation.

Full support for translation and compilation of shaders in Metal, using
GPUShaderCreateInfo. Includes render pipeline state creation and management,
enabling all standard GPU viewport rendering features in Metal.

Authored by Apple: Michael Parkin-White, Marco Giordano

Ref T96261

Reviewed By: fclem

Maniphest Tasks: T96261

Differential Revision: https://developer.blender.org/D15563

===

M   source/blender/gpu/CMakeLists.txt
M   source/blender/gpu/GPU_capabilities.h
M   source/blender/gpu/GPU_shader_shared_utils.h
M   source/blender/gpu/intern/gpu_context.cc
M   source/blender/gpu/intern/gpu_context_private.hh
M   source/blender/gpu/intern/gpu_shader.cc
M   source/blender/gpu/intern/gpu_shader_create_info.hh
M   source/blender/gpu/metal/kernels/compute_texture_read.msl
M   source/blender/gpu/metal/kernels/compute_texture_update.msl
M   source/blender/gpu/metal/kernels/depth_2d_update_float_frag.glsl
A   source/blender/gpu/metal/kernels/depth_2d_update_info.hh
M   source/blender/gpu/metal/kernels/depth_2d_update_int24_frag.glsl
M   source/blender/gpu/metal/kernels/depth_2d_update_int32_frag.glsl
M   source/blender/gpu/metal/kernels/depth_2d_update_vert.glsl
M   source/blender/gpu/metal/kernels/gpu_shader_fullscreen_blit_frag.glsl
A   source/blender/gpu/metal/kernels/gpu_shader_fullscreen_blit_info.hh
M   source/blender/gpu/metal/kernels/gpu_shader_fullscreen_blit_vert.glsl
M   source/blender/gpu/metal/mtl_backend.mm
M   source/blender/gpu/metal/mtl_capabilities.hh
M   source/blender/gpu/metal/mtl_common.hh
M   source/blender/gpu/metal/mtl_context.hh
M   source/blender/gpu/metal/mtl_context.mm
M   source/blender/gpu/metal/mtl_memory.mm
A   source/blender/gpu/metal/mtl_primitive.hh
A   source/blender/gpu/metal/mtl_pso_descriptor_state.hh
A   source/blender/gpu/metal/mtl_shader.hh
A   source/blender/gpu/metal/mtl_shader.mm
A   source/blender/gpu/metal/mtl_shader_generator.hh
A   source/blender/gpu/metal/mtl_shader_generator.mm
A   source/blender/gpu/metal/mtl_shader_interface.hh
A   source/blender/gpu/metal/mtl_shader_interface.mm
A   source/blender/gpu/metal/mtl_shader_interface_type.hh
A   source/blender/gpu/metal/mtl_shader_shared.h
M   source/blender/gpu/metal/mtl_state.hh
M   source/blender/gpu/metal/mtl_state.mm
M   source/blender/gpu/metal/mtl_texture.hh
M   source/blender/gpu/metal/mtl_texture.mm
M   source/blender/gpu/metal/mtl_texture_util.mm
M   source/blender/gpu/opengl/gl_backend.cc
A   source/blender/gpu/shaders/metal/mtl_shader_common.msl
A   source/blender/gpu/shaders/metal/mtl_shader_defines.msl
M   source/blender/python/gpu/gpu_py_shader_create_info.cc

===

diff --git a/source/blender/gpu/CMakeLists.txt 
b/source/blender/gpu/CMakeLists.txt
index 6758b4b8794..979bfc63572 100644
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@ -194,6 +194,9 @@ set(METAL_SRC
   metal/mtl_index_buffer.mm
   metal/mtl_memory.mm
   metal/mtl_query.mm
+  metal/mtl_shader.mm
+  metal/mtl_shader_generator.mm
+  metal/mtl_shader_interface.mm
   metal/mtl_state.mm
   metal/mtl_texture.mm
   metal/mtl_texture_util.mm
@@ -207,7 +210,14 @@ set(METAL_SRC
   metal/mtl_framebuffer.hh
   metal/mtl_index_buffer.hh
   metal/mtl_memory.hh
+  metal/mtl_pso_descriptor_state.hh
+  metal/mtl_primitive.hh
   metal/mtl_query.hh
+  metal/mtl_shader.hh
+  metal/mtl_shader_generator.hh
+  metal/mtl_shader_interface_type.hh
+  metal/mtl_shader_interface.hh
+  metal/mtl_shader_shared.h
   metal/mtl_state.hh
   metal/mtl_texture.hh
   metal/mtl_uniform_buffer.hh
@@ -227,6 +237,9 @@ set(LIB
 )
 
 set(MSL_SRC
+  shaders/metal/mtl_shader_defines.msl
+  shaders/metal/mtl_shader_common.msl
+
   metal/kernels/compute_texture_update.msl
   metal/kernels/compute_texture_read.msl
   metal/kernels/depth_2d_update_float_frag.glsl
@@ -458,21 +471,44 @@ set(GLSL_SRC
   GPU_shader_shared_utils.h
 )
 
-set(GLSL_C)
-foreach(GLSL_FILE ${GLSL_SRC})
-  data_to_c_simple(${GLSL_FILE} GLSL_C)
-endforeach()
+set(MTL_BACKEND_GLSL_SRC
+  metal/kernels/compute_texture_update.msl
+  metal/kernels/compute_texture_read.msl
+  metal/kernels/depth_2d_update_float_frag.glsl
+  metal/kernels/depth_2d_update_int24_frag.glsl
+  metal/kernels/depth_2d_update_int32_frag.glsl
+  metal/kernels/depth_2d_update_vert.glsl
+  metal/kernels/gpu_shader_fullscreen_blit_vert.glsl
+  metal/kernels/gpu_shader_fullscreen_blit_frag.glsl
+)
 
+set(MSL_SRC
+  shaders/metal/mtl_shader_defines.msl
+  shaders/metal

[Bf-blender-cvs] [097ed6565ed] master: Merge branch 'blender-v3.3-release'

[Thomas Dinges]

Commit: 097ed6565edd27c8178a764fe6dbacb1ba75ef52
Author: Thomas Dinges
Date:   Wed Aug 31 16:10:59 2022 +0200
Branches: master
https://developer.blender.org/rB097ed6565edd27c8178a764fe6dbacb1ba75ef52

Merge branch 'blender-v3.3-release'

===



===



___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [d4d14df38ce] blender-v3.3-release: Release schedule: Blender 3.3 RC

[Thomas Dinges]

Commit: d4d14df38cef5ebbe6d2c40c66e6857bd67da03d
Author: Thomas Dinges
Date:   Wed Aug 31 16:08:26 2022 +0200
Branches: blender-v3.3-release
https://developer.blender.org/rBd4d14df38cef5ebbe6d2c40c66e6857bd67da03d

Release schedule: Blender 3.3 RC

The branch is now in Bcon4, critical bug fixes only.

===

M   source/blender/blenkernel/BKE_blender_version.h

===

diff --git a/source/blender/blenkernel/BKE_blender_version.h 
b/source/blender/blenkernel/BKE_blender_version.h
index 2067730faca..9cfbc5355d7 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -21,7 +21,7 @@ extern "C" {
 /* Blender patch version for bugfix releases. */
 #define BLENDER_VERSION_PATCH 0
 /** Blender release cycle stage: alpha/beta/rc/release. */
-#define BLENDER_VERSION_CYCLE beta
+#define BLENDER_VERSION_CYCLE rc
 
 /* Blender file format version. */
 #define BLENDER_FILE_VERSION BLENDER_VERSION

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [caa352bc459] master: Merge branch 'blender-v3.3-release'

[Thomas Dinges]

Commit: caa352bc459113e449298ce2ff1505118230e061
Author: Thomas Dinges
Date:   Wed Aug 31 09:44:15 2022 +0200
Branches: master
https://developer.blender.org/rBcaa352bc459113e449298ce2ff1505118230e061

Merge branch 'blender-v3.3-release'

===



===



___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [e2deee73abf] blender-v3.3-release: Update freedesktop file.

[Thomas Dinges]

Commit: e2deee73abf3fe5885aefa131c337f3b0d6762d6
Author: Thomas Dinges
Date:   Wed Aug 31 09:42:17 2022 +0200
Branches: blender-v3.3-release
https://developer.blender.org/rBe2deee73abf3fe5885aefa131c337f3b0d6762d6

Update freedesktop file.

Add new features for upcoming Blender 3.3 and also missing 3.2 notes, which 
were not merged to master.

===

M   release/freedesktop/org.blender.Blender.appdata.xml

===

diff --git a/release/freedesktop/org.blender.Blender.appdata.xml 
b/release/freedesktop/org.blender.Blender.appdata.xml
index 12291860050..0f1aa5099b6 100644
--- a/release/freedesktop/org.blender.Blender.appdata.xml
+++ b/release/freedesktop/org.blender.Blender.appdata.xml
@@ -40,6 +40,47 @@
 
 
 
+
+
+New features:
+
+New hair system
+Cycles Rendering on Intel Arc GPUs
+Grease Pencil Light and Shadow calculations
+Motion Tracker Image Plane Marker
+
+Enhancements:
+
+Faster Line Art loading time
+Library Overrides improvements
+Massive performance gains importing large amounts of 
objects in USD, Alembic, and OBJ
+UV improvements
+Improved sculpting performance in EEVEE
+Cycles GPU rendering improvements for AMD GPUs and 
Apple Silicon
+
+
+
+
+
+New features:
+
+Cycles Light Groups
+Cycles Shadow Caustics using Manifold Next Event 
Estimation
+New Tools and usability improvements for Polygon 
Painting
+More Geometry Nodes, including Duplicate Elements
+Asset Browser: Support for Asset Collections
+
+Enhancements:
+
+Enhanced channels in the video sequencer
+Support for WebP format
+New experimental OBJ importer
+Motion Paths improvements
+Grease Pencil Envelope Modifier
+New Curve Pen Tool
+
+
+
 
 
 New features:

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [0a65e1a8e7a] blender-v2.93-release: Release cycle: Blender 2.93.10 release.

[Thomas Dinges]

Commit: 0a65e1a8e7a95544cb36755a7a661cb86afafa64
Author: Thomas Dinges
Date:   Tue Aug 2 20:21:24 2022 +0200
Branches: blender-v2.93-release
https://developer.blender.org/rB0a65e1a8e7a95544cb36755a7a661cb86afafa64

Release cycle: Blender 2.93.10 release.

===

M   source/blender/blenkernel/BKE_blender_version.h

===

diff --git a/source/blender/blenkernel/BKE_blender_version.h 
b/source/blender/blenkernel/BKE_blender_version.h
index d9173a1b04c..c31701eba4f 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -35,7 +35,7 @@ extern "C" {
 /* Blender patch version for bugfix releases. */
 #define BLENDER_VERSION_PATCH 10
 /** Blender release cycle stage: alpha/beta/rc/release. */
-#define BLENDER_VERSION_CYCLE rc
+#define BLENDER_VERSION_CYCLE release
 
 /* Blender file format version. */
 #define BLENDER_FILE_VERSION BLENDER_VERSION

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [bcfdb14560e] blender-v3.2-release: Release cycle: Blender 3.2.2 release

[Thomas Dinges]

Commit: bcfdb14560e77891d674c2701a5071a7c07baba3
Author: Thomas Dinges
Date:   Tue Aug 2 20:15:17 2022 +0200
Branches: blender-v3.2-release
https://developer.blender.org/rBbcfdb14560e77891d674c2701a5071a7c07baba3

Release cycle: Blender 3.2.2 release

===

M   source/blender/blenkernel/BKE_blender_version.h

===

diff --git a/source/blender/blenkernel/BKE_blender_version.h 
b/source/blender/blenkernel/BKE_blender_version.h
index 6dceeef5312..3285d45a291 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -21,7 +21,7 @@ extern "C" {
 /* Blender patch version for bugfix releases. */
 #define BLENDER_VERSION_PATCH 2
 /** Blender release cycle stage: alpha/beta/rc/release. */
-#define BLENDER_VERSION_CYCLE rc
+#define BLENDER_VERSION_CYCLE release
 
 /* Blender file format version. */
 #define BLENDER_FILE_VERSION BLENDER_VERSION

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [37ebd665709] master: Revert "Blender 3.3 - Beta"

[Thomas Dinges]

Commit: 37ebd6657090b19003a5d9d2b018e4752311df0a
Author: Thomas Dinges
Date:   Wed Jul 27 17:32:05 2022 +0200
Branches: master
https://developer.blender.org/rB37ebd6657090b19003a5d9d2b018e4752311df0a

Revert "Blender 3.3 - Beta"

This reverts commit 32a9aac3b84f4742937dd8fd2afc14a443cb0248.

===

M   build_files/build_environment/cmake/download.cmake
M   build_files/config/pipeline_config.yaml
M   source/blender/blenkernel/BKE_blender_version.h

===

diff --git a/build_files/build_environment/cmake/download.cmake 
b/build_files/build_environment/cmake/download.cmake
index 76744aa9b0c..547bf77f8dd 100644
--- a/build_files/build_environment/cmake/download.cmake
+++ b/build_files/build_environment/cmake/download.cmake
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 ## Update and uncomment this in the release branch
-set(BLENDER_VERSION 3.3)
+# set(BLENDER_VERSION 3.1)
 
 function(download_source dep)
   set(TARGET_FILE ${${dep}_FILE})
diff --git a/build_files/config/pipeline_config.yaml 
b/build_files/config/pipeline_config.yaml
index aedaf35629b..82cd009ea95 100644
--- a/build_files/config/pipeline_config.yaml
+++ b/build_files/config/pipeline_config.yaml
@@ -5,38 +5,38 @@
 update-code:
 git:
 submodules:
--   branch: blender-v3.3-release
+-   branch: master
 commit_id: HEAD
 path: release/scripts/addons
--   branch: blender-v3.3-release
+-   branch: master
 commit_id: HEAD
 path: release/scripts/addons_contrib
--   branch: blender-v3.3-release
+-   branch: master
 commit_id: HEAD
 path: release/datafiles/locale
--   branch: blender-v3.3-release
+-   branch: master
 commit_id: HEAD
 path: source/tools
 svn:
 libraries:
 darwin-arm64:
-branch: tags/blender-3.3-release
+branch: trunk
 commit_id: HEAD
 path: lib/darwin_arm64
 darwin-x86_64:
-branch: tags/blender-3.3-release
+branch: trunk
 commit_id: HEAD
 path: lib/darwin
 linux-x86_64:
-branch: tags/blender-3.3-release
+branch: trunk
 commit_id: HEAD
 path: lib/linux_centos7_x86_64
 windows-amd64:
-branch: tags/blender-3.3-release
+branch: trunk
 commit_id: HEAD
 path: lib/win64_vc15
 tests:
-branch: tags/blender-3.3-release
+branch: trunk
 commit_id: HEAD
 path: lib/tests
 benchmarks:
diff --git a/source/blender/blenkernel/BKE_blender_version.h 
b/source/blender/blenkernel/BKE_blender_version.h
index 61d51809039..ee9c7a964d9 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -21,7 +21,7 @@ extern "C" {
 /* Blender patch version for bugfix releases. */
 #define BLENDER_VERSION_PATCH 0
 /** Blender release cycle stage: alpha/beta/rc/release. */
-#define BLENDER_VERSION_CYCLE beta
+#define BLENDER_VERSION_CYCLE alpha
 
 /* Blender file format version. */
 #define BLENDER_FILE_VERSION BLENDER_VERSION

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [3b71a62390a] master: Merge branch 'blender-v3.3-release'

[Thomas Dinges]

Commit: 3b71a62390aed9079c5c245b826436e49fa91623
Author: Thomas Dinges
Date:   Wed Jul 27 17:31:49 2022 +0200
Branches: master
https://developer.blender.org/rB3b71a62390aed9079c5c245b826436e49fa91623

Merge branch 'blender-v3.3-release'

===



===



___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [5560da7cebd] master: Revert "Blender 3.3 splashscreen"

[Thomas Dinges]

Commit: 5560da7cebd39360f8ca344b6d04e80c66d2b2f4
Author: Thomas Dinges
Date:   Wed Jul 27 17:32:21 2022 +0200
Branches: master
https://developer.blender.org/rB5560da7cebd39360f8ca344b6d04e80c66d2b2f4

Revert "Blender 3.3 splashscreen"

This reverts commit d61ab45385eba116dbfcbf6c5ccfb997be7e324f.

===

M   release/datafiles/splash.png

===

diff --git a/release/datafiles/splash.png b/release/datafiles/splash.png
index d7c9cdd3a8f..eb1250cf5a5 100644
Binary files a/release/datafiles/splash.png and b/release/datafiles/splash.png 
differ

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [d61ab45385e] blender-v3.3-release: Blender 3.3 splashscreen

[Thomas Dinges]

Commit: d61ab45385eba116dbfcbf6c5ccfb997be7e324f
Author: Thomas Dinges
Date:   Wed Jul 27 17:25:56 2022 +0200
Branches: blender-v3.3-release
https://developer.blender.org/rBd61ab45385eba116dbfcbf6c5ccfb997be7e324f

Blender 3.3 splashscreen

Credits: Piotr Krynski

===

M   release/datafiles/splash.png

===

diff --git a/release/datafiles/splash.png b/release/datafiles/splash.png
index eb1250cf5a5..d7c9cdd3a8f 100644
Binary files a/release/datafiles/splash.png and b/release/datafiles/splash.png 
differ

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [32a9aac3b84] blender-v3.3-release: Blender 3.3 - Beta

[Thomas Dinges]

Commit: 32a9aac3b84f4742937dd8fd2afc14a443cb0248
Author: Thomas Dinges
Date:   Wed Jul 27 17:14:21 2022 +0200
Branches: blender-v3.3-release
https://developer.blender.org/rB32a9aac3b84f4742937dd8fd2afc14a443cb0248

Blender 3.3 - Beta

* BLENDER_VERSION_CYCLE set to beta
* Update pipeline_config.yaml to point to 3.2 branches and svn tags
* Update and uncomment BLENDER_VERSION in download.cmake

===

M   build_files/build_environment/cmake/download.cmake
M   build_files/config/pipeline_config.yaml
M   source/blender/blenkernel/BKE_blender_version.h

===

diff --git a/build_files/build_environment/cmake/download.cmake 
b/build_files/build_environment/cmake/download.cmake
index 547bf77f8dd..76744aa9b0c 100644
--- a/build_files/build_environment/cmake/download.cmake
+++ b/build_files/build_environment/cmake/download.cmake
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 ## Update and uncomment this in the release branch
-# set(BLENDER_VERSION 3.1)
+set(BLENDER_VERSION 3.3)
 
 function(download_source dep)
   set(TARGET_FILE ${${dep}_FILE})
diff --git a/build_files/config/pipeline_config.yaml 
b/build_files/config/pipeline_config.yaml
index 82cd009ea95..aedaf35629b 100644
--- a/build_files/config/pipeline_config.yaml
+++ b/build_files/config/pipeline_config.yaml
@@ -5,38 +5,38 @@
 update-code:
 git:
 submodules:
--   branch: master
+-   branch: blender-v3.3-release
 commit_id: HEAD
 path: release/scripts/addons
--   branch: master
+-   branch: blender-v3.3-release
 commit_id: HEAD
 path: release/scripts/addons_contrib
--   branch: master
+-   branch: blender-v3.3-release
 commit_id: HEAD
 path: release/datafiles/locale
--   branch: master
+-   branch: blender-v3.3-release
 commit_id: HEAD
 path: source/tools
 svn:
 libraries:
 darwin-arm64:
-branch: trunk
+branch: tags/blender-3.3-release
 commit_id: HEAD
 path: lib/darwin_arm64
 darwin-x86_64:
-branch: trunk
+branch: tags/blender-3.3-release
 commit_id: HEAD
 path: lib/darwin
 linux-x86_64:
-branch: trunk
+branch: tags/blender-3.3-release
 commit_id: HEAD
 path: lib/linux_centos7_x86_64
 windows-amd64:
-branch: trunk
+branch: tags/blender-3.3-release
 commit_id: HEAD
 path: lib/win64_vc15
 tests:
-branch: trunk
+branch: tags/blender-3.3-release
 commit_id: HEAD
 path: lib/tests
 benchmarks:
diff --git a/source/blender/blenkernel/BKE_blender_version.h 
b/source/blender/blenkernel/BKE_blender_version.h
index 605e700dd16..2067730faca 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -21,7 +21,7 @@ extern "C" {
 /* Blender patch version for bugfix releases. */
 #define BLENDER_VERSION_PATCH 0
 /** Blender release cycle stage: alpha/beta/rc/release. */
-#define BLENDER_VERSION_CYCLE alpha
+#define BLENDER_VERSION_CYCLE beta
 
 /* Blender file format version. */
 #define BLENDER_FILE_VERSION BLENDER_VERSION

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [b2dd1f8f013] blender-v3.3-release: Fix build include for rna_curves.c

[Thomas Dinges]

Commit: b2dd1f8f013ec31caf64907fe0fd3cb924dd9a5b
Author: Thomas Dinges
Date:   Wed Jul 27 17:19:15 2022 +0200
Branches: blender-v3.3-release
https://developer.blender.org/rBb2dd1f8f013ec31caf64907fe0fd3cb924dd9a5b

Fix build include for rna_curves.c

* Since curves are no longer experimental, this should be included at any time.

===

M   source/blender/makesrna/intern/CMakeLists.txt

===

diff --git a/source/blender/makesrna/intern/CMakeLists.txt 
b/source/blender/makesrna/intern/CMakeLists.txt
index 778c6a6bfdd..aaadd36341f 100644
--- a/source/blender/makesrna/intern/CMakeLists.txt
+++ b/source/blender/makesrna/intern/CMakeLists.txt
@@ -26,6 +26,7 @@ set(DEFSRC
   rna_context.c
   rna_curve.c
   rna_curveprofile.c
+  rna_curves.c
   rna_depsgraph.c
   rna_dynamicpaint.c
   rna_fcurve.c
@@ -85,7 +86,6 @@ set(DEFSRC
 if(WITH_EXPERIMENTAL_FEATURES)
   add_definitions(-DWITH_SIMULATION_DATABLOCK)
   list(APPEND DEFSRC
-rna_curves.c
 rna_simulation.c
   )
 endif()

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [9015952c9c0] master: Blender 3.4 Alpha: Start of new release cycle.

[Thomas Dinges]

Commit: 9015952c9c0075b46d20204328ac17ee96e54881
Author: Thomas Dinges
Date:   Wed Jul 27 16:53:19 2022 +0200
Branches: master
https://developer.blender.org/rB9015952c9c0075b46d20204328ac17ee96e54881

Blender 3.4 Alpha: Start of new release cycle.

===

M   doc/doxygen/Doxyfile
M   source/blender/blenkernel/BKE_blender_version.h

===

diff --git a/doc/doxygen/Doxyfile b/doc/doxygen/Doxyfile
index 0176a888377..18c16a60993 100644
--- a/doc/doxygen/Doxyfile
+++ b/doc/doxygen/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME   = Blender
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER = V3.3
+PROJECT_NUMBER = V3.4
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/source/blender/blenkernel/BKE_blender_version.h 
b/source/blender/blenkernel/BKE_blender_version.h
index 605e700dd16..ee9c7a964d9 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -17,7 +17,7 @@ extern "C" {
  */
 
 /* Blender major and minor version. */
-#define BLENDER_VERSION 303
+#define BLENDER_VERSION 304
 /* Blender patch version for bugfix releases. */
 #define BLENDER_VERSION_PATCH 0
 /** Blender release cycle stage: alpha/beta/rc/release. */
@@ -25,7 +25,7 @@ extern "C" {
 
 /* Blender file format version. */
 #define BLENDER_FILE_VERSION BLENDER_VERSION
-#define BLENDER_FILE_SUBVERSION 6
+#define BLENDER_FILE_SUBVERSION 0
 
 /* Minimum Blender version that supports reading file written with the current
  * version. Older Blender versions will test this and show a warning if the 
file

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] SVN commit: bf-blender [62987] tags/blender-3.3-release/lib/: Copy libs to 3.3 tag

[Thomas Dinges]

Revision: 62987
  https://developer.blender.org/rBL62987
Author:   dingto
Date: 2022-07-27 16:40:24 +0200 (Wed, 27 Jul 2022)
Log Message:
---
Copy libs to 3.3 tag

Added Paths:
---
tags/blender-3.3-release/lib/

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] SVN commit: bf-blender [62986] tags/blender-3.3-release/: Tagging SVN libs for Blender 3.3.

[Thomas Dinges]

Revision: 62986
  https://developer.blender.org/rBL62986
Author:   dingto
Date: 2022-07-27 16:39:55 +0200 (Wed, 27 Jul 2022)
Log Message:
---
Tagging SVN libs for Blender 3.3.

Added Paths:
---
tags/blender-3.3-release/

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [83362f87bb3] master: Blender 3.3: Finalizing version bump.

[Thomas Dinges]

Commit: 83362f87bb3b1f079a662f87d1343c628fa9ba35
Author: Thomas Dinges
Date:   Wed Jul 27 16:33:49 2022 +0200
Branches: master
https://developer.blender.org/rB83362f87bb3b1f079a662f87d1343c628fa9ba35

Blender 3.3: Finalizing version bump.

===

M   source/blender/blenloader/intern/versioning_300.c
M   source/blender/blenloader/intern/versioning_userdef.c

===

diff --git a/source/blender/blenloader/intern/versioning_300.c 
b/source/blender/blenloader/intern/versioning_300.c
index afcfe185dc5..49b14dc84a6 100644
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@ -864,6 +864,34 @@ void do_versions_after_linking_300(Main *bmain, ReportList 
*UNUSED(reports))
 }
   }
 
+  if (!MAIN_VERSION_ATLEAST(bmain, 303, 6)) {
+/* In the Dope Sheet, for every mode other than Timeline, open the 
Properties panel. */
+LISTBASE_FOREACH (bScreen *, screen, >screens) {
+  LISTBASE_FOREACH (ScrArea *, area, >areabase) {
+LISTBASE_FOREACH (SpaceLink *, sl, >spacedata) {
+  if (sl->spacetype != SPACE_ACTION) {
+continue;
+  }
+
+  /* Skip the timeline, it shouldn't get its Properties panel opened. 
*/
+  SpaceAction *saction = (SpaceAction *)sl;
+  if (saction->mode == SACTCONT_TIMELINE) {
+continue;
+  }
+
+  const bool is_first_space = sl == area->spacedata.first;
+  ListBase *regionbase = is_first_space ? >regionbase : 
>regionbase;
+  ARegion *region = BKE_region_find_in_listbase_by_type(regionbase, 
RGN_TYPE_UI);
+  if (region == NULL) {
+continue;
+  }
+
+  region->flag &= ~RGN_FLAG_HIDDEN;
+}
+  }
+}
+  }
+
   /**
* Versioning code until next subversion bump goes here.
*
@@ -876,34 +904,6 @@ void do_versions_after_linking_300(Main *bmain, ReportList 
*UNUSED(reports))
*/
   {
 /* Keep this block, even when empty. */
-
-{
-  /* In the Dope Sheet, for every mode other than Timeline, open the 
Properties panel. */
-  LISTBASE_FOREACH (bScreen *, screen, >screens) {
-LISTBASE_FOREACH (ScrArea *, area, >areabase) {
-  LISTBASE_FOREACH (SpaceLink *, sl, >spacedata) {
-if (sl->spacetype != SPACE_ACTION) {
-  continue;
-}
-
-/* Skip the timeline, it shouldn't get its Properties panel 
opened. */
-SpaceAction *saction = (SpaceAction *)sl;
-if (saction->mode == SACTCONT_TIMELINE) {
-  continue;
-}
-
-const bool is_first_space = sl == area->spacedata.first;
-ListBase *regionbase = is_first_space ? >regionbase : 
>regionbase;
-ARegion *region = BKE_region_find_in_listbase_by_type(regionbase, 
RGN_TYPE_UI);
-if (region == NULL) {
-  continue;
-}
-
-region->flag &= ~RGN_FLAG_HIDDEN;
-  }
-}
-  }
-}
   }
 }
 
diff --git a/source/blender/blenloader/intern/versioning_userdef.c 
b/source/blender/blenloader/intern/versioning_userdef.c
index 4f62be26196..f8fb3b47570 100644
--- a/source/blender/blenloader/intern/versioning_userdef.c
+++ b/source/blender/blenloader/intern/versioning_userdef.c
@@ -83,6 +83,10 @@ static void do_versions_theme(const UserDef *userdef, bTheme 
*btheme)
 FROM_DEFAULT_V4_UCHAR(space_sequencer.list_text_hi);
   }
 
+  if (!USER_VERSION_ATLEAST(303, 6)) {
+btheme->tui.wcol_view_item = U_theme_default.tui.wcol_view_item;
+  }
+
   /**
* Versioning code until next subversion bump goes here.
*
@@ -94,7 +98,6 @@ static void do_versions_theme(const UserDef *userdef, bTheme 
*btheme)
*/
   {
 /* Keep this block, even when empty. */
-btheme->tui.wcol_view_item = U_theme_default.tui.wcol_view_item;
   }
 
 #undef FROM_DEFAULT_V4_UCHAR

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [a009159314c] blender-v3.2-release: Release cycle: Set to RC for Blender 3.2.2 corrective release.

[Thomas Dinges]

Commit: a009159314c7ff1d9d0b4347433e078339f93c55
Author: Thomas Dinges
Date:   Fri Jul 15 14:34:05 2022 +0200
Branches: blender-v3.2-release
https://developer.blender.org/rBa009159314c7ff1d9d0b4347433e078339f93c55

Release cycle: Set to RC for Blender 3.2.2 corrective release.

===

M   source/blender/blenkernel/BKE_blender_version.h

===

diff --git a/source/blender/blenkernel/BKE_blender_version.h 
b/source/blender/blenkernel/BKE_blender_version.h
index 9d935d76e5f..6dceeef5312 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -19,9 +19,9 @@ extern "C" {
 /* Blender major and minor version. */
 #define BLENDER_VERSION 302
 /* Blender patch version for bugfix releases. */
-#define BLENDER_VERSION_PATCH 1
+#define BLENDER_VERSION_PATCH 2
 /** Blender release cycle stage: alpha/beta/rc/release. */
-#define BLENDER_VERSION_CYCLE release
+#define BLENDER_VERSION_CYCLE rc
 
 /* Blender file format version. */
 #define BLENDER_FILE_VERSION BLENDER_VERSION

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [7bfe60675ef] blender-v3.2-release: Blender 3.2.1: Change version char to release.

[Thomas Dinges]

Commit: 7bfe60675efd0c2db6d79ef3fc2d8574569fcd98
Author: Thomas Dinges
Date:   Tue Jul 5 16:30:24 2022 +0200
Branches: blender-v3.2-release
https://developer.blender.org/rB7bfe60675efd0c2db6d79ef3fc2d8574569fcd98

Blender 3.2.1: Change version char to release.

===

M   source/blender/blenkernel/BKE_blender_version.h

===

diff --git a/source/blender/blenkernel/BKE_blender_version.h 
b/source/blender/blenkernel/BKE_blender_version.h
index 0c2a843bec3..9d935d76e5f 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -21,7 +21,7 @@ extern "C" {
 /* Blender patch version for bugfix releases. */
 #define BLENDER_VERSION_PATCH 1
 /** Blender release cycle stage: alpha/beta/rc/release. */
-#define BLENDER_VERSION_CYCLE rc
+#define BLENDER_VERSION_CYCLE release
 
 /* Blender file format version. */
 #define BLENDER_FILE_VERSION BLENDER_VERSION

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [1b54fd391e5] blender-v3.2-release: Revert "Fix T98773: GPU Subdivision breaks auto selection in UV edit mode"

[Thomas Dinges]

Commit: 1b54fd391e5b2a8fbf9183df8caa15a8a5cb81d2
Author: Thomas Dinges
Date:   Tue Jul 5 16:26:52 2022 +0200
Branches: blender-v3.2-release
https://developer.blender.org/rB1b54fd391e5b2a8fbf9183df8caa15a8a5cb81d2

Revert "Fix T98773: GPU Subdivision breaks auto selection in UV edit mode"

This reverts commit e2c02655c78b2c669468ae568ddf4b17953cc98d.

It caused regression T99323 which is more severe than the original fixed T98773.

===

M   source/blender/draw/intern/draw_cache_extract_mesh_render_data.c

===

diff --git a/source/blender/draw/intern/draw_cache_extract_mesh_render_data.c 
b/source/blender/draw/intern/draw_cache_extract_mesh_render_data.c
index 4fb1b9a7bc7..0a93f346b37 100644
--- a/source/blender/draw/intern/draw_cache_extract_mesh_render_data.c
+++ b/source/blender/draw/intern/draw_cache_extract_mesh_render_data.c
@@ -502,8 +502,8 @@ MeshRenderData *mesh_render_data_create(Object *object,
 
 /* Seems like the mesh_eval_final do not have the right origin indices.
  * Force not mapped in this case. */
-if (use_mapped && do_final && editmesh_eval_final != editmesh_eval_cage) {
-  // mr->edit_bmesh = nullptr;
+if (has_mdata && do_final && editmesh_eval_final != editmesh_eval_cage) {
+  // mr->edit_bmesh = NULL;
   mr->extract_type = MR_EXTRACT_MESH;
 }
   }

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [65b382941c7] blender-v3.2-release: Fix compile after last backport.

[Thomas Dinges]

Commit: 65b382941c7b1488a481406548af47347b465d30
Author: Thomas Dinges
Date:   Tue Jun 28 15:38:12 2022 +0200
Branches: blender-v3.2-release
https://developer.blender.org/rB65b382941c7b1488a481406548af47347b465d30

Fix compile after last backport.

rB6edc9438a461 introduced code from a recent refactor (rB3772dda4ab1b),
which isn't part of 3.2, so undo that part.

===

M   source/blender/editors/space_view3d/view3d_cursor_snap.c

===

diff --git a/source/blender/editors/space_view3d/view3d_cursor_snap.c 
b/source/blender/editors/space_view3d/view3d_cursor_snap.c
index c074026..35f0d7fd57a 100644
--- a/source/blender/editors/space_view3d/view3d_cursor_snap.c
+++ b/source/blender/editors/space_view3d/view3d_cursor_snap.c
@@ -693,7 +693,7 @@ static void v3d_cursor_snap_update(V3DSnapCursorState 
*state,
 /* Negate the face normal according to the view. */
 float ray_dir[3];
 if (rv3d->is_persp) {
-  BLI_assert_msg(snap_elem != SCE_SNAP_MODE_NONE,
+  BLI_assert_msg(snap_elem != 0,
  "Use of variable `co` without it being computed");
 
   sub_v3_v3v3(ray_dir, co, rv3d->viewinv[3]); /* No need to normalize. 
*/
@@ -718,7 +718,7 @@ static void v3d_cursor_snap_update(V3DSnapCursorState 
*state,
 
   float *co_depth = snap_elem ? co : scene->cursor.location;
   snap_elem &= ~data_intern->snap_elem_hidden;
-  if (snap_elem == SCE_SNAP_MODE_NONE) {
+  if (snap_elem == 0) {
 RegionView3D *rv3d = region->regiondata;
 const float *plane_normal = omat[state->plane_axis];
 bool do_plane_isect = (state->plane_depth != V3D_PLACE_DEPTH_CURSOR_VIEW) 
&&

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [0a50528243e] blender-v3.2-release: Blender 3.2: Version bump to 3.2.1

[Thomas Dinges]

Commit: 0a50528243e1d9e46d001e22b850e0b0d97a0ee8
Author: Thomas Dinges
Date:   Wed Jun 22 10:36:20 2022 +0200
Branches: blender-v3.2-release
https://developer.blender.org/rB0a50528243e1d9e46d001e22b850e0b0d97a0ee8

Blender 3.2: Version bump to 3.2.1

Setting version and flag to RC for the upcoming corrective release.

===

M   source/blender/blenkernel/BKE_blender_version.h

===

diff --git a/source/blender/blenkernel/BKE_blender_version.h 
b/source/blender/blenkernel/BKE_blender_version.h
index 7f7ab8c732f..0c2a843bec3 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -19,9 +19,9 @@ extern "C" {
 /* Blender major and minor version. */
 #define BLENDER_VERSION 302
 /* Blender patch version for bugfix releases. */
-#define BLENDER_VERSION_PATCH 0
+#define BLENDER_VERSION_PATCH 1
 /** Blender release cycle stage: alpha/beta/rc/release. */
-#define BLENDER_VERSION_CYCLE release
+#define BLENDER_VERSION_CYCLE rc
 
 /* Blender file format version. */
 #define BLENDER_FILE_VERSION BLENDER_VERSION

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [8938cff8ac3] blender-v3.2-release: Update freedesktop release infos for 3.2.

[Thomas Dinges]

Commit: 8938cff8ac3061fa9e8cf11220a6239a5f890896
Author: Thomas Dinges
Date:   Wed Jun 8 10:07:00 2022 +0200
Branches: blender-v3.2-release
https://developer.blender.org/rB8938cff8ac3061fa9e8cf11220a6239a5f890896

Update freedesktop release infos for 3.2.

===

M   release/freedesktop/org.blender.Blender.appdata.xml

===

diff --git a/release/freedesktop/org.blender.Blender.appdata.xml 
b/release/freedesktop/org.blender.Blender.appdata.xml
index 12291860050..c571c7c8bc8 100644
--- a/release/freedesktop/org.blender.Blender.appdata.xml
+++ b/release/freedesktop/org.blender.Blender.appdata.xml
@@ -40,6 +40,27 @@
 
 
 
+
+
+New features:
+
+Cycles Light Groups
+Cycles Shadow Caustics using Manifold Next Event 
Estimation
+New Tools and usability improvements for Polygon 
Painting
+More Geometry Nodes, including Duplicate Elements
+Asset Browser: Support for Asset Collections
+
+Enhancements:
+
+Enhanced channels in the video sequencer
+Support for WebP format
+New experimental OBJ importer
+Motion Paths improvements
+Grease Pencil Envelope Modifier
+New Curve Pen Tool
+
+
+
 
 
 New features:

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [2161a892519] blender-v3.2-release: Bump version cycle to release for Blender 3.2.

[Thomas Dinges]

Commit: 2161a892519e7f48b08f81a9b281342a48215578
Author: Thomas Dinges
Date:   Tue Jun 7 20:03:28 2022 +0200
Branches: blender-v3.2-release
https://developer.blender.org/rB2161a892519e7f48b08f81a9b281342a48215578

Bump version cycle to release for Blender 3.2.

===

M   source/blender/blenkernel/BKE_blender_version.h

===

diff --git a/source/blender/blenkernel/BKE_blender_version.h 
b/source/blender/blenkernel/BKE_blender_version.h
index 5effd23cd32..7f7ab8c732f 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -21,7 +21,7 @@ extern "C" {
 /* Blender patch version for bugfix releases. */
 #define BLENDER_VERSION_PATCH 0
 /** Blender release cycle stage: alpha/beta/rc/release. */
-#define BLENDER_VERSION_CYCLE rc
+#define BLENDER_VERSION_CYCLE release
 
 /* Blender file format version. */
 #define BLENDER_FILE_VERSION BLENDER_VERSION

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [bff98414653] master: Merge branch 'blender-v3.2-release'

[Thomas Dinges]

Commit: bff98414653a9ce1a400ea697621e81490acd684
Author: Thomas Dinges
Date:   Wed Jun 1 15:44:19 2022 +0200
Branches: master
https://developer.blender.org/rBbff98414653a9ce1a400ea697621e81490acd684

Merge branch 'blender-v3.2-release'

===



===



___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [a493956eaae] blender-v3.2-release: Release schedule: Entering Bcon4 for Blender 3.2 (RC)

[Thomas Dinges]

Commit: a493956eaae00e7cf6b895d8c26e7ed3db8d6cc8
Author: Thomas Dinges
Date:   Wed Jun 1 15:39:52 2022 +0200
Branches: blender-v3.2-release
https://developer.blender.org/rBa493956eaae00e7cf6b895d8c26e7ed3db8d6cc8

Release schedule: Entering Bcon4 for Blender 3.2 (RC)

===

M   source/blender/blenkernel/BKE_blender_version.h

===

diff --git a/source/blender/blenkernel/BKE_blender_version.h 
b/source/blender/blenkernel/BKE_blender_version.h
index 15fdc73adeb..5effd23cd32 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -21,7 +21,7 @@ extern "C" {
 /* Blender patch version for bugfix releases. */
 #define BLENDER_VERSION_PATCH 0
 /** Blender release cycle stage: alpha/beta/rc/release. */
-#define BLENDER_VERSION_CYCLE beta
+#define BLENDER_VERSION_CYCLE rc
 
 /* Blender file format version. */
 #define BLENDER_FILE_VERSION BLENDER_VERSION

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [4f3b5625068] master: Revert "Blender 3.2 - Beta"

[Thomas Dinges]

Commit: 4f3b562506863bc9f53f700a3c5e92a9e0d9cfb0
Author: Thomas Dinges
Date:   Mon May 2 11:06:21 2022 +0200
Branches: master
https://developer.blender.org/rB4f3b562506863bc9f53f700a3c5e92a9e0d9cfb0

Revert "Blender 3.2 - Beta"

This reverts commit da46ed9116cd3a82f440cfec180728f0b3871d9c.

===

M   build_files/build_environment/cmake/download.cmake
M   build_files/config/pipeline_config.yaml
M   source/blender/blenkernel/BKE_blender_version.h

===

diff --git a/build_files/build_environment/cmake/download.cmake 
b/build_files/build_environment/cmake/download.cmake
index 92dea453133..80c53d05c28 100644
--- a/build_files/build_environment/cmake/download.cmake
+++ b/build_files/build_environment/cmake/download.cmake
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 ## Update and uncomment this in the release branch
-set(BLENDER_VERSION 3.2)
+# set(BLENDER_VERSION 3.1)
 
 function(download_source dep)
   set(TARGET_FILE ${${dep}_FILE})
diff --git a/build_files/config/pipeline_config.yaml 
b/build_files/config/pipeline_config.yaml
index d1f1fe78d21..8222f2ff0b9 100644
--- a/build_files/config/pipeline_config.yaml
+++ b/build_files/config/pipeline_config.yaml
@@ -5,38 +5,38 @@
 update-code:
 git:
 submodules:
--   branch: blender-v3.2-release
+-   branch: master
 commit_id: HEAD
 path: release/scripts/addons
--   branch: blender-v3.2-release
+-   branch: master
 commit_id: HEAD
 path: release/scripts/addons_contrib
--   branch: blender-v3.2-release
+-   branch: master
 commit_id: HEAD
 path: release/datafiles/locale
--   branch: blender-v3.2-release
+-   branch: master
 commit_id: HEAD
 path: source/tools
 svn:
 libraries:
 darwin-arm64:
-branch: tags/blender-3.2-release
+branch: trunk
 commit_id: HEAD
 path: lib/darwin_arm64
 darwin-x86_64:
-branch: tags/blender-3.2-release
+branch: trunk
 commit_id: HEAD
 path: lib/darwin
 linux-x86_64:
-branch: tags/blender-3.2-release
+branch: trunk
 commit_id: HEAD
 path: lib/linux_centos7_x86_64
 windows-amd64:
-branch: tags/blender-3.2-release
+branch: trunk
 commit_id: HEAD
 path: lib/win64_vc15
 tests:
-branch: tags/blender-3.2-release
+branch: trunk
 commit_id: HEAD
 path: lib/tests
 benchmarks:
diff --git a/source/blender/blenkernel/BKE_blender_version.h 
b/source/blender/blenkernel/BKE_blender_version.h
index 2ae7fb2d9c5..ab13a2e85d0 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -21,7 +21,7 @@ extern "C" {
 /* Blender patch version for bugfix releases. */
 #define BLENDER_VERSION_PATCH 0
 /** Blender release cycle stage: alpha/beta/rc/release. */
-#define BLENDER_VERSION_CYCLE beta
+#define BLENDER_VERSION_CYCLE alpha
 
 /* Blender file format version. */
 #define BLENDER_FILE_VERSION BLENDER_VERSION

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [951fae35787] master: Revert "Blender 3.2 splashscreen"

[Thomas Dinges]

Commit: 951fae35787e416aedcdb5e1d67008afe9dbc17a
Author: Thomas Dinges
Date:   Mon May 2 11:06:38 2022 +0200
Branches: master
https://developer.blender.org/rB951fae35787e416aedcdb5e1d67008afe9dbc17a

Revert "Blender 3.2 splashscreen"

This reverts commit d1cbfc81bb900c82098a7a5076890fd200069cae.

===

M   release/datafiles/locale
M   release/datafiles/splash.png

===

diff --git a/release/datafiles/locale b/release/datafiles/locale
index 44cf4b4bf74..2e715d54178 16
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 44cf4b4bf74f22fff55941e39cebeacec68a5a80
+Subproject commit 2e715d54178e24ea463c7bc0cdeb27c682c39ecf
diff --git a/release/datafiles/splash.png b/release/datafiles/splash.png
index 332ee39849e..eb1250cf5a5 100644
Binary files a/release/datafiles/splash.png and b/release/datafiles/splash.png 
differ

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [0c80a0acd87] master: Merge branch 'blender-v3.2-release'

[Thomas Dinges]

Commit: 0c80a0acd87cf3f641441d210e794df725f8d834
Author: Thomas Dinges
Date:   Mon May 2 11:05:53 2022 +0200
Branches: master
https://developer.blender.org/rB0c80a0acd87cf3f641441d210e794df725f8d834

Merge branch 'blender-v3.2-release'

===



===



___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [d1cbfc81bb9] blender-v3.2-release: Blender 3.2 splashscreen

[Thomas Dinges]

Commit: d1cbfc81bb900c82098a7a5076890fd200069cae
Author: Thomas Dinges
Date:   Mon May 2 10:38:59 2022 +0200
Branches: blender-v3.2-release
https://developer.blender.org/rBd1cbfc81bb900c82098a7a5076890fd200069cae

Blender 3.2 splashscreen

Credits: Oksana Dobrovolska

===

M   release/datafiles/locale
M   release/datafiles/splash.png

===

diff --git a/release/datafiles/locale b/release/datafiles/locale
index 2e715d54178..44cf4b4bf74 16
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 2e715d54178e24ea463c7bc0cdeb27c682c39ecf
+Subproject commit 44cf4b4bf74f22fff55941e39cebeacec68a5a80
diff --git a/release/datafiles/splash.png b/release/datafiles/splash.png
index eb1250cf5a5..332ee39849e 100644
Binary files a/release/datafiles/splash.png and b/release/datafiles/splash.png 
differ

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [da46ed9116c] blender-v3.2-release: Blender 3.2 - Beta

[Thomas Dinges]

Commit: da46ed9116cd3a82f440cfec180728f0b3871d9c
Author: Thomas Dinges
Date:   Mon May 2 10:35:39 2022 +0200
Branches: blender-v3.2-release
https://developer.blender.org/rBda46ed9116cd3a82f440cfec180728f0b3871d9c

Blender 3.2 - Beta

* BLENDER_VERSION_CYCLE set to beta
* Update pipeline_config.yaml to point to 3.2 branches and svn tags
* Update and uncomment BLENDER_VERSION in download.cmake

===

M   build_files/build_environment/cmake/download.cmake
M   build_files/config/pipeline_config.yaml
M   source/blender/blenkernel/BKE_blender_version.h

===

diff --git a/build_files/build_environment/cmake/download.cmake 
b/build_files/build_environment/cmake/download.cmake
index 80c53d05c28..92dea453133 100644
--- a/build_files/build_environment/cmake/download.cmake
+++ b/build_files/build_environment/cmake/download.cmake
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 ## Update and uncomment this in the release branch
-# set(BLENDER_VERSION 3.1)
+set(BLENDER_VERSION 3.2)
 
 function(download_source dep)
   set(TARGET_FILE ${${dep}_FILE})
diff --git a/build_files/config/pipeline_config.yaml 
b/build_files/config/pipeline_config.yaml
index 8222f2ff0b9..d1f1fe78d21 100644
--- a/build_files/config/pipeline_config.yaml
+++ b/build_files/config/pipeline_config.yaml
@@ -5,38 +5,38 @@
 update-code:
 git:
 submodules:
--   branch: master
+-   branch: blender-v3.2-release
 commit_id: HEAD
 path: release/scripts/addons
--   branch: master
+-   branch: blender-v3.2-release
 commit_id: HEAD
 path: release/scripts/addons_contrib
--   branch: master
+-   branch: blender-v3.2-release
 commit_id: HEAD
 path: release/datafiles/locale
--   branch: master
+-   branch: blender-v3.2-release
 commit_id: HEAD
 path: source/tools
 svn:
 libraries:
 darwin-arm64:
-branch: trunk
+branch: tags/blender-3.2-release
 commit_id: HEAD
 path: lib/darwin_arm64
 darwin-x86_64:
-branch: trunk
+branch: tags/blender-3.2-release
 commit_id: HEAD
 path: lib/darwin
 linux-x86_64:
-branch: trunk
+branch: tags/blender-3.2-release
 commit_id: HEAD
 path: lib/linux_centos7_x86_64
 windows-amd64:
-branch: trunk
+branch: tags/blender-3.2-release
 commit_id: HEAD
 path: lib/win64_vc15
 tests:
-branch: trunk
+branch: tags/blender-3.2-release
 commit_id: HEAD
 path: lib/tests
 benchmarks:
diff --git a/source/blender/blenkernel/BKE_blender_version.h 
b/source/blender/blenkernel/BKE_blender_version.h
index 7f0a4c0d7af..15fdc73adeb 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -21,7 +21,7 @@ extern "C" {
 /* Blender patch version for bugfix releases. */
 #define BLENDER_VERSION_PATCH 0
 /** Blender release cycle stage: alpha/beta/rc/release. */
-#define BLENDER_VERSION_CYCLE alpha
+#define BLENDER_VERSION_CYCLE beta
 
 /* Blender file format version. */
 #define BLENDER_FILE_VERSION BLENDER_VERSION

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [46b32c9d7b4] master: Blender 3.3 bcon1 - alpha

[Thomas Dinges]

Commit: 46b32c9d7b429e23efc30f5ac4c2b2d4ba59db38
Author: Thomas Dinges
Date:   Mon May 2 10:28:30 2022 +0200
Branches: master
https://developer.blender.org/rB46b32c9d7b429e23efc30f5ac4c2b2d4ba59db38

Blender 3.3 bcon1 - alpha

Bump the version number for the new release cycle.

===

M   doc/doxygen/Doxyfile
M   source/blender/blenkernel/BKE_blender_version.h

===

diff --git a/doc/doxygen/Doxyfile b/doc/doxygen/Doxyfile
index b8f54f548b4..0176a888377 100644
--- a/doc/doxygen/Doxyfile
+++ b/doc/doxygen/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME   = Blender
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER = V3.2
+PROJECT_NUMBER = V3.3
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/source/blender/blenkernel/BKE_blender_version.h 
b/source/blender/blenkernel/BKE_blender_version.h
index 7f0a4c0d7af..ab13a2e85d0 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -17,7 +17,7 @@ extern "C" {
  */
 
 /* Blender major and minor version. */
-#define BLENDER_VERSION 302
+#define BLENDER_VERSION 303
 /* Blender patch version for bugfix releases. */
 #define BLENDER_VERSION_PATCH 0
 /** Blender release cycle stage: alpha/beta/rc/release. */
@@ -25,7 +25,7 @@ extern "C" {
 
 /* Blender file format version. */
 #define BLENDER_FILE_VERSION BLENDER_VERSION
-#define BLENDER_FILE_SUBVERSION 14
+#define BLENDER_FILE_SUBVERSION 0
 
 /* Minimum Blender version that supports reading file written with the current
  * version. Older Blender versions will test this and show a warning if the 
file

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] SVN commit: bf-blender [62904] tags/blender-3.2-release/lib/: Copy libs to Blender 3.2 tag

[Thomas Dinges]

Revision: 62904
  https://developer.blender.org/rBL62904
Author:   dingto
Date: 2022-05-02 10:21:03 +0200 (Mon, 02 May 2022)
Log Message:
---
Copy libs to Blender 3.2 tag

Added Paths:
---
tags/blender-3.2-release/lib/

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] SVN commit: bf-blender [62903] tags/blender-3.2-release/: Create Blender 3.2 tag

[Thomas Dinges]

Revision: 62903
  https://developer.blender.org/rBL62903
Author:   dingto
Date: 2022-05-02 10:20:27 +0200 (Mon, 02 May 2022)
Log Message:
---
Create Blender 3.2 tag

Added Paths:
---
tags/blender-3.2-release/

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [62eb190d4e4] master: Cleanup: Remove old filter property.

[Thomas Dinges]

Commit: 62eb190d4e4e329ea0143147e81bffce698c6361
Author: Thomas Dinges
Date:   Fri Apr 29 10:36:19 2022 +0200
Branches: master
https://developer.blender.org/rB62eb190d4e4e329ea0143147e81bffce698c6361

Cleanup: Remove old filter property.

It was kept for forward compatibility during 2.7x.

Reference rB5a45ccaf3e5102ee571599fa9f26a78ac1f6d0f4

===

M   intern/cycles/blender/addon/properties.py

===

diff --git a/intern/cycles/blender/addon/properties.py 
b/intern/cycles/blender/addon/properties.py
index a0ceb9c3c29..9b4799d252f 100644
--- a/intern/cycles/blender/addon/properties.py
+++ b/intern/cycles/blender/addon/properties.py
@@ -589,17 +589,6 @@ class CyclesRenderSettings(bpy.types.PropertyGroup):
 default=0.1,
 )
 
-# Really annoyingly, we have to keep it around for a few releases,
-# otherwise forward compatibility breaks in really bad manner: CRASH!
-#
-# TODO(sergey): Remove this during 2.8x series of Blender.
-filter_type: EnumProperty(
-name="Filter Type",
-description="Pixel filter type",
-items=enum_filter_types,
-default='BLACKMAN_HARRIS',
-)
-
 pixel_filter_type: EnumProperty(
 name="Filter Type",
 description="Pixel filter type",

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [37ede15e639] master: Blender 3.2 Beta - Subversion bump

[Thomas Dinges]

Commit: 37ede15e639c6190ba282985f586aefe14a4a348
Author: Thomas Dinges
Date:   Thu Apr 28 11:39:34 2022 +0200
Branches: master
https://developer.blender.org/rB37ede15e639c6190ba282985f586aefe14a4a348

Blender 3.2 Beta - Subversion bump

===

M   source/blender/blenkernel/BKE_blender_version.h
M   source/blender/blenloader/intern/versioning_300.c

===

diff --git a/source/blender/blenkernel/BKE_blender_version.h 
b/source/blender/blenkernel/BKE_blender_version.h
index 8a2693f3f6b..ef419b9def9 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -25,7 +25,7 @@ extern "C" {
 
 /* Blender file format version. */
 #define BLENDER_FILE_VERSION BLENDER_VERSION
-#define BLENDER_FILE_SUBVERSION 12
+#define BLENDER_FILE_SUBVERSION 13
 
 /* Minimum Blender version that supports reading file written with the current
  * version. Older Blender versions will test this and show a warning if the 
file
diff --git a/source/blender/blenloader/intern/versioning_300.c 
b/source/blender/blenloader/intern/versioning_300.c
index baf4c6ef710..8190de649bd 100644
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@ -2710,18 +2710,7 @@ void blo_do_versions_300(FileData *fd, Library 
*UNUSED(lib), Main *bmain)
 FOREACH_NODETREE_END;
   }
 
-  /**
-   * Versioning code until next subversion bump goes here.
-   *
-   * \note Be sure to check when bumping the version:
-   * - "versioning_userdef.c", #blo_do_versions_userdef
-   * - "versioning_userdef.c", #do_versions_theme
-   *
-   * \note Keep this message at the bottom of the function.
-   */
-  {
-/* Keep this block, even when empty. */
-
+  if (!MAIN_VERSION_ATLEAST(bmain, 302, 13)) {
 /* Enable named attributes overlay in node editor. */
 LISTBASE_FOREACH (bScreen *, screen, >screens) {
   LISTBASE_FOREACH (ScrArea *, area, >areabase) {
@@ -2744,4 +2733,17 @@ void blo_do_versions_300(FileData *fd, Library 
*UNUSED(lib), Main *bmain)
   }
 }
   }
+
+  /**
+   * Versioning code until next subversion bump goes here.
+   *
+   * \note Be sure to check when bumping the version:
+   * - "versioning_userdef.c", #blo_do_versions_userdef
+   * - "versioning_userdef.c", #do_versions_theme
+   *
+   * \note Keep this message at the bottom of the function.
+   */
+  {
+/* Keep this block, even when empty. */
+  }
 }

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [05a1770ab06] master: Fix T97280: Typo in tooltip of image texture node

[Thomas Dinges]

Commit: 05a1770ab069e834bfe11c4d5e7675e3b542f53c
Author: Thomas Dinges
Date:   Tue Apr 12 17:36:12 2022 +0200
Branches: master
https://developer.blender.org/rB05a1770ab069e834bfe11c4d5e7675e3b542f53c

Fix T97280: Typo in tooltip of image texture node

===

M   release/datafiles/colormanagement/config.ocio

===

diff --git a/release/datafiles/colormanagement/config.ocio 
b/release/datafiles/colormanagement/config.ocio
index bdb04cbf9ce..55e52de7002 100644
--- a/release/datafiles/colormanagement/config.ocio
+++ b/release/datafiles/colormanagement/config.ocio
@@ -173,7 +173,7 @@ colorspaces:
 name: Non-Color
 family: raw
 description: |
-Color space used for images which contains non-color data (i,e, normal 
maps)
+Color space used for images which contains non-color data (i.e. normal 
maps)
 equalitygroup:
 bitdepth: 32f
 isdata: true

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [dd1112abe6f] blender-v3.1-release: Release cycle: RC for Blender 3.1.1 corrective release.

[Thomas Dinges]

Commit: dd1112abe6f3b341c61239f2ade955c9fa858b8e
Author: Thomas Dinges
Date:   Mon Mar 21 11:42:53 2022 +0100
Branches: blender-v3.1-release
https://developer.blender.org/rBdd1112abe6f3b341c61239f2ade955c9fa858b8e

Release cycle: RC for Blender 3.1.1 corrective release.

===

M   source/blender/blenkernel/BKE_blender_version.h

===

diff --git a/source/blender/blenkernel/BKE_blender_version.h 
b/source/blender/blenkernel/BKE_blender_version.h
index f97825c6626..c0971b49cc7 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -33,9 +33,9 @@ extern "C" {
 /* Blender major and minor version. */
 #define BLENDER_VERSION 301
 /* Blender patch version for bugfix releases. */
-#define BLENDER_VERSION_PATCH 0
+#define BLENDER_VERSION_PATCH 1
 /** Blender release cycle stage: alpha/beta/rc/release. */
-#define BLENDER_VERSION_CYCLE release
+#define BLENDER_VERSION_CYCLE rc
 
 /* Blender file format version. */
 #define BLENDER_FILE_VERSION BLENDER_VERSION

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [ffea47530d8] master: Merge branch 'blender-v3.1-release'

[Thomas Dinges]

Commit: ffea47530d868ba5c56ed688417f2260af439712
Author: Thomas Dinges
Date:   Tue Mar 8 18:46:23 2022 +0100
Branches: master
https://developer.blender.org/rBffea47530d868ba5c56ed688417f2260af439712

Merge branch 'blender-v3.1-release'

===



===



___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [7add8163e4b] blender-v3.1-release: Blender 3.1 - version bump -> release

[Thomas Dinges]

Commit: 7add8163e4b628767c546dae687333225c78c8c0
Author: Thomas Dinges
Date:   Tue Mar 8 18:36:00 2022 +0100
Branches: blender-v3.1-release
https://developer.blender.org/rB7add8163e4b628767c546dae687333225c78c8c0

Blender 3.1 - version bump -> release

===

M   source/blender/blenkernel/BKE_blender_version.h

===

diff --git a/source/blender/blenkernel/BKE_blender_version.h 
b/source/blender/blenkernel/BKE_blender_version.h
index 3f290e64447..f97825c6626 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -35,7 +35,7 @@ extern "C" {
 /* Blender patch version for bugfix releases. */
 #define BLENDER_VERSION_PATCH 0
 /** Blender release cycle stage: alpha/beta/rc/release. */
-#define BLENDER_VERSION_CYCLE rc
+#define BLENDER_VERSION_CYCLE release
 
 /* Blender file format version. */
 #define BLENDER_FILE_VERSION BLENDER_VERSION

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [b154b8c6f80] master: Merge branch 'blender-v3.1-release'

[Thomas Dinges]

Commit: b154b8c6f801c1bc8d4ea0c141abd5933395d1b0
Author: Thomas Dinges
Date:   Tue Mar 8 18:34:09 2022 +0100
Branches: master
https://developer.blender.org/rBb154b8c6f801c1bc8d4ea0c141abd5933395d1b0

Merge branch 'blender-v3.1-release'

===



===



___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [c305b88aacb] blender-v3.1-release: Docs: 3.1 release description for Linux appdata

[Thomas Dinges]

Commit: c305b88aacb1248cdd82df486954046824da34f6
Author: Thomas Dinges
Date:   Tue Mar 8 16:55:19 2022 +0100
Branches: blender-v3.1-release
https://developer.blender.org/rBc305b88aacb1248cdd82df486954046824da34f6

Docs: 3.1 release description for Linux appdata

===

M   release/freedesktop/org.blender.Blender.appdata.xml

===

diff --git a/release/freedesktop/org.blender.Blender.appdata.xml 
b/release/freedesktop/org.blender.Blender.appdata.xml
index 4b413f6b38d..12291860050 100644
--- a/release/freedesktop/org.blender.Blender.appdata.xml
+++ b/release/freedesktop/org.blender.Blender.appdata.xml
@@ -40,6 +40,27 @@
 
 
 
+
+
+New features:
+
+GPU acceleration for the Subdivision modifier
+Cycles Metal GPU backend, contributed by Apple
+Point Cloud rendering
+More Geometry Nodes, including extrude mesh
+
+Enhancements:
+
+Faster and less memory usage in geometry nodes
+Grease Pencil Dilate/Contract fill
+Vertex Creasing support
+Faster .obj and .fbx export
+Image editor is able to handle large images
+Python 3.10
+User Interface updates
+
+
+
 
 
 New features:

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [34267a868ad] master: Merge branch 'blender-v3.1-release'

[Thomas Dinges]

Commit: 34267a868ad3aeb6010f9c7c6c42ed109698dd38
Author: Thomas Dinges
Date:   Wed Mar 2 17:35:09 2022 +0100
Branches: master
https://developer.blender.org/rB34267a868ad3aeb6010f9c7c6c42ed109698dd38

Merge branch 'blender-v3.1-release'

and resolve merge error (version string).

===



===



___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [8506f3d9fe9] blender-v3.1-release: Blender 3.1 bcon4 - change release cycle to release candidate

[Thomas Dinges]

Commit: 8506f3d9fe9359518e5114c7549fa12863dd806c
Author: Thomas Dinges
Date:   Wed Mar 2 17:17:38 2022 +0100
Branches: blender-v3.1-release
https://developer.blender.org/rB8506f3d9fe9359518e5114c7549fa12863dd806c

Blender 3.1 bcon4 - change release cycle to release candidate

This is still a rolling release candidate with new builds every day
as a preparation to the final release.

===

M   source/blender/blenkernel/BKE_blender_version.h

===

diff --git a/source/blender/blenkernel/BKE_blender_version.h 
b/source/blender/blenkernel/BKE_blender_version.h
index ba95ceb0998..3f290e64447 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -35,7 +35,7 @@ extern "C" {
 /* Blender patch version for bugfix releases. */
 #define BLENDER_VERSION_PATCH 0
 /** Blender release cycle stage: alpha/beta/rc/release. */
-#define BLENDER_VERSION_CYCLE beta
+#define BLENDER_VERSION_CYCLE rc
 
 /* Blender file format version. */
 #define BLENDER_FILE_VERSION BLENDER_VERSION

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [19403fc8522] master: Merge branch 'blender-v3.1-release'

[Thomas Dinges]

Commit: 19403fc852224b2c29df3e5f1f2106ba91f105a2
Author: Thomas Dinges
Date:   Mon Feb 14 17:48:52 2022 +0100
Branches: master
https://developer.blender.org/rB19403fc852224b2c29df3e5f1f2106ba91f105a2

Merge branch 'blender-v3.1-release'

===



===



___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [a5edff4b73b] blender-v3.1-release: Fix T95778, the macOS minimum versions have been increased for Metal.

[Thomas Dinges]

Commit: a5edff4b73ba74155dcad93103e2fef2c59df67f
Author: Thomas Dinges
Date:   Mon Feb 14 17:47:35 2022 +0100
Branches: blender-v3.1-release
https://developer.blender.org/rBa5edff4b73ba74155dcad93103e2fef2c59df67f

Fix T95778, the macOS minimum versions have been increased for Metal.

===

M   intern/cycles/blender/addon/properties.py

===

diff --git a/intern/cycles/blender/addon/properties.py 
b/intern/cycles/blender/addon/properties.py
index 01e73d7ed03..ef686fc0c70 100644
--- a/intern/cycles/blender/addon/properties.py
+++ b/intern/cycles/blender/addon/properties.py
@@ -1498,7 +1498,8 @@ class CyclesPreferences(bpy.types.AddonPreferences):
 if sys.platform[:3] == "win":
 col.label(text="and AMD Radeon Pro 21.Q4 driver or newer", 
icon='BLANK1')
 elif device_type == 'METAL':
-col.label(text="Requires Apple Silicon and macOS 12.0 or 
newer", icon='BLANK1')
+col.label(text="Requires Apple Silicon with macOS 12.2 or 
newer", icon='BLANK1')
+col.label(text="or AMD with macOS 12.3 or newer", 
icon='BLANK1')
 return
 
 for device in devices:

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [e468abc360e] master: Merge branch 'blender-v3.1-release'

[Thomas Dinges]

Commit: e468abc360e0c9889949b4814551e282e926240d
Author: Thomas Dinges
Date:   Thu Feb 3 09:59:22 2022 +0100
Branches: master
https://developer.blender.org/rBe468abc360e0c9889949b4814551e282e926240d

Merge branch 'blender-v3.1-release'

===



===



___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [c379223053e] blender-v3.1-release: Fix wrong function call in Cycles acceleration UI poll.

[Thomas Dinges]

Commit: c379223053e7187e71ff031bb61938edaa3959af
Author: Thomas Dinges
Date:   Thu Feb 3 09:57:24 2022 +0100
Branches: blender-v3.1-release
https://developer.blender.org/rBc379223053e7187e71ff031bb61938edaa3959af

Fix wrong function call in Cycles acceleration UI poll.

Thanks to Sergey for spotting this mistake.

===

M   intern/cycles/blender/addon/ui.py

===

diff --git a/intern/cycles/blender/addon/ui.py 
b/intern/cycles/blender/addon/ui.py
index aa5f6740933..e4b2fef87c3 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -669,7 +669,7 @@ class 
CYCLES_RENDER_PT_performance_acceleration_structure(CyclesButtonsPanel, Pa
 
 @classmethod
 def poll(cls, context):
-return not use_optix(context) or has_multi_device(context)
+return not use_optix(context) or use_multi_device(context)
 
 def draw(self, context):
 import _cycles

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] SVN commit: bf-blender [62820] tags/blender-3.1-release/lib/: Copy libs to 3.1 branch

[Thomas Dinges]

Revision: 62820
  https://developer.blender.org/rBL62820
Author:   dingto
Date: 2022-01-28 13:07:35 +0100 (Fri, 28 Jan 2022)
Log Message:
---
Copy libs to 3.1 branch

Added Paths:
---
tags/blender-3.1-release/lib/

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] SVN commit: bf-blender [62819] tags/blender-3.1-release/: Recreate the 3.1 branch with correct name

[Thomas Dinges]

Revision: 62819
  https://developer.blender.org/rBL62819
Author:   dingto
Date: 2022-01-28 13:06:49 +0100 (Fri, 28 Jan 2022)
Log Message:
---
Recreate the 3.1 branch with correct name

Added Paths:
---
tags/blender-3.1-release/

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] SVN commit: bf-blender [62818] tags/blender-v3.1-release/: Remove 3.1 tag from SVN, was created with false name.

[Thomas Dinges]

Revision: 62818
  https://developer.blender.org/rBL62818
Author:   dingto
Date: 2022-01-28 13:03:43 +0100 (Fri, 28 Jan 2022)
Log Message:
---
Remove 3.1 tag from SVN, was created with false name.

Removed Paths:
-
tags/blender-v3.1-release/

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs