from:"Dalai Felinto"

[Bf-blender-cvs] [8cc558814d4] master: Cleanup: make format

2023-01-16 Thread Dalai Felinto

Commit: 8cc558814d43bcfe67c22eb3826e6a9ab91161db
Author: Dalai Felinto
Date:   Mon Jan 16 14:39:10 2023 +0100
Branches: master
https://developer.blender.org/rB8cc558814d43bcfe67c22eb3826e6a9ab91161db

Cleanup: make format

===

M   release/scripts/startup/bl_ui/node_add_menu_geometry.py

===

diff --git a/release/scripts/startup/bl_ui/node_add_menu_geometry.py 
b/release/scripts/startup/bl_ui/node_add_menu_geometry.py
index 54f667ccef3..2554734d903 100644
--- a/release/scripts/startup/bl_ui/node_add_menu_geometry.py
+++ b/release/scripts/startup/bl_ui/node_add_menu_geometry.py
@@ -72,6 +72,7 @@ class NODE_MT_geometry_node_GEO_CURVE_READ(Menu):
 node_add_menu.add_node_type(layout, 
"GeometryNodeInputSplineResolution")
 node_add_menu.draw_assets_for_catalog(layout, self.bl_label)
 
+
 class NODE_MT_geometry_node_GEO_CURVE_WRITE(Menu):
 bl_idname = "NODE_MT_geometry_node_GEO_CURVE_WRITE"
 bl_label = "Write"
@@ -153,6 +154,7 @@ class NODE_MT_geometry_node_GEO_GEOMETRY(Menu):
 node_add_menu.add_node_type(layout, "GeometryNodeGeometryToInstance")
 node_add_menu.draw_assets_for_catalog(layout, self.bl_label)
 
+
 class NODE_MT_geometry_node_GEO_GEOMETRY_READ(Menu):
 bl_idname = "NODE_MT_geometry_node_GEO_GEOMETRY_READ"
 bl_label = "Read"
@@ -178,6 +180,7 @@ class NODE_MT_geometry_node_GEO_GEOMETRY_WRITE(Menu):
 node_add_menu.add_node_type(layout, "GeometryNodeSetPosition")
 node_add_menu.draw_assets_for_catalog(layout, self.bl_label)
 
+
 class NODE_MT_geometry_node_GEO_GEOMETRY_OPERATIONS(Menu):
 bl_idname = "NODE_MT_geometry_node_GEO_GEOMETRY_OPERATIONS"
 bl_label = "Operations"
@@ -195,6 +198,7 @@ class NODE_MT_geometry_node_GEO_GEOMETRY_OPERATIONS(Menu):
 node_add_menu.add_node_type(layout, "GeometryNodeSeparateGeometry")
 node_add_menu.draw_assets_for_catalog(layout, self.bl_label)
 
+
 class NODE_MT_geometry_node_GEO_GEOMETRY_SAMPLE(Menu):
 bl_idname = "NODE_MT_geometry_node_GEO_GEOMETRY_SAMPLE"
 bl_label = "Sample"
@@ -507,6 +511,7 @@ class NODE_MT_category_GEO_UTILITIES_ROTATION(Menu):
 node_add_menu.add_node_type(layout, "FunctionNodeRotateEuler")
 node_add_menu.draw_assets_for_catalog(layout, self.bl_label)
 
+
 class NODE_MT_category_GEO_UTILITIES_MATH(Menu):
 bl_idname = "NODE_MT_category_GEO_UTILITIES_MATH"
 bl_label = "Math"

___
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] [5320372c345] master: User Inteface: Missing separator in Geometry Nodes > Add Node > Geometry menu

2023-01-16 Thread Dalai Felinto

Commit: 5320372c34522b1c399049a2014bc770a140dabc
Author: Dalai Felinto
Date:   Mon Jan 16 12:23:50 2023 +0100
Branches: master
https://developer.blender.org/rB5320372c34522b1c399049a2014bc770a140dabc

User Inteface: Missing separator in Geometry Nodes > Add Node > Geometry menu

This separator was missing in the original change in the menus (d4e638baac4).

===

M   release/scripts/startup/bl_ui/node_add_menu_geometry.py

===

diff --git a/release/scripts/startup/bl_ui/node_add_menu_geometry.py 
b/release/scripts/startup/bl_ui/node_add_menu_geometry.py
index f86601da88c..54f667ccef3 100644
--- a/release/scripts/startup/bl_ui/node_add_menu_geometry.py
+++ b/release/scripts/startup/bl_ui/node_add_menu_geometry.py
@@ -145,6 +145,7 @@ class NODE_MT_geometry_node_GEO_GEOMETRY(Menu):
 layout = self.layout
 layout.menu("NODE_MT_geometry_node_GEO_GEOMETRY_READ")
 layout.menu("NODE_MT_geometry_node_GEO_GEOMETRY_WRITE")
+layout.separator()
 layout.menu("NODE_MT_geometry_node_GEO_GEOMETRY_OPERATIONS")
 layout.menu("NODE_MT_geometry_node_GEO_GEOMETRY_SAMPLE")
 layout.separator()

___
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] [d4e638baac4] master: User Interface: Re-organization of Geometry Nodes Add Node Menu

2023-01-13 Thread Dalai Felinto

Commit: d4e638baac4352f022f89c6d189f7e7ee46eb073
Author: Dalai Felinto
Date:   Mon Jan 9 18:09:22 2023 +0100
Branches: master
https://developer.blender.org/rBd4e638baac4352f022f89c6d189f7e7ee46eb073

User Interface: Re-organization of Geometry Nodes Add Node Menu

The menus are growing too large. This patches move some categories under
sub-menus, and shuffle some entries around.

We already had sub-categories split by separators. This change now
goes a step further and embrace 3-level menus.

Inspired by the "Simpler Add Menu" add-on by Quackers (waiting to hear
back to know Quackers real name).

Inspired by the "Simpler Add Menu" add-on by Alfonso Martinez II.

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

===

M   release/scripts/startup/bl_ui/node_add_menu_geometry.py

===

diff --git a/release/scripts/startup/bl_ui/node_add_menu_geometry.py 
b/release/scripts/startup/bl_ui/node_add_menu_geometry.py
index cc5f210e536..f86601da88c 100644
--- a/release/scripts/startup/bl_ui/node_add_menu_geometry.py
+++ b/release/scripts/startup/bl_ui/node_add_menu_geometry.py
@@ -12,9 +12,10 @@ class NODE_MT_geometry_node_GEO_ATTRIBUTE(Menu):
 def draw(self, _context):
 layout = self.layout
 node_add_menu.add_node_type(layout, "GeometryNodeAttributeStatistic")
+node_add_menu.add_node_type(layout, "GeometryNodeAttributeDomainSize")
+layout.separator()
 node_add_menu.add_node_type(layout, "GeometryNodeBlurAttribute")
 node_add_menu.add_node_type(layout, "GeometryNodeCaptureAttribute")
-node_add_menu.add_node_type(layout, "GeometryNodeAttributeDomainSize")
 node_add_menu.add_node_type(layout, "GeometryNodeRemoveAttribute")
 node_add_menu.add_node_type(layout, "GeometryNodeStoreNamedAttribute")
 node_add_menu.draw_assets_for_catalog(layout, self.bl_label)
@@ -27,12 +28,13 @@ class NODE_MT_geometry_node_GEO_COLOR(Menu):
 def draw(self, _context):
 layout = self.layout
 node_add_menu.add_node_type(layout, "ShaderNodeValToRGB")
+node_add_menu.add_node_type(layout, "ShaderNodeRGBCurve")
+layout.separator()
 node_add_menu.add_node_type(layout, "FunctionNodeCombineColor")
 props = node_add_menu.add_node_type(layout, "ShaderNodeMix", 
label=iface_("Mix Color"))
 ops = props.settings.add()
 ops.name = "data_type"
 ops.value = "'RGBA'"
-node_add_menu.add_node_type(layout, "ShaderNodeRGBCurve")
 node_add_menu.add_node_type(layout, "FunctionNodeSeparateColor")
 node_add_menu.draw_assets_for_catalog(layout, self.bl_label)
 
@@ -43,19 +45,23 @@ class NODE_MT_geometry_node_GEO_CURVE(Menu):
 
 def draw(self, _context):
 layout = self.layout
-node_add_menu.add_node_type(layout, "GeometryNodeCurveLength")
-node_add_menu.add_node_type(layout, "GeometryNodeCurveToMesh")
-node_add_menu.add_node_type(layout, "GeometryNodeCurveToPoints")
-node_add_menu.add_node_type(layout, 
"GeometryNodeDeformCurvesOnSurface")
-node_add_menu.add_node_type(layout, "GeometryNodeFillCurve")
-node_add_menu.add_node_type(layout, "GeometryNodeFilletCurve")
-node_add_menu.add_node_type(layout, "GeometryNodeResampleCurve")
-node_add_menu.add_node_type(layout, "GeometryNodeReverseCurve")
-node_add_menu.add_node_type(layout, "GeometryNodeSampleCurve")
-node_add_menu.add_node_type(layout, "GeometryNodeSubdivideCurve")
-node_add_menu.add_node_type(layout, "GeometryNodeTrimCurve")
+layout.menu("NODE_MT_geometry_node_GEO_CURVE_READ")
+layout.menu("NODE_MT_geometry_node_GEO_CURVE_WRITE")
 layout.separator()
+layout.menu("NODE_MT_geometry_node_GEO_CURVE_OPERATIONS")
+layout.menu("NODE_MT_geometry_node_GEO_PRIMITIVES_CURVE")
+layout.menu("NODE_MT_geometry_node_curve_topology")
+node_add_menu.draw_assets_for_catalog(layout, self.bl_label)
+
+
+class NODE_MT_geometry_node_GEO_CURVE_READ(Menu):
+bl_idname = "NODE_MT_geometry_node_GEO_CURVE_READ"
+bl_label = "Read"
+
+def draw(self, _context):
+layout = self.layout
 node_add_menu.add_node_type(layout, 
"GeometryNodeInputCurveHandlePositions")
+node_add_menu.add_node_type(layout, "GeometryNodeCurveLength")
 node_add_menu.add_node_type(layout, "GeometryNodeInputTangent")
 node_add_menu.ad

[Bf-blender-cvs] [a8aae66f0e8] master: Asset Browser: New catalog menu

2022-12-23 Thread Dalai Felinto

Commit: a8aae66f0e8067280fff0db0cefe3d2a6ee2c41a
Author: Dalai Felinto
Date:   Tue Dec 20 13:05:40 2022 +0100
Branches: master
https://developer.blender.org/rBa8aae66f0e8067280fff0db0cefe3d2a6ee2c41a

Asset Browser: New catalog menu

This replaces the old Edit menu, creating a menu only for catalog
operators. The Undo/Redo were already working only for catalogs, so now
this is more clear.

The menu also contains the Save and New catalog operators.

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

===

M   release/scripts/startup/bl_ui/space_filebrowser.py

===

diff --git a/release/scripts/startup/bl_ui/space_filebrowser.py 
b/release/scripts/startup/bl_ui/space_filebrowser.py
index b2eeb4e6cf0..a7e9663d186 100644
--- a/release/scripts/startup/bl_ui/space_filebrowser.py
+++ b/release/scripts/startup/bl_ui/space_filebrowser.py
@@ -644,7 +644,7 @@ class ASSETBROWSER_MT_editor_menus(AssetBrowserMenu, Menu):
 
 layout.menu("ASSETBROWSER_MT_view")
 layout.menu("ASSETBROWSER_MT_select")
-layout.menu("ASSETBROWSER_MT_edit")
+layout.menu("ASSETBROWSER_MT_catalog")
 
 
 class ASSETBROWSER_MT_view(AssetBrowserMenu, Menu):
@@ -683,8 +683,8 @@ class ASSETBROWSER_MT_select(AssetBrowserMenu, Menu):
 layout.operator("file.select_box")
 
 
-class ASSETBROWSER_MT_edit(AssetBrowserMenu, Menu):
-bl_label = "Edit"
+class ASSETBROWSER_MT_catalog(AssetBrowserMenu, Menu):
+bl_label = "Catalog"
 
 def draw(self, _context):
 layout = self.layout
@@ -692,6 +692,10 @@ class ASSETBROWSER_MT_edit(AssetBrowserMenu, Menu):
 layout.operator("asset.catalog_undo", text="Undo")
 layout.operator("asset.catalog_redo", text="Redo")
 
+layout.separator()
+layout.operator("asset.catalogs_save")
+layout.operator("asset.catalog_new").parent_path = ""
+
 
 class ASSETBROWSER_PT_metadata(asset_utils.AssetBrowserPanel, Panel):
 bl_region_type = 'TOOL_PROPS'
@@ -844,7 +848,7 @@ classes = (
 ASSETBROWSER_MT_editor_menus,
 ASSETBROWSER_MT_view,
 ASSETBROWSER_MT_select,
-ASSETBROWSER_MT_edit,
+ASSETBROWSER_MT_catalog,
 ASSETBROWSER_MT_metadata_preview_menu,
 ASSETBROWSER_PT_metadata,
 ASSETBROWSER_PT_metadata_preview,

___
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] [fd70f9dfda0] blender-v3.4-release: Fix T102276: Hotkey conflict Alt D in Node Editor with Duplicate Linked and Detach

2022-12-14 Thread Dalai Felinto

Commit: fd70f9dfda0c93410c1ada5b5d119bb13736826b
Author: Dalai Felinto
Date:   Tue Dec 6 09:45:20 2022 +0100
Branches: blender-v3.4-release
https://developer.blender.org/rBfd70f9dfda0c93410c1ada5b5d119bb13736826b

Fix T102276: Hotkey conflict Alt D in Node Editor with Duplicate Linked and 
Detach

This unassign the Alt+D shortcut from the detach operator. Right now the
operator has to be accessed via the menu.

Alt+D is left for duplicate link, following the other editors.

===

M   release/scripts/presets/keyconfig/keymap_data/blender_default.py

===

diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py 
b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
index 39905a9ef5d..9208bdf72f0 100644
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@ -2137,9 +2137,6 @@ def km_node_editor(params):
 )),
 ("transform.rotate", {"type": 'R', "value": 'PRESS'}, None),
 ("transform.resize", {"type": 'S', "value": 'PRESS'}, None),
-("node.move_detach_links",
- {"type": 'D', "value": 'PRESS', "alt": True},
- {"properties": [("TRANSFORM_OT_translate", [("view2d_edge_pan", 
True)])]}),
 ("node.move_detach_links_release",
  {"type": params.action_mouse, "value": 'CLICK_DRAG', "alt": True},
  {"properties": [("NODE_OT_translate_attach", 
[("TRANSFORM_OT_translate", [("view2d_edge_pan", 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] [ea14c48c093] master: Fix T102276: Hotkey conflict Alt D in Node Editor with Duplicate Linked and Detach

2022-12-06 Thread Dalai Felinto

Commit: ea14c48c0930498e5c086a604c6ab13a861461fe
Author: Dalai Felinto
Date:   Tue Dec 6 09:45:20 2022 +0100
Branches: master
https://developer.blender.org/rBea14c48c0930498e5c086a604c6ab13a861461fe

Fix T102276: Hotkey conflict Alt D in Node Editor with Duplicate Linked and 
Detach

This unassign the Alt+D shortcut from the detach operator. Right now the
operator has to be accessed via the menu.

Alt+D is left for duplicate link, following the other editors.

===

M   release/scripts/presets/keyconfig/keymap_data/blender_default.py

===

diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py 
b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
index a5ead8476cb..4c5969d4f0d 100644
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@ -2137,9 +2137,6 @@ def km_node_editor(params):
 )),
 ("transform.rotate", {"type": 'R', "value": 'PRESS'}, None),
 ("transform.resize", {"type": 'S', "value": 'PRESS'}, None),
-("node.move_detach_links",
- {"type": 'D', "value": 'PRESS', "alt": True},
- {"properties": [("TRANSFORM_OT_translate", [("view2d_edge_pan", 
True)])]}),
 ("node.move_detach_links_release",
  {"type": params.action_mouse, "value": 'CLICK_DRAG', "alt": True},
  {"properties": [("NODE_OT_translate_attach", 
[("TRANSFORM_OT_translate", [("view2d_edge_pan", 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] [7e3e4751b54] master: UI: Fix count on node editor/group header when fake user

2022-10-25 Thread Dalai Felinto

Commit: 7e3e4751b544bce290288de4af8651847d230655
Author: Dalai Felinto
Date:   Tue Oct 25 10:15:24 2022 +0200
Branches: master
https://developer.blender.org/rB7e3e4751b544bce290288de4af8651847d230655

UI: Fix count on node editor/group header when fake user

The number of node groups was including the fake user count.
I was ignoring the Fake User, and how it affects the id->us count.

This problem was present since the initial commit: 84825e4ed2e09895.

===

M   source/blender/editors/interface/interface_context_path.cc
M   source/blender/editors/space_node/node_draw.cc

===

diff --git a/source/blender/editors/interface/interface_context_path.cc 
b/source/blender/editors/interface/interface_context_path.cc
index 91b2f9613de..74a07d6edc8 100644
--- a/source/blender/editors/interface/interface_context_path.cc
+++ b/source/blender/editors/interface/interface_context_path.cc
@@ -45,7 +45,7 @@ void context_path_add_generic(Vector ,
 
   if (_type == _NodeTree) {
 ID *id = (ID *)ptr;
-path.append({name, int(icon), id->us});
+path.append({name, int(icon), ID_REAL_USERS(id)});
   }
   else {
 path.append({name, int(icon), 1});
diff --git a/source/blender/editors/space_node/node_draw.cc 
b/source/blender/editors/space_node/node_draw.cc
index 98b2cacd162..5ae6573df7c 100644
--- a/source/blender/editors/space_node/node_draw.cc
+++ b/source/blender/editors/space_node/node_draw.cc
@@ -2146,7 +2146,7 @@ static void node_draw_basis(const bContext ,
   "");
 UI_but_func_set(but, node_toggle_button_cb, , (void 
*)"NODE_OT_group_edit");
 if (node.id) {
-  UI_but_icon_indicator_number_set(but, node.id->us);
+  UI_but_icon_indicator_number_set(but, ID_REAL_USERS(node.id));
 }
 UI_block_emboss_set(, UI_EMBOSS);
   }

___
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] [84825e4ed2e] master: UI: Icon number indicator for data-blocks

2022-10-20 Thread Dalai Felinto

Commit: 84825e4ed2e098954f0c46adee4d65c8c0ba0e99
Author: Dalai Felinto
Date:   Thu Oct 20 16:37:07 2022 +0200
Branches: master
https://developer.blender.org/rB84825e4ed2e098954f0c46adee4d65c8c0ba0e99

UI: Icon number indicator for data-blocks

Adds the possibility of having a little number on top of icons.

At the moment this is used for:
* Outliner
* Node Editor bread-crumb
* Node Group node header

For the outliner there is almost no functional change. It is mostly a refactor
to handle the indicators as part of the icon shader instead of the outliner
draw code. (note that this was already recently changed in a5d3b648e3e2).

The difference is that now we use rounded border rectangle instead of
circles, and we can go up to 999 elements.

So for the outliner this shows the number of collapsed elements of a
certain type (e.g., mesh objects inside a collapsed collection).

For the node editors is being used to show the use count for the data-block.
This is important for the node editor, so users know whether the node-group
they are editing (or are about to edit) is used elsewhere. This is
particularly important when the Node Options are hidden, which is the
default for node groups appended from the asset libraries.

---

Note: This can be easily enabled for ID templates which can then be part
of T84669. It just need to call UI_but_icon_indicator_number_set in the
function template_add_button_search_menu.

---

Special thanks Clément Foucault for the help figuring out the shader,
Julian Eisel for the help navigating the UI code, and Pablo Vazquez for
the collaboration in this design solution.

For images showing the result check the Differential Revision.
Differential Revision: https://developer.blender.org/D16284

===

M   source/blender/blenlib/BLI_string.h
M   source/blender/blenlib/intern/string.c
M   source/blender/blenlib/tests/BLI_string_test.cc
M   source/blender/editors/include/UI_interface.h
M   source/blender/editors/include/UI_interface.hh
M   source/blender/editors/include/UI_interface_icons.h
M   source/blender/editors/interface/interface.cc
M   source/blender/editors/interface/interface_context_path.cc
M   source/blender/editors/interface/interface_icons.c
M   source/blender/editors/interface/interface_intern.h
M   source/blender/editors/interface/interface_layout.c
M   source/blender/editors/interface/interface_panel.cc
M   source/blender/editors/interface/interface_widgets.c
M   source/blender/editors/screen/area.c
M   source/blender/editors/space_file/file_draw.c
M   source/blender/editors/space_info/textview.c
M   source/blender/editors/space_node/node_draw.cc
M   source/blender/editors/space_node/node_relationships.cc
M   source/blender/editors/space_outliner/outliner_draw.cc
M   source/blender/gpu/CMakeLists.txt
M   source/blender/gpu/GPU_shader.h
M   source/blender/gpu/intern/gpu_shader_builtin.c
A   source/blender/gpu/shaders/gpu_shader_icon_frag.glsl
A   source/blender/gpu/shaders/gpu_shader_icon_vert.glsl
M   source/blender/gpu/shaders/infos/gpu_interface_info.hh
A   source/blender/gpu/shaders/infos/gpu_shader_icon_info.hh
M   source/blender/windowmanager/intern/wm_dragdrop.cc

===

diff --git a/source/blender/blenlib/BLI_string.h 
b/source/blender/blenlib/BLI_string.h
index 15926e8f2d2..17abcf52ecc 100644
--- a/source/blender/blenlib/BLI_string.h
+++ b/source/blender/blenlib/BLI_string.h
@@ -308,6 +308,28 @@ void BLI_str_format_byte_unit(char dst[15], long long int 
bytes, bool base_10) A
  * Length of 7 is the maximum of the resulting string, for example, `-15.5K\0`.
  */
 void BLI_str_format_decimal_unit(char dst[7], int number_to_format) 
ATTR_NONNULL();
+/**
+ * Format a count to up to 3 places (plus minus sign, plus '\0' terminator) 
string using long
+ * number names abbreviations. Used to produce a compact representation of 
large numbers as
+ * integers.
+ *
+ * It shows a lower bound instead of rounding the number.
+ *
+ * 1 -> 1
+ * 15 -> 15
+ * 155 -> 155
+ * 1555 -> 1K
+ * 1 -> 15K
+ * 15 -> .1M
+ * 155 -> 1M
+ * 1555 -> 15M
+ * 1 -> .1B
+ * 10 -> 1B
+ * ...
+ *
+ * Length of 5 is the maximum of the resulting string, for example, `-15K\0`.
+ */
+void BLI_str_format_integer_unit(char dst[5], int number_to_format) 
ATTR_NONNULL();
 /**
  * Compare two strings without regard to case.
  *
diff --git a/source/blender/blenlib/intern/string.c 
b/source/blender/blenlib/intern/string.c
index 89d31c5e93f..755d2dbd55d 100644
--- a/source/blender/blenlib/intern/string.c
+++ b/source/blender/blenlib/intern/string.c
@@ -1176,4 +1176,34 @@ void BLI_str_format_decimal_unit(char dst[7], int 
number_to_format)
   BLI_snprintf(dst, dst_len, "%.*f%s", decimals, number_to_form

[Bf-blender-cvs] [6beeba1ef5a] master: Nodes: Duplicate Linked operator + User Preference option for Node Tree

2022-10-13 Thread Dalai Felinto

Commit: 6beeba1ef5ae406805ed4947c04f8f3af1c667ff
Author: Dalai Felinto
Date:   Thu Oct 13 20:06:20 2022 +0200
Branches: master
https://developer.blender.org/rB6beeba1ef5ae406805ed4947c04f8f3af1c667ff

Nodes: Duplicate Linked operator + User Preference option for Node Tree

This operator (Alt + D) allows users to explicitly create a linked copy
of a group node (same current behaviour for the Duplicate operator).

The duplicate operator (Shift + D) now takes the new User Preference
duplicate data option for Node Tree into account. It is by default
disabled, leading to no functional change for users.

Although we could make in the future make this option "on" by default,
to make it consistent with the rest of Blender we do not at the time.

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

===

M   release/scripts/presets/keyconfig/keymap_data/blender_default.py
M   release/scripts/startup/bl_ui/space_node.py
M   release/scripts/startup/bl_ui/space_userpref.py
M   source/blender/editors/space_node/node_edit.cc
M   source/blender/editors/space_node/node_ops.cc
M   source/blender/makesdna/DNA_userdef_enums.h
M   source/blender/makesrna/intern/rna_userdef.c

===

diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py 
b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
index 5ab9cdb542a..b83c4916330 100644
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@ -2073,6 +2073,8 @@ def km_node_editor(params):
 op_menu("NODE_MT_add", {"type": 'A', "value": 'PRESS', "shift": True}),
 ("node.duplicate_move", {"type": 'D', "value": 'PRESS', "shift": True},
  {"properties": [("NODE_OT_translate_attach", 
[("TRANSFORM_OT_translate", [("view2d_edge_pan", True)])])]}),
+("node.duplicate_move_linked", {"type": 'D', "value": 'PRESS', "alt": 
True},
+ {"properties": [("NODE_OT_translate_attach", 
[("TRANSFORM_OT_translate", [("view2d_edge_pan", True)])])]}),
 ("node.duplicate_move_keep_inputs", {"type": 'D', "value": 'PRESS', 
"shift": True, "ctrl": True},
  {"properties": [("NODE_OT_translate_attach", 
[("TRANSFORM_OT_translate", [("view2d_edge_pan", True)])])]}),
 ("node.parent_set", {"type": 'P', "value": 'PRESS', "ctrl": True}, 
None),
diff --git a/release/scripts/startup/bl_ui/space_node.py 
b/release/scripts/startup/bl_ui/space_node.py
index f4070a8289d..593c6400529 100644
--- a/release/scripts/startup/bl_ui/space_node.py
+++ b/release/scripts/startup/bl_ui/space_node.py
@@ -318,6 +318,7 @@ class NODE_MT_node(Menu):
 layout.operator("node.clipboard_copy", text="Copy")
 layout.operator("node.clipboard_paste", text="Paste")
 layout.operator("node.duplicate_move")
+layout.operator("node.duplicate_move_linked")
 layout.operator("node.delete")
 layout.operator("node.delete_reconnect")
 
diff --git a/release/scripts/startup/bl_ui/space_userpref.py 
b/release/scripts/startup/bl_ui/space_userpref.py
index a9736feb057..53999f3c154 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -397,17 +397,18 @@ class 
USERPREF_PT_edit_objects_duplicate_data(EditingPanel, CenterAlignMixIn, Pa
 # col.prop(edit, "use_duplicate_fcurve", text="F-Curve")  # Not 
implemented.
 col.prop(edit, "use_duplicate_curves", text="Curves")
 col.prop(edit, "use_duplicate_grease_pencil", text="Grease Pencil")
+col.prop(edit, "use_duplicate_lattice", text="Lattice")
 
 col = flow.column()
-col.prop(edit, "use_duplicate_lattice", text="Lattice")
 col.prop(edit, "use_duplicate_light", text="Light")
 col.prop(edit, "use_duplicate_lightprobe", text="Light Probe")
 col.prop(edit, "use_duplicate_material", text="Material")
 col.prop(edit, "use_duplicate_mesh", text="Mesh")
 col.prop(edit, "use_duplicate_metaball", text="Metaball")
+col.prop(edit, "use_duplicate_node_tree", text="Node Tree")
+col.prop(edit, "use_duplicate_particle", text="Particle

[Bf-blender-cvs] [a5d3b648e3e] master: Outliner: Use row background color for elements count indicator

2022-10-13 Thread Dalai Felinto

Commit: a5d3b648e3e2d68c99d6f7d9dad466ff4e302f34
Author: Dalai Felinto
Date:   Thu Oct 13 20:00:40 2022 +0200
Branches: master
https://developer.blender.org/rBa5d3b648e3e2d68c99d6f7d9dad466ff4e302f34

Outliner: Use row background color for elements count indicator

From T101799:

Currently, the count indicator background and color are hardcoded to
black and white in an attempt to maximize contrast, at the expense of
being too prominent even when not needed.

Changing the background color to match the row (or any other element)
background, would make it look like the data-block icon is masked
out, improving readability while not standing out too much.

The circle background color should not have transparency, as it does
now. And the text inside should match the color of the text used for the
parent element (instead of hardcoded white). This should make it look
good in any theme.

---

Before:
{F13674265, size=full}

After:
{F13674269, size=full}

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

===

M   source/blender/editors/space_outliner/outliner_draw.cc

===

diff --git a/source/blender/editors/space_outliner/outliner_draw.cc 
b/source/blender/editors/space_outliner/outliner_draw.cc
index 8a1119d5e66..34d1e1bb546 100644
--- a/source/blender/editors/space_outliner/outliner_draw.cc
+++ b/source/blender/editors/space_outliner/outliner_draw.cc
@@ -2941,16 +2941,66 @@ static bool tselem_draw_icon(uiBlock *block,
   return true;
 }
 
+static bool outliner_is_main_row(const ARegion *region, const int ys)
+{
+  int ystart;
+
+  ystart = int(region->v2d.tot.ymax);
+  ystart = UI_UNIT_Y * (ystart / (UI_UNIT_Y)) - OL_Y_OFFSET;
+
+  return ((ys - ystart) / UI_UNIT_Y) % 2;
+}
+
+/**
+ * Get the expected row background color to use for the data-block counter
+ *
+ * This reproduces somes of the logic of outliner_draw_highlights.
+ * At the moment it doesn't implement the search match color since
+ * we don't draw the data-block counter in those cases.
+ */
+static void outliner_get_row_color(const ARegion *region,
+   const TreeElement *te,
+   int ys,
+   float r_color[4])
+{
+  const TreeStoreElem *tselem = TREESTORE(te);
+
+  if ((tselem->flag & TSE_ACTIVE) && (tselem->flag & TSE_SELECTED)) {
+UI_GetThemeColor3fv(TH_ACTIVE, r_color);
+  }
+  else if (tselem->flag & TSE_SELECTED) {
+UI_GetThemeColor3fv(TH_SELECT_HIGHLIGHT, r_color);
+  }
+  else if (outliner_is_main_row(region, ys)) {
+UI_GetThemeColor3fv(TH_BACK, r_color);
+  }
+  else {
+float color_alternating[4];
+UI_GetThemeColor4fv(TH_ROW_ALTERNATE, color_alternating);
+UI_GetThemeColorBlend3f(TH_BACK, TH_ROW_ALTERNATE, color_alternating[3], 
r_color);
+  }
+
+  if (tselem->flag & TSE_HIGHLIGHTED) {
+const float color_highlight[4] = {1.0f, 1.0f, 1.0f, 0.13f};
+interp_v3_v3v3(r_color, r_color, color_highlight, color_highlight[3]);
+  }
+  r_color[3] = 1.0f;
+}
+
 /**
  * For icon-only children of a collapsed tree,
  * Draw small number over the icon to show how many items of this type are 
displayed.
  */
-static void outliner_draw_iconrow_number(const uiFontStyle *fstyle,
+static void outliner_draw_iconrow_number(const ARegion *region,
+ const uiFontStyle *fstyle,
  int offsx,
  int ys,
+ const TreeElement *te_visible,
  const int num_elements)
 {
-  const float color[4] = {0.0f, 0.0f, 0.0f, 1.0f};
+  float color[4];
+  outliner_get_row_color(region, te_visible, ys, color);
+
   float ufac = 0.25f * UI_UNIT_X;
   float offset_x = float(offsx) + UI_UNIT_X * 0.35f;
   rctf rect{};
@@ -2961,12 +3011,13 @@ static void outliner_draw_iconrow_number(const 
uiFontStyle *fstyle,
 float(ys) - UI_UNIT_Y * 0.2f + UI_UNIT_Y - ufac);
 
   UI_draw_roundbox_corner_set(UI_CNR_ALL);
-  UI_draw_roundbox_aa(, true, float(UI_UNIT_Y) / 2.0f - ufac, color);
+  UI_draw_roundbox_4fv_ex(
+  , color, NULL, 1.0f, color, U.pixelsize, float(UI_UNIT_Y) / 2.0f - 
ufac);
 
   /* Now the numbers. */
   uchar text_col[4];
 
-  UI_GetThemeColor3ubv(TH_TEXT_HI, text_col);
+  UI_GetThemeColor3ubv(TH_TEXT, text_col);
   text_col[3] = 255;
 
   uiFontStyle fstyle_small = *fstyle;
@@ -3018,7 +3069,9 @@ static void outliner_draw_active_indicator(const float 
minx,
   GPU_blend(GPU_BLEND_ALPHA); /* Round-box disables. */
 }
 
-static void outliner_draw_iconrow_doit(uiBlock *block,
+static void outliner_draw_iconrow_doit(const ARegion *region,
+   uiBlock *block,
+   TreeElement *te_visible,

[Bf-blender-cvs] [bd77cdde586] master: Build Environment: Update Ubuntu instructions to include bison

2022-10-06 Thread Dalai Felinto

Commit: bd77cdde5865ff311a5af05b1dd0d5a8aa36bb37
Author: Dalai Felinto
Date:   Thu Oct 6 18:09:21 2022 +0200
Branches: master
https://developer.blender.org/rBbd77cdde5865ff311a5af05b1dd0d5a8aa36bb37

Build Environment: Update Ubuntu instructions to include bison

Ubuntu also requires bison (just like macOS seems to do).

===

M   build_files/build_environment/cmake/check_software.cmake

===

diff --git a/build_files/build_environment/cmake/check_software.cmake 
b/build_files/build_environment/cmake/check_software.cmake
index cc8fead6f81..bdb9036e3f9 100644
--- a/build_files/build_environment/cmake/check_software.cmake
+++ b/build_files/build_environment/cmake/check_software.cmake
@@ -46,7 +46,7 @@ if(UNIX)
   "  ${_software_missing}\n"
   "\n"
   "On Debian and Ubuntu:\n"
-  "  apt install autoconf automake libtool yasm tcl ninja-build meson 
python3-mako\n"
+  "  apt install autoconf automake bison libtool yasm tcl ninja-build 
meson python3-mako\n"
   "\n"
   "On macOS (with homebrew):\n"
   "  brew install autoconf automake bison flex libtool meson ninja 
pkg-config yasm\n"

___
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] [f1990bd9005] master: UI: Nodes typo in "distribute points in volume" node

2022-09-29 Thread Dalai Felinto

Commit: f1990bd9005fd7cd68a32618116b78356912659f
Author: Dalai Felinto
Date:   Thu Sep 29 11:15:44 2022 +0200
Branches: master
https://developer.blender.org/rBf1990bd9005fd7cd68a32618116b78356912659f

UI: Nodes typo in "distribute points in volume" node

Distribute Points In Volume →  Distribute Points in Volume.

===

M   source/blender/nodes/NOD_static_types.h

===

diff --git a/source/blender/nodes/NOD_static_types.h 
b/source/blender/nodes/NOD_static_types.h
index 457f3468e5e..c4e1d54baef 100644
--- a/source/blender/nodes/NOD_static_types.h
+++ b/source/blender/nodes/NOD_static_types.h
@@ -307,7 +307,7 @@ DefNode(GeometryNode, 
GEO_NODE_CURVE_TOPOLOGY_CURVE_OF_POINT, 0, "CURVE_OF_POINT
 DefNode(GeometryNode, GEO_NODE_CURVE_TOPOLOGY_POINTS_OF_CURVE, 0, 
"POINTS_OF_CURVE", PointsOfCurve, "Points of Curve", "Retrieve a point index 
within a curve")
 DefNode(GeometryNode, GEO_NODE_DEFORM_CURVES_ON_SURFACE, 0, 
"DEFORM_CURVES_ON_SURFACE", DeformCurvesOnSurface, "Deform Curves on Surface", 
"Translate and rotate curves based on changes between the object's original and 
evaluated surface mesh")
 DefNode(GeometryNode, GEO_NODE_DELETE_GEOMETRY, def_geo_delete_geometry, 
"DELETE_GEOMETRY", DeleteGeometry, "Delete Geometry", "Remove selected elements 
of a geometry")
-DefNode(GeometryNode, GEO_NODE_DISTRIBUTE_POINTS_IN_VOLUME, 
def_geo_distribute_points_in_volume, "DISTRIBUTE_POINTS_IN_VOLUME", 
DistributePointsInVolume, "Distribute Points In Volume", "Generate points 
inside a volume")
+DefNode(GeometryNode, GEO_NODE_DISTRIBUTE_POINTS_IN_VOLUME, 
def_geo_distribute_points_in_volume, "DISTRIBUTE_POINTS_IN_VOLUME", 
DistributePointsInVolume, "Distribute Points in Volume", "Generate points 
inside a volume")
 DefNode(GeometryNode, GEO_NODE_DISTRIBUTE_POINTS_ON_FACES, 
def_geo_distribute_points_on_faces, "DISTRIBUTE_POINTS_ON_FACES", 
DistributePointsOnFaces, "Distribute Points on Faces", "Generate points spread 
out on the surface of a mesh")
 DefNode(GeometryNode, GEO_NODE_DUAL_MESH, 0, "DUAL_MESH", DualMesh, "Dual 
Mesh", "Convert Faces into vertices and vertices into faces")
 DefNode(GeometryNode, GEO_NODE_DUPLICATE_ELEMENTS, def_geo_duplicate_elements, 
"DUPLICATE_ELEMENTS", DuplicateElements, "Duplicate Elements", "Generate an 
arbitrary number copies of each selected input element")

___
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] [fae975dd54d] master: UI: Nodes re-organize the nodes in alphabetical order

2022-09-29 Thread Dalai Felinto

Commit: fae975dd54df97973895136a8c3afc7e33e2ff71
Author: Dalai Felinto
Date:   Thu Sep 29 11:08:21 2022 +0200
Branches: master
https://developer.blender.org/rBfae975dd54df97973895136a8c3afc7e33e2ff71

UI: Nodes re-organize the nodes in alphabetical order

This was a regression introduced after the 3.3 release.

This fix T101452

===

M   release/scripts/startup/bl_ui/node_add_menu_geometry.py

===

diff --git a/release/scripts/startup/bl_ui/node_add_menu_geometry.py 
b/release/scripts/startup/bl_ui/node_add_menu_geometry.py
index 73763c3d72c..3544c9a4925 100644
--- a/release/scripts/startup/bl_ui/node_add_menu_geometry.py
+++ b/release/scripts/startup/bl_ui/node_add_menu_geometry.py
@@ -11,9 +11,9 @@ class NODE_MT_geometry_node_GEO_ATTRIBUTE(Menu):
 
 def draw(self, _context):
 layout = self.layout
+node_add_menu.add_node_type(layout, "GeometryNodeAttributeStatistic")
 node_add_menu.add_node_type(layout, "GeometryNodeCaptureAttribute")
 node_add_menu.add_node_type(layout, "GeometryNodeAttributeDomainSize")
-node_add_menu.add_node_type(layout, "GeometryNodeAttributeStatistic")
 node_add_menu.add_node_type(layout, "GeometryNodeRemoveAttribute")
 node_add_menu.add_node_type(layout, "GeometryNodeStoreNamedAttribute")
 
@@ -24,14 +24,14 @@ class NODE_MT_geometry_node_GEO_COLOR(Menu):
 
 def draw(self, _context):
 layout = self.layout
+node_add_menu.add_node_type(layout, "ShaderNodeValToRGB")
+node_add_menu.add_node_type(layout, "FunctionNodeCombineColor")
 props = node_add_menu.add_node_type(layout, "ShaderNodeMix", 
label=iface_("Mix Color"))
 ops = props.settings.add()
 ops.name = "data_type"
 ops.value = "'RGBA'"
 node_add_menu.add_node_type(layout, "ShaderNodeRGBCurve")
-node_add_menu.add_node_type(layout, "ShaderNodeValToRGB")
 node_add_menu.add_node_type(layout, "FunctionNodeSeparateColor")
-node_add_menu.add_node_type(layout, "FunctionNodeCombineColor")
 
 
 class NODE_MT_geometry_node_GEO_CURVE(Menu):
@@ -77,14 +77,14 @@ class NODE_MT_geometry_node_GEO_PRIMITIVES_CURVE(Menu):
 
 def draw(self, _context):
 layout = self.layout
-node_add_menu.add_node_type(layout, "GeometryNodeCurvePrimitiveLine")
+node_add_menu.add_node_type(layout, "GeometryNodeCurveArc")
+node_add_menu.add_node_type(layout, 
"GeometryNodeCurvePrimitiveBezierSegment")
 node_add_menu.add_node_type(layout, "GeometryNodeCurvePrimitiveCircle")
-node_add_menu.add_node_type(layout, "GeometryNodeCurveStar")
+node_add_menu.add_node_type(layout, "GeometryNodeCurvePrimitiveLine")
 node_add_menu.add_node_type(layout, "GeometryNodeCurveSpiral")
-node_add_menu.add_node_type(layout, "GeometryNodeCurveArc")
 node_add_menu.add_node_type(layout, "GeometryNodeCurveQuadraticBezier")
 node_add_menu.add_node_type(layout, 
"GeometryNodeCurvePrimitiveQuadrilateral")
-node_add_menu.add_node_type(layout, 
"GeometryNodeCurvePrimitiveBezierSegment")
+node_add_menu.add_node_type(layout, "GeometryNodeCurveStar")
 
 
 class NODE_MT_geometry_node_curve_topology(Menu):
@@ -93,9 +93,9 @@ class NODE_MT_geometry_node_curve_topology(Menu):
 
 def draw(self, _context):
 layout = self.layout
+node_add_menu.add_node_type(layout, 
"GeometryNodeInputControlPointNeighbors")
 node_add_menu.add_node_type(layout, "GeometryNodeCurveOfPoint")
 node_add_menu.add_node_type(layout, "GeometryNodePointsOfCurve")
-node_add_menu.add_node_type(layout, 
"GeometryNodeInputControlPointNeighbors")
 
 
 class NODE_MT_geometry_node_GEO_GEOMETRY(Menu):
@@ -225,12 +225,12 @@ class NODE_MT_category_PRIMITIVES_MESH(Menu):
 
 def draw(self, _context):
 layout = self.layout
-node_add_menu.add_node_type(layout, "GeometryNodeMeshCircle")
 node_add_menu.add_node_type(layout, "GeometryNodeMeshCone")
 node_add_menu.add_node_type(layout, "GeometryNodeMeshCube")
 node_add_menu.add_node_type(layout, "GeometryNodeMeshCylinder")
 node_add_menu.add_node_type(layout, "GeometryNodeMeshGrid")
 node_add_menu.add_node_type(layout, "GeometryNodeMeshIcoSphere")
+node_add_menu.add_node_type(layout, "GeometryNodeMeshCircle")
 node_add_menu.add_node_type(layout, "GeometryNodeMeshLine")
 
 
@@ -279,12

[Bf-blender-cvs] [78bfaf1a4fe] master: File Browser: Manual auto-increase name support for output filepaths

2022-09-21 Thread Dalai Felinto

Commit: 78bfaf1a4fe1a71408e4dab7268b1af1ed1b88f4
Author: Dalai Felinto
Date:   Wed Sep 21 10:57:36 2022 +0200
Branches: master
https://developer.blender.org/rB78bfaf1a4fe1a71408e4dab7268b1af1ed1b88f4

File Browser: Manual auto-increase name support for output filepaths

This functionality was present until Blender 2.80.  Basically it adds back the
"+" and "-" buttons in the file browser when it stores an output filepath.

This is useful for someone rendering multiple versions of an animation (or a
composition) to compare.

At the moment this is used for the render output, and the File Output node in
the compositor.

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

===

M   source/blender/editors/space_buttons/buttons_ops.c
M   source/blender/makesrna/RNA_types.h
M   source/blender/makesrna/intern/rna_nodetree.c
M   source/blender/makesrna/intern/rna_rna.c
M   source/blender/makesrna/intern/rna_scene.c
M   source/blender/windowmanager/intern/wm_operator_props.c

===

diff --git a/source/blender/editors/space_buttons/buttons_ops.c 
b/source/blender/editors/space_buttons/buttons_ops.c
index 10fb008049d..a9ce9a3d723 100644
--- a/source/blender/editors/space_buttons/buttons_ops.c
+++ b/source/blender/editors/space_buttons/buttons_ops.c
@@ -337,6 +337,12 @@ static int file_browse_invoke(bContext *C, wmOperator *op, 
const wmEvent *event)
   RNA_string_set(op->ptr, path_prop, str);
   MEM_freeN(str);
 
+  PropertyRNA *prop_check_existing = RNA_struct_find_property(op->ptr, 
"check_existing");
+  if (!RNA_property_is_set(op->ptr, prop_check_existing)) {
+const bool is_output_path = (RNA_property_flag(prop) & PROP_PATH_OUTPUT) 
!= 0;
+RNA_property_boolean_set(op->ptr, prop_check_existing, is_output_path);
+  }
+
   WM_event_add_fileselect(C, op);
 
   return OPERATOR_RUNNING_MODAL;
diff --git a/source/blender/makesrna/RNA_types.h 
b/source/blender/makesrna/RNA_types.h
index 353b2903fb1..b9556a411cf 100644
--- a/source/blender/makesrna/RNA_types.h
+++ b/source/blender/makesrna/RNA_types.h
@@ -179,7 +179,7 @@ typedef enum PropertySubType {
 
 /* Make sure enums are updated with these */
 /* HIGHEST FLAG IN USE: 1 << 31
- * FREE FLAGS: 2, 9, 11, 13, 14, 15. */
+ * FREE FLAGS: 9, 11, 13, 14, 15. */
 typedef enum PropertyFlag {
   /**
* Editable means the property is editable in the user
@@ -299,6 +299,12 @@ typedef enum PropertyFlag {
* properties which denotes whether modifier panel is collapsed or not.
*/
   PROP_NO_DEG_UPDATE = (1 << 30),
+
+  /**
+   * Filepaths that refer to output get a special treatment such
+   * as having the +/- operators available in the file browser.
+   **/
+  PROP_PATH_OUTPUT = (1 << 2),
 } PropertyFlag;
 
 /**
diff --git a/source/blender/makesrna/intern/rna_nodetree.c 
b/source/blender/makesrna/intern/rna_nodetree.c
index 971043158e1..892d523bdcf 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -7060,6 +7060,7 @@ static void def_cmp_output_file(BlenderRNA *brna, 
StructRNA *srna)
   prop = RNA_def_property(srna, "base_path", PROP_STRING, PROP_FILEPATH);
   RNA_def_property_string_sdna(prop, NULL, "base_path");
   RNA_def_property_ui_text(prop, "Base Path", "Base output path for the 
image");
+  RNA_def_property_flag(prop, PROP_PATH_OUTPUT);
   RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 
   prop = RNA_def_property(srna, "active_input_index", PROP_INT, PROP_NONE);
diff --git a/source/blender/makesrna/intern/rna_rna.c 
b/source/blender/makesrna/intern/rna_rna.c
index 57f75fe892c..8d5e82cbfa8 100644
--- a/source/blender/makesrna/intern/rna_rna.c
+++ b/source/blender/makesrna/intern/rna_rna.c
@@ -160,6 +160,7 @@ const EnumPropertyItem rna_enum_property_flag_items[] = {
  0,
  "Update on every keystroke in textedit 'mode'",
  ""},
+{PROP_PATH_OUTPUT, "OUTPUT_PATH", 0, "Output Path", ""},
 {0, NULL, 0, NULL, NULL},
 };
 
@@ -729,6 +730,12 @@ static bool 
rna_Property_is_library_editable_flag_get(PointerRNA *ptr)
   return (prop->flag & PROP_LIB_EXCEPTION) != 0;
 }
 
+static bool rna_Property_is_path_output_flag_get(PointerRNA *ptr)
+{
+  PropertyRNA *prop = (PropertyRNA *)ptr->data;
+  return (prop->flag & PROP_PATH_OUTPUT) != 0;
+}
+
 static int rna_Property_tags_get(PointerRNA *ptr)
 {
   return RNA_property_tags(ptr->data);
@@ -3023,6 +3030,12 @@ static void rna_def_property(BlenderRNA *brna)
   RNA_def_property_ui_text(
   prop, "Library Editable", "Property is editable from linked instances 
(changes not saved)");
 
+  prop = RNA_def_property(srna, "is_path_output"

[Bf-blender-cvs] [15593299f3d] master: Revert "Cleanup: Fix warning unused variable 'mode' when doing make lite"

2022-09-21 Thread Dalai Felinto

Commit: 15593299f3d9164fe1c2ca91d317206a2b64ad6e
Author: Dalai Felinto
Date:   Wed Sep 21 11:05:35 2022 +0200
Branches: master
https://developer.blender.org/rB15593299f3d9164fe1c2ca91d317206a2b64ad6e

Revert "Cleanup: Fix warning unused variable 'mode' when doing make lite"

Sorry, this was working before I rebased. I believe the warning was
fixed and the rebase still applied.

The commit as it was introduced building problems

This reverts commit ae21319d7f7d3e779c25b08d07a1458d6c054560.

===

M   
source/blender/nodes/geometry/nodes/node_geo_distribute_points_in_volume.cc

===

diff --git 
a/source/blender/nodes/geometry/nodes/node_geo_distribute_points_in_volume.cc 
b/source/blender/nodes/geometry/nodes/node_geo_distribute_points_in_volume.cc
index e0e43ce9f0a..b3fc24ded68 100644
--- 
a/source/blender/nodes/geometry/nodes/node_geo_distribute_points_in_volume.cc
+++ 
b/source/blender/nodes/geometry/nodes/node_geo_distribute_points_in_volume.cc
@@ -181,7 +181,6 @@ static void point_scatter_density_grid(const 
openvdb::FloatGrid ,
 
 static void geo_node_distribute_points_in_volume_exec(GeoNodeExecParams params)
 {
-#ifdef WITH_OPENVDB
   GeometrySet geometry_set_in = params.extract_input("Volume");
 
 #ifdef WITH_OPENVDB

___
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] [ae21319d7f7] master: Cleanup: Fix warning unused variable 'mode' when doing make lite

2022-09-21 Thread Dalai Felinto

Commit: ae21319d7f7d3e779c25b08d07a1458d6c054560
Author: Dalai Felinto
Date:   Tue Sep 20 11:48:43 2022 +0200
Branches: master
https://developer.blender.org/rBae21319d7f7d3e779c25b08d07a1458d6c054560

Cleanup: Fix warning unused variable 'mode' when doing make lite

===

M   
source/blender/nodes/geometry/nodes/node_geo_distribute_points_in_volume.cc

===

diff --git 
a/source/blender/nodes/geometry/nodes/node_geo_distribute_points_in_volume.cc 
b/source/blender/nodes/geometry/nodes/node_geo_distribute_points_in_volume.cc
index b3fc24ded68..e0e43ce9f0a 100644
--- 
a/source/blender/nodes/geometry/nodes/node_geo_distribute_points_in_volume.cc
+++ 
b/source/blender/nodes/geometry/nodes/node_geo_distribute_points_in_volume.cc
@@ -181,6 +181,7 @@ static void point_scatter_density_grid(const 
openvdb::FloatGrid ,
 
 static void geo_node_distribute_points_in_volume_exec(GeoNodeExecParams params)
 {
+#ifdef WITH_OPENVDB
   GeometrySet geometry_set_in = params.extract_input("Volume");
 
 #ifdef WITH_OPENVDB

___
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] [dc937c5aee4] master: Fix Auto-offset for nodes: Revert "Cleanup: Return early"

2022-09-09 Thread Dalai Felinto

Commit: dc937c5aee4532485c1927c278fe099f2f471f7e
Author: Dalai Felinto
Date:   Fri Sep 9 11:50:21 2022 +0200
Branches: master
https://developer.blender.org/rBdc937c5aee4532485c1927c278fe099f2f471f7e

Fix Auto-offset for nodes: Revert "Cleanup: Return early"

This "cleanup" commit broke Auto-offset for nodes.

This reverts commit e3ef6a6660032ca18af53dd24cd19bf36e56a85c.

===

M   source/blender/editors/space_node/node_relationships.cc
M   source/blender/editors/space_node/node_select.cc

===

diff --git a/source/blender/editors/space_node/node_relationships.cc 
b/source/blender/editors/space_node/node_relationships.cc
index 40f5d20d06d..7dbaa8ccd6d 100644
--- a/source/blender/editors/space_node/node_relationships.cc
+++ b/source/blender/editors/space_node/node_relationships.cc
@@ -1727,35 +1727,34 @@ static int node_attach_invoke(bContext *C, wmOperator 
*UNUSED(op), const wmEvent
   SpaceNode  = *CTX_wm_space_node(C);
   bNodeTree  = *snode.edittree;
   bNode *frame = node_find_frame_to_attach(region, ntree, event->mval);
-  if (frame == nullptr) {
-return OPERATOR_CANCELLED;
-  }
 
-  LISTBASE_FOREACH_BACKWARD (bNode *, node, ) {
-if (node->flag & NODE_SELECT) {
-  if (node->parent == nullptr) {
-/* disallow moving a parent into its child */
-if (nodeAttachNodeCheck(frame, node) == false) {
-  /* attach all unparented nodes */
-  nodeAttachNode(node, frame);
-}
-  }
-  else {
-/* attach nodes which share parent with the frame */
-bNode *parent;
-for (parent = frame->parent; parent; parent = parent->parent) {
-  if (parent == node->parent) {
-break;
-  }
-}
-
-if (parent) {
+  if (frame) {
+LISTBASE_FOREACH_BACKWARD (bNode *, node, ) {
+  if (node->flag & NODE_SELECT) {
+if (node->parent == nullptr) {
   /* disallow moving a parent into its child */
   if (nodeAttachNodeCheck(frame, node) == false) {
-nodeDetachNode(node);
+/* attach all unparented nodes */
 nodeAttachNode(node, frame);
   }
 }
+else {
+  /* attach nodes which share parent with the frame */
+  bNode *parent;
+  for (parent = frame->parent; parent; parent = parent->parent) {
+if (parent == node->parent) {
+  break;
+}
+  }
+
+  if (parent) {
+/* disallow moving a parent into its child */
+if (nodeAttachNodeCheck(frame, node) == false) {
+  nodeDetachNode(node);
+  nodeAttachNode(node, frame);
+}
+  }
+}
   }
 }
   }
diff --git a/source/blender/editors/space_node/node_select.cc 
b/source/blender/editors/space_node/node_select.cc
index 82aaa2c3cc6..1f1ce9c0c2b 100644
--- a/source/blender/editors/space_node/node_select.cc
+++ b/source/blender/editors/space_node/node_select.cc
@@ -14,7 +14,6 @@
 #include "BLI_lasso_2d.h"
 #include "BLI_listbase.h"
 #include "BLI_rect.h"
-#include "BLI_set.hh"
 #include "BLI_string.h"
 #include "BLI_string_search.h"
 #include "BLI_string_utf8.h"
@@ -645,29 +644,28 @@ static bool node_mouse_select(bContext *C,
 }
   }
 
-  if (!(changed || found)) {
-return false;
-  }
+  /* update node order */
+  if (changed || found) {
+bool active_texture_changed = false;
+bool viewer_node_changed = false;
+if ((node != nullptr) && (node_was_selected == false || 
params->select_passthrough == false)) {
+  viewer_node_changed = (node->flag & NODE_DO_OUTPUT) == 0 && node->type 
== GEO_NODE_VIEWER;
+  ED_node_set_active(, , snode.edittree, node, 
_texture_changed);
+}
+else if (node != nullptr && node->type == GEO_NODE_VIEWER) {
+  ED_spreadsheet_context_paths_set_geometry_node(, , node);
+}
+ED_node_set_active_viewer_key();
+node_sort(*snode.edittree);
+if ((active_texture_changed && has_workbench_in_texture_color(wm, scene, 
ob)) ||
+viewer_node_changed) {
+  DEG_id_tag_update(>id, ID_RECALC_COPY_ON_WRITE);
+}
 
-  bool active_texture_changed = false;
-  bool viewer_node_changed = false;
-  if ((node != nullptr) && (node_was_selected == false || 
params->select_passthrough == false)) {
-viewer_node_changed = (node->flag & NODE_DO_OUTPUT) == 0 && node->type == 
GEO_NODE_VIEWER;
-ED_node_set_active(, , snode.edittree, node, 
_texture_changed);
-  }
-  else if (node != nullptr && node->type == GEO_NODE_VIEWER) {
-ED_spreadsheet_context_paths_set_geometry_node(, , node);
-  }
-  ED_node_set_active_viewer_key();
-  nod

[Bf-blender-cvs] [30ec628d432] blender-v3.3-release: UI: Fix Geometry Nodes "Is Face Planar" name

2022-08-31 Thread Dalai Felinto

Commit: 30ec628d432af2bbf729aeba7fa1bd14d2c06811
Author: Dalai Felinto
Date:   Wed Aug 31 17:28:44 2022 +0200
Branches: blender-v3.3-release
https://developer.blender.org/rB30ec628d432af2bbf729aeba7fa1bd14d2c06811

UI: Fix Geometry Nodes "Is Face Planar" name

Old name: "Face is Planar"
New name: "Is Face Planar"

This follows the current convention (Is Shade Smooth, Is Viewport, ...).

===

M   source/blender/nodes/NOD_static_types.h

===

diff --git a/source/blender/nodes/NOD_static_types.h 
b/source/blender/nodes/NOD_static_types.h
index 8a89dd46e30..8e306b16b07 100644
--- a/source/blender/nodes/NOD_static_types.h
+++ b/source/blender/nodes/NOD_static_types.h
@@ -328,7 +328,7 @@ DefNode(GeometryNode, GEO_NODE_INPUT_MESH_EDGE_ANGLE, 0, 
"MESH_EDGE_ANGLE", Inpu
 DefNode(GeometryNode, GEO_NODE_INPUT_MESH_EDGE_NEIGHBORS, 0, 
"MESH_EDGE_NEIGHBORS",InputMeshEdgeNeighbors, "Edge Neighbors", "Retrieve the 
number of faces that use each edge as one of their sides")
 DefNode(GeometryNode, GEO_NODE_INPUT_MESH_EDGE_VERTICES, 0, 
"MESH_EDGE_VERTICES", InputMeshEdgeVertices, "Edge Vertices", "Retrieve 
topology information relating to each edge of a mesh")
 DefNode(GeometryNode, GEO_NODE_INPUT_MESH_FACE_AREA, 0, "MESH_FACE_AREA", 
InputMeshFaceArea, "Face Area", "Calculate the surface area of a mesh's faces")
-DefNode(GeometryNode, GEO_NODE_INPUT_MESH_FACE_IS_PLANAR, 0, 
"MESH_FACE_IS_PLANAR",InputMeshFaceIsPlanar, "Face is Planar", "Retrieve 
whether all triangles in a face are on the same plane, i.e. whether have the 
same normal")
+DefNode(GeometryNode, GEO_NODE_INPUT_MESH_FACE_IS_PLANAR, 0, 
"MESH_FACE_IS_PLANAR",InputMeshFaceIsPlanar, "Is Face Planar", "Retrieve 
whether all triangles in a face are on the same plane, i.e. whether have the 
same normal")
 DefNode(GeometryNode, GEO_NODE_INPUT_MESH_FACE_NEIGHBORS, 0, 
"MESH_FACE_NEIGHBORS",InputMeshFaceNeighbors, "Face Neighbors", "Retrieve 
topology information relating to each face of a mesh")
 DefNode(GeometryNode, GEO_NODE_INPUT_MESH_ISLAND, 0, "MESH_ISLAND", 
InputMeshIsland, "Mesh Island", "Retrieve information about separate connected 
regions in a mesh")
 DefNode(GeometryNode, GEO_NODE_INPUT_MESH_VERTEX_NEIGHBORS, 0, 
"MESH_VERTEX_NEIGHBORS", InputMeshVertexNeighbors, "Vertex Neighbors", 
"Retrieve topology information relating to each vertex of a 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] [db98007c3ab] blender-v3.3-release: UI: Fix Geometry Nodes "Mesh to Volume" name (typo)

2022-08-31 Thread Dalai Felinto

Commit: db98007c3abd78f7beb2a4f63f9f51b7b135f9a8
Author: Dalai Felinto
Date:   Wed Aug 31 17:21:23 2022 +0200
Branches: blender-v3.3-release
https://developer.blender.org/rBdb98007c3abd78f7beb2a4f63f9f51b7b135f9a8

UI: Fix Geometry Nodes "Mesh to Volume" name (typo)

Old name: "Mesh To Volume"
New name: "Mesh to Volume"

This is consistent with what we do for the other nodes
(Mesh to Curve, Mesh to Points).

===

M   source/blender/nodes/NOD_static_types.h

===

diff --git a/source/blender/nodes/NOD_static_types.h 
b/source/blender/nodes/NOD_static_types.h
index 586d3e36177..8a89dd46e30 100644
--- a/source/blender/nodes/NOD_static_types.h
+++ b/source/blender/nodes/NOD_static_types.h
@@ -361,7 +361,7 @@ DefNode(GeometryNode, GEO_NODE_MESH_PRIMITIVE_LINE, 
def_geo_mesh_line, "MESH_PRI
 DefNode(GeometryNode, GEO_NODE_MESH_PRIMITIVE_UV_SPHERE, 0, 
"MESH_PRIMITIVE_UV_SPHERE", MeshUVSphere, "UV Sphere", "Generate a spherical 
mesh with quads, except for triangles at the top and bottom")
 DefNode(GeometryNode, GEO_NODE_MESH_TO_CURVE, 0, "MESH_TO_CURVE", MeshToCurve, 
"Mesh to Curve", "Generate a curve from a mesh")
 DefNode(GeometryNode, GEO_NODE_MESH_TO_POINTS, def_geo_mesh_to_points, 
"MESH_TO_POINTS", MeshToPoints, "Mesh to Points", "Generate a point cloud from 
a mesh's vertices")
-DefNode(GeometryNode, GEO_NODE_MESH_TO_VOLUME, def_geo_mesh_to_volume, 
"MESH_TO_VOLUME", MeshToVolume, "Mesh To Volume", "Create a fog volume with the 
shape of the input mesh's surface")
+DefNode(GeometryNode, GEO_NODE_MESH_TO_VOLUME, def_geo_mesh_to_volume, 
"MESH_TO_VOLUME", MeshToVolume, "Mesh to Volume", "Create a fog volume with the 
shape of the input mesh's surface")
 DefNode(GeometryNode, GEO_NODE_OBJECT_INFO, def_geo_object_info, 
"OBJECT_INFO", ObjectInfo, "Object Info", "Retrieve information from an object")
 DefNode(GeometryNode, GEO_NODE_POINTS_TO_VERTICES, 0, "POINTS_TO_VERTICES", 
PointsToVertices, "Points to Vertices", "Generate a mesh vertex for each point 
cloud point")
 DefNode(GeometryNode, GEO_NODE_POINTS_TO_VOLUME, def_geo_points_to_volume, 
"POINTS_TO_VOLUME", PointsToVolume, "Points to Volume", "Generate a fog volume 
sphere around every point")

___
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] [370b17a8c6b] master: Merge remote-tracking branch 'origin/blender-v3.3-release'

2022-08-31 Thread Dalai Felinto

Commit: 370b17a8c6b61c81ed98be979ad098c46aedf073
Author: Dalai Felinto
Date:   Wed Aug 31 16:30:57 2022 +0200
Branches: master
https://developer.blender.org/rB370b17a8c6b61c81ed98be979ad098c46aedf073

Merge remote-tracking branch 'origin/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] [0864ab52480] blender-v3.3-release: UI: Fix order of Geometry Nodes in the Add Nodes Mesh menu

2022-08-31 Thread Dalai Felinto

Commit: 0864ab52480c585a7b38e510303d7cd718ba1e38
Author: Dalai Felinto
Date:   Wed Aug 31 16:29:13 2022 +0200
Branches: blender-v3.3-release
https://developer.blender.org/rB0864ab52480c585a7b38e510303d7cd718ba1e38

UI: Fix order of Geometry Nodes in the Add Nodes Mesh menu

===

M   release/scripts/startup/nodeitems_builtins.py

===

diff --git a/release/scripts/startup/nodeitems_builtins.py 
b/release/scripts/startup/nodeitems_builtins.py
index 2342ba33a3b..2d4ef593b3c 100644
--- a/release/scripts/startup/nodeitems_builtins.py
+++ b/release/scripts/startup/nodeitems_builtins.py
@@ -117,11 +117,11 @@ def mesh_node_items(context):
 yield NodeItem("GeometryNodeMeshToCurve")
 yield NodeItem("GeometryNodeMeshToPoints")
 yield NodeItem("GeometryNodeMeshToVolume")
+yield NodeItem("GeometryNodeScaleElements")
 yield NodeItem("GeometryNodeSplitEdges")
 yield NodeItem("GeometryNodeSubdivideMesh")
 yield NodeItem("GeometryNodeSubdivisionSurface")
 yield NodeItem("GeometryNodeTriangulate")
-yield NodeItem("GeometryNodeScaleElements")
 yield NodeItemCustom(draw=lambda self, layout, context: layout.separator())
 yield NodeItem("GeometryNodeInputMeshEdgeAngle")
 yield NodeItem("GeometryNodeInputMeshEdgeNeighbors")
@@ -129,8 +129,8 @@ def mesh_node_items(context):
 yield NodeItem("GeometryNodeInputMeshFaceArea")
 yield NodeItem("GeometryNodeInputMeshFaceNeighbors")
 yield NodeItem("GeometryNodeInputMeshFaceIsPlanar")
-yield NodeItem("GeometryNodeInputMeshIsland")
 yield NodeItem("GeometryNodeInputShadeSmooth")
+yield NodeItem("GeometryNodeInputMeshIsland")
 yield NodeItem("GeometryNodeInputShortestEdgePaths")
 yield NodeItem("GeometryNodeInputMeshVertexNeighbors")
 yield NodeItemCustom(draw=lambda self, layout, context: layout.separator())

___
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] [fefe229de3a] master: Merge remote-tracking branch 'origin/blender-v3.3-release'

2022-08-16 Thread Dalai Felinto

Commit: fefe229de3a3efe9238c38deec782397f3733290
Author: Dalai Felinto
Date:   Tue Aug 16 18:08:46 2022 +0200
Branches: master
https://developer.blender.org/rBfefe229de3a3efe9238c38deec782397f3733290

Merge remote-tracking branch 'origin/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] [ed2d2cbdd2f] blender-v3.3-release: Licenses: Attribution document for Blender 3.2

2022-08-16 Thread Dalai Felinto

Commit: ed2d2cbdd2fa13b13390d7bb5b7b5b8baaf4df26
Author: Dalai Felinto
Date:   Wed Jun 8 12:22:46 2022 +0200
Branches: blender-v3.3-release
https://developer.blender.org/rBed2d2cbdd2fa13b13390d7bb5b7b5b8baaf4df26

Licenses: Attribution document for Blender 3.2

A few libraries were updated, a few were added, and a few were missing
from the previous license document.

===

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

===

diff --git a/release/license/THIRD-PARTY-LICENSES.txt 
b/release/license/THIRD-PARTY-LICENSES.txt
index 59f53832c9b..34ece3b778f 100644
--- a/release/license/THIRD-PARTY-LICENSES.txt
+++ b/release/license/THIRD-PARTY-LICENSES.txt
@@ -1,4 +1,4 @@
-** Blosc; version 1.5.0 -- https://github.com/Blosc/c-blosc
+** Blosc; version 1.21.1 -- https://github.com/Blosc/c-blosc
 For Blosc - A blocking, shuffling and lossless compression library
 
 Copyright (C) 2009-2018 Francesc Alted 
@@ -22,12 +22,12 @@ PERFORMANCE OF THIS SOFTWARE.
 ** Audaspace; version 1.3.0 -- https://audaspace.github.io/
 ** Cuda Wrangler; version cbf465b -- https://github.com/CudaWrangler/cuew
 ** Draco; version 1.3.6 -- https://google.github.io/draco/
-** Embree; version 3.10 -- https://github.com/embree/embree
+** Embree; version 3.13.3 -- https://github.com/embree/embree
 ** Mantaflow; version 0.13 -- http://mantaflow.com/
-** oneAPI Threading Building Block; version 2020_U2 --
+** 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.1 -- https://www.openimagedenoise.org/
+** OpenImageDenoise; version 1.4.3 -- https://www.openimagedenoise.org/
 ** OpenSSL; version 1.1.1 -- https://www.openssl.org/
 ** OpenXR SDK; version 1.0.17 -- https://khronos.org/openxr
 ** RangeTree; version 40ebed8aa209 -- https://github.com/ideasman42/rangetree-c
@@ -267,7 +267,7 @@ limitations under the License.
 
 ** NASM; version 2.15.02 -- https://www.nasm.us/
 Contributions since 2008-12-15 are Copyright Intel Corporation.
-** OpenJPEG; version 2.3.1 -- https://github.com/uclouvain/openjpeg
+** OpenJPEG; version 2.4.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
@@ -316,22 +316,35 @@ All rights reserved.
 ** Google Logging; version 4.4.0 -- https://github.com/google/glog
 Copyright (c) 2006, Google Inc.
 All rights reserved.
-** ISPC; version 1.16.0 -- https://github.com/ispc/ispc
+** Imath; version 3.1.3 -- https://github.com/AcademySoftwareFoundation/Imath
+Contributors to the OpenEXR Project.
+** ISPC; version 1.17.0 -- https://github.com/ispc/ispc
 Copyright Intel Corporation
 ** NumPy; version 1.22.0 -- https://numpy.org/
 Copyright (c) 2005-2021, NumPy Developers.
-** Open Shading Language; version 1.11.14.1 --
+** 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 --
 https://github.com/imageworks/OpenShadingLanguage
 Copyright Contributors to the Open Shading Language project.
-** OpenColorIO; version 2.0.0 --
+** OpenColorIO; version 2.1.1 --
 https://github.com/AcademySoftwareFoundation/OpenColorIO
 Copyright Contributors to the OpenColorIO Project.
-** OpenEXR; version 2.5.5 --
+** OpenEXR; version 3.1.4 --
 https://github.com/AcademySoftwareFoundation/openexr
 Copyright Contributors to the OpenEXR Project. All rights reserved.
-** OpenImageIO; version 2.2.15.1 -- http://www.openimageio.org
+** OpenImageIO; version 2.3.13.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
+Copyright (c) 2008-2010, Sony Pictures Imageworks Inc
+All rights reserved.
+** Vorbis; version 1.3.7 -- https://xiph.org/vorbis/
+Copyright (c) 2002-2020 Xiph.org Foundation
+** VPX; version 1.11.0 -- https://github.com/webmproject/libvpx
+Copyright (c) 2010, The WebM Project authors. All rights reserved.
+** WebP; version 1.2.2 -- https://github.com/webmproject/libwebp
+Copyright (c) 2010, Google Inc. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
@@ -493,6 +506,9 @@ effect of CC0 on those rights.
 
 --
 
+** FLAC; version 1.3.4 -- https://xiph.org/flac/
+Copyright (C) 2001-2009  Josh Coalson
+Copyright (C) 2011-2016  Xiph.Org Foundation
 ** Potrace; version 1.16 -- http://potrace.sourceforge.net/
 Copyright (C) 2001-2019 Peter Selinger.
 
@@ -819,12 +835,12 @@ Yoyodyne, Inc., hereby disclaims all copyright interest 
in the program

[Bf-blender-cvs] [5f2667aa711] blender-v3.3-release: Licenses: Attribution document for Blender 3.3

2022-08-16 Thread Dalai Felinto

Commit: 5f2667aa71168e54a3c75e14f7ef8050c1f282fb
Author: Dalai Felinto
Date:   Tue Aug 16 18:08:07 2022 +0200
Branches: blender-v3.3-release
https://developer.blender.org/rB5f2667aa71168e54a3c75e14f7ef8050c1f282fb

Licenses: Attribution document for Blender 3.3

A few libraries were updated and a few added.

There are a few depedencies to intel oneAPI which I did not include, since we
refer already to Intel oneAPI already.

===

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

===

diff --git a/release/license/THIRD-PARTY-LICENSES.txt 
b/release/license/THIRD-PARTY-LICENSES.txt
index 34ece3b778f..f73a6a625a5 100644
--- a/release/license/THIRD-PARTY-LICENSES.txt
+++ b/release/license/THIRD-PARTY-LICENSES.txt
@@ -22,7 +22,9 @@ PERFORMANCE OF THIS SOFTWARE.
 ** Audaspace; version 1.3.0 -- https://audaspace.github.io/
 ** Cuda Wrangler; version cbf465b -- https://github.com/CudaWrangler/cuew
 ** Draco; version 1.3.6 -- https://google.github.io/draco/
-** Embree; version 3.13.3 -- https://github.com/embree/embree
+** Embree; version 3.13.4 -- https://github.com/embree/embree
+** Intel® Open Path Guiding Library; version v0.3.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
@@ -240,6 +242,8 @@ limitations under the License.
 Copyright 2018 The Draco Authors
 * For Embree see also this required NOTICE:
 Copyright 2009-2020 Intel Corporation
+* For Intel® Open Path Guiding Library see also this required NOTICE:
+Copyright 2020 Intel Corporation.
 * For Mantaflow see also this required NOTICE:
 MantaFlow fluid solver framework
 Copyright 2011 Tobias Pfaff, Nils Thuerey
@@ -265,6 +269,8 @@ limitations under the License.
 
 --
 
+** libAOM; version 3.4.0 -- https://aomedia.googlesource.com/aom/
+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
@@ -316,7 +322,7 @@ All rights reserved.
 ** Google Logging; version 4.4.0 -- https://github.com/google/glog
 Copyright (c) 2006, Google Inc.
 All rights reserved.
-** Imath; version 3.1.3 -- https://github.com/AcademySoftwareFoundation/Imath
+** Imath; version 3.1.5 -- https://github.com/AcademySoftwareFoundation/Imath
 Contributors to the OpenEXR Project.
 ** ISPC; version 1.17.0 -- https://github.com/ispc/ispc
 Copyright Intel Corporation
@@ -330,7 +336,7 @@ Copyright Contributors to the Open Shading Language project.
 ** OpenColorIO; version 2.1.1 --
 https://github.com/AcademySoftwareFoundation/OpenColorIO
 Copyright Contributors to the OpenColorIO Project.
-** OpenEXR; version 3.1.4 --
+** 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
@@ -2975,15 +2981,26 @@ December 9, 2010
 Copyright (c) 2012 - present, Victor Zverovich
 ** Brotli; version 1.0.9 -- https://github.com/google/brotli
 Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+** Epoxy; version 1.5.10 -- https://github.com/anholt/libepoxy
+Copyright © 2013-2014 Intel Corporation.
+Copyright © 2013 The Khronos Group Inc.
 ** Expat; version 2.4.4 -- https://github.com/libexpat/libexpat/
 Copyright (c) 1998-2000 Thai Open Source Software Center Ltd and Clark Cooper
 Copyright (c) 2001-2019 Expat maintainers
+** Intel(R) Graphics Memory Management Library; version 22.1.2 --
+https://github.com/intel/gmmlib
+Copyright (c) 2017 Intel Corporation.
+Copyright (c) 2016 Gabi Melman.
+Copyright 2008, Google Inc. All rights reserved.
 ** JSON for Modern C++; version 3.10.2 -- https://github.com/nlohmann/json/
 Copyright (c) 2013-2021 Niels Lohmann
 ** Libxml2; version 2.9.10 -- http://xmlsoft.org/
 Copyright (C) 1998-2012 Daniel Veillard.  All Rights Reserved.
 ** Mesa 3D; version 21.1.5 -- https://www.mesa3d.org/
 Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
+** oneAPI Level Zero; version v1.7.15 --
+https://github.com/oneapi-src/level-zero
+Copyright (C) 2019-2021 Intel Corporation
 ** OPENCollada; version 1.6.68 -- https://github.com/KhronosGroup/OpenCOLLADA
 Copyright (c) 2008-2009 NetAllied Systems GmbH
 ** PugiXML; version 1.10 -- http://pugixml.org/
@@ -3409,7 +3426,7 @@ the following restrictions:
 
 --
 
-** LibTIFF; version 4.3.0 -- http://www.libtiff.org/
+** LibTIFF; version 4.4.0 -- http://www.libtiff.org/
 Copyright (c) 1988-1997 Sam Leffler
 Copyright (c) 1991-1997 Silicon Graphics, Inc.

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details

[Bf-blender-cvs] [1e55b58e4ff] master: UI: Sort tools in curves sculpting mode

2022-07-27 Thread Dalai Felinto

Commit: 1e55b58e4ff31b10cf9806ca41991346ab3d4513
Author: Dalai Felinto
Date:   Wed Jul 27 11:13:58 2022 +0200
Branches: master
https://developer.blender.org/rB1e55b58e4ff31b10cf9806ca41991346ab3d4513

UI: Sort tools in curves sculpting mode

The previous order was based on the order of when the tools were
developed. Instead we now cluster them based on similar functionality:

* Selection
* Add/Remove
* Deform/Transform
* Annotation

Done in collaboration with Pablo Vazquez.

===

M   release/scripts/startup/bl_ui/space_toolsystem_toolbar.py

===

diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py 
b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
index 02abbd43986..470b78ae558 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@ -3174,15 +3174,16 @@ class VIEW3D_PT_tools_active(ToolSelectPanelHelper, 
Panel):
 'SCULPT_CURVES': [
 _defs_curves_sculpt.selection_paint,
 None,
-_defs_curves_sculpt.comb,
 _defs_curves_sculpt.add,
 _defs_curves_sculpt.delete,
+_defs_curves_sculpt.density,
+None,
+_defs_curves_sculpt.comb,
 _defs_curves_sculpt.snake_hook,
 _defs_curves_sculpt.grow_shrink,
 _defs_curves_sculpt.pinch,
-_defs_curves_sculpt.smooth,
 _defs_curves_sculpt.puff,
-_defs_curves_sculpt.density,
+_defs_curves_sculpt.smooth,
 _defs_curves_sculpt.slide,
 None,
 *_tools_annotate,

___
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] [ffc386b92f6] temp-T97352-3d-texturing-seam-bleeding-b2: Hair Curves: The new curves object is now available

2022-07-11 Thread Dalai Felinto

Commit: ffc386b92f69fb6cdd9ee0e4c4a6d1c39e66d2bb
Author: Dalai Felinto
Date:   Fri Jul 8 14:41:21 2022 +0200
Branches: temp-T97352-3d-texturing-seam-bleeding-b2
https://developer.blender.org/rBffc386b92f69fb6cdd9ee0e4c4a6d1c39e66d2bb

Hair Curves: The new curves object is now available

This commit doesn't implement any new feature but makes the new curves
object type no longer experimental.

Documentation:

* 
https://docs.blender.org/manual/en/3.3/modeling/curves/primitives.html#empty-hair
* 
https://docs.blender.org/manual/en/3.3/sculpt_paint/curves_sculpting/introduction.html

Note: This also makes the Selection Paint tool available. This tool
should have been moved out of the "New Curves Tool" flag when we got the
selection drawing to work.

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

===

M   release/scripts/startup/bl_ui/properties_particle.py
M   release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
M   release/scripts/startup/bl_ui/space_userpref.py
M   release/scripts/startup/bl_ui/space_view3d.py
M   source/blender/editors/object/object_add.cc
M   source/blender/makesdna/DNA_userdef_types.h
M   source/blender/makesrna/intern/rna_userdef.c

===

diff --git a/release/scripts/startup/bl_ui/properties_particle.py 
b/release/scripts/startup/bl_ui/properties_particle.py
index db4e609be65..ae94accf5c7 100644
--- a/release/scripts/startup/bl_ui/properties_particle.py
+++ b/release/scripts/startup/bl_ui/properties_particle.py
@@ -72,7 +72,7 @@ class PARTICLE_MT_context_menu(Menu):
 props.use_active = False
 props.remove_target_particles = True
 
-if experimental.use_new_curves_type and psys.settings.type == 'HAIR':
+if psys.settings.type == 'HAIR':
 layout.operator(
 "curves.convert_from_particle_system",
 text="Convert to Curves")
diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py 
b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
index 9f7ca89b8c9..02abbd43986 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@ -3172,14 +3172,8 @@ class VIEW3D_PT_tools_active(ToolSelectPanelHelper, 
Panel):
 ),
 ],
 'SCULPT_CURVES': [
-lambda context: (
-(
-_defs_curves_sculpt.selection_paint,
-None,
-)
-if context is None or 
context.preferences.experimental.use_new_curves_tools
-else ()
-),
+_defs_curves_sculpt.selection_paint,
+None,
 _defs_curves_sculpt.comb,
 _defs_curves_sculpt.add,
 _defs_curves_sculpt.delete,
diff --git a/release/scripts/startup/bl_ui/space_userpref.py 
b/release/scripts/startup/bl_ui/space_userpref.py
index 603110b76e9..cccbb63d27c 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -2272,7 +2272,6 @@ class 
USERPREF_PT_experimental_prototypes(ExperimentalPanel, Panel):
 def draw(self, context):
 self._draw_items(
 context, (
-({"property": "use_new_curves_type"}, "T68981"),
 ({"property": "use_new_curves_tools"}, "T68981"),
 ({"property": "use_new_point_cloud_type"}, "T75717"),
 ({"property": "use_sculpt_texture_paint"}, "T96225"),
diff --git a/release/scripts/startup/bl_ui/space_view3d.py 
b/release/scripts/startup/bl_ui/space_view3d.py
index 72119030919..92dc4138530 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -718,19 +718,17 @@ class VIEW3D_HT_header(Header):
 
 row = layout.row(align=True)
 
-experimental = context.preferences.experimental
-if experimental.use_new_curves_tools:
-# Combine the "use selection" toggle with the "set domain" 
operators
-# to allow turning selection off directly.
-domain = curves.selection_domain
-if domain == 'POINT':
-row.prop(curves, "use_sculpt_selection", text="", 
icon='CURVE_BEZCIRCLE')
-else:
-row.operator("curves.set_selection_domain", text="", 
icon='CURVE_BEZCIRCLE').domain = 'POINT'
-if domain == 'CURVE':
-row.prop(curves, "use_sculpt_selection", text="", 
icon='CURVE_PATH'

[Bf-blender-cvs] [09e1175aa1b] temp-T97352-3d-texturing-seam-bleeding-b2: Cleanup: make format

2022-07-11 Thread Dalai Felinto

Commit: 09e1175aa1b91540dadb3a6cd13ac873b26315e9
Author: Dalai Felinto
Date:   Fri Jul 8 15:07:24 2022 +0200
Branches: temp-T97352-3d-texturing-seam-bleeding-b2
https://developer.blender.org/rB09e1175aa1b91540dadb3a6cd13ac873b26315e9

Cleanup: make format

===

M   source/blender/blenkernel/intern/customdata.cc
M   source/blender/blenkernel/intern/particle.c
M   source/blender/draw/engines/overlay/overlay_shader.c
M   source/blender/draw/intern/draw_cache_impl_particles.c

===

diff --git a/source/blender/blenkernel/intern/customdata.cc 
b/source/blender/blenkernel/intern/customdata.cc
index 26fbd7d7b54..277218033e9 100644
--- a/source/blender/blenkernel/intern/customdata.cc
+++ b/source/blender/blenkernel/intern/customdata.cc
@@ -3550,8 +3550,6 @@ void CustomData_bmesh_update_active_layers(CustomData 
*fdata, CustomData *ldata)
   }
 }
 
-
-
 void CustomData_bmesh_init_pool(CustomData *data, int totelem, const char 
htype)
 {
   int chunksize;
diff --git a/source/blender/blenkernel/intern/particle.c 
b/source/blender/blenkernel/intern/particle.c
index b5ff12f3caa..2471d3baa59 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -58,13 +58,13 @@
 #include "BKE_main.h"
 #include "BKE_material.h"
 #include "BKE_mesh.h"
+#include "BKE_mesh_legacy_convert.h"
 #include "BKE_modifier.h"
 #include "BKE_object.h"
 #include "BKE_particle.h"
 #include "BKE_pointcache.h"
 #include "BKE_scene.h"
 #include "BKE_texture.h"
-#include "BKE_mesh_legacy_convert.h"
 
 #include "DEG_depsgraph.h"
 #include "DEG_depsgraph_build.h"
diff --git a/source/blender/draw/engines/overlay/overlay_shader.c 
b/source/blender/draw/engines/overlay/overlay_shader.c
index faa76ff74b6..2373363ab9d 100644
--- a/source/blender/draw/engines/overlay/overlay_shader.c
+++ b/source/blender/draw/engines/overlay/overlay_shader.c
@@ -659,7 +659,7 @@ GPUShader *OVERLAY_shader_outline_prepass_curves()
   if (!sh_data->outline_prepass_curves) {
 sh_data->outline_prepass_curves = GPU_shader_create_from_info_name(
 draw_ctx->sh_cfg ? "overlay_outline_prepass_curves_clipped" :
-"overlay_outline_prepass_curves");
+   "overlay_outline_prepass_curves");
   }
   return sh_data->outline_prepass_curves;
 }
diff --git a/source/blender/draw/intern/draw_cache_impl_particles.c 
b/source/blender/draw/intern/draw_cache_impl_particles.c
index 16201e809c7..dee7a8cec37 100644
--- a/source/blender/draw/intern/draw_cache_impl_particles.c
+++ b/source/blender/draw/intern/draw_cache_impl_particles.c
@@ -24,9 +24,9 @@
 
 #include "BKE_customdata.h"
 #include "BKE_mesh.h"
+#include "BKE_mesh_legacy_convert.h"
 #include "BKE_particle.h"
 #include "BKE_pointcache.h"
-#include "BKE_mesh_legacy_convert.h"
 
 #include "ED_particle.h"

___
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] [ae31a96058f] gpencil-new-data-proposal: Hair Curves: The new curves object is now available

2022-07-08 Thread Dalai Felinto

Commit: ae31a96058fc99fcd37ea37505dcaac9cdcf384d
Author: Dalai Felinto
Date:   Fri Jul 8 14:41:21 2022 +0200
Branches: gpencil-new-data-proposal
https://developer.blender.org/rBae31a96058fc99fcd37ea37505dcaac9cdcf384d

Hair Curves: The new curves object is now available

This commit doesn't implement any new feature but makes the new curves
object type no longer experimental.

Documentation:

* 
https://docs.blender.org/manual/en/3.3/modeling/curves/primitives.html#empty-hair
* 
https://docs.blender.org/manual/en/3.3/sculpt_paint/curves_sculpting/introduction.html

Note: This also makes the Selection Paint tool available. This tool
should have been moved out of the "New Curves Tool" flag when we got the
selection drawing to work.

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

===

M   release/scripts/startup/bl_ui/properties_particle.py
M   release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
M   release/scripts/startup/bl_ui/space_userpref.py
M   release/scripts/startup/bl_ui/space_view3d.py
M   source/blender/editors/object/object_add.cc
M   source/blender/makesdna/DNA_userdef_types.h
M   source/blender/makesrna/intern/rna_userdef.c

===

diff --git a/release/scripts/startup/bl_ui/properties_particle.py 
b/release/scripts/startup/bl_ui/properties_particle.py
index db4e609be65..ae94accf5c7 100644
--- a/release/scripts/startup/bl_ui/properties_particle.py
+++ b/release/scripts/startup/bl_ui/properties_particle.py
@@ -72,7 +72,7 @@ class PARTICLE_MT_context_menu(Menu):
 props.use_active = False
 props.remove_target_particles = True
 
-if experimental.use_new_curves_type and psys.settings.type == 'HAIR':
+if psys.settings.type == 'HAIR':
 layout.operator(
 "curves.convert_from_particle_system",
 text="Convert to Curves")
diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py 
b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
index 9f7ca89b8c9..02abbd43986 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@ -3172,14 +3172,8 @@ class VIEW3D_PT_tools_active(ToolSelectPanelHelper, 
Panel):
 ),
 ],
 'SCULPT_CURVES': [
-lambda context: (
-(
-_defs_curves_sculpt.selection_paint,
-None,
-)
-if context is None or 
context.preferences.experimental.use_new_curves_tools
-else ()
-),
+_defs_curves_sculpt.selection_paint,
+None,
 _defs_curves_sculpt.comb,
 _defs_curves_sculpt.add,
 _defs_curves_sculpt.delete,
diff --git a/release/scripts/startup/bl_ui/space_userpref.py 
b/release/scripts/startup/bl_ui/space_userpref.py
index 603110b76e9..cccbb63d27c 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -2272,7 +2272,6 @@ class 
USERPREF_PT_experimental_prototypes(ExperimentalPanel, Panel):
 def draw(self, context):
 self._draw_items(
 context, (
-({"property": "use_new_curves_type"}, "T68981"),
 ({"property": "use_new_curves_tools"}, "T68981"),
 ({"property": "use_new_point_cloud_type"}, "T75717"),
 ({"property": "use_sculpt_texture_paint"}, "T96225"),
diff --git a/release/scripts/startup/bl_ui/space_view3d.py 
b/release/scripts/startup/bl_ui/space_view3d.py
index 72119030919..92dc4138530 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -718,19 +718,17 @@ class VIEW3D_HT_header(Header):
 
 row = layout.row(align=True)
 
-experimental = context.preferences.experimental
-if experimental.use_new_curves_tools:
-# Combine the "use selection" toggle with the "set domain" 
operators
-# to allow turning selection off directly.
-domain = curves.selection_domain
-if domain == 'POINT':
-row.prop(curves, "use_sculpt_selection", text="", 
icon='CURVE_BEZCIRCLE')
-else:
-row.operator("curves.set_selection_domain", text="", 
icon='CURVE_BEZCIRCLE').domain = 'POINT'
-if domain == 'CURVE':
-row.prop(curves, "use_sculpt_selection", text="", 
icon='CURVE_PATH')
-else:
-

[Bf-blender-cvs] [149877ce4cf] gpencil-new-data-proposal: Cleanup: make format

2022-07-08 Thread Dalai Felinto

Commit: 149877ce4cf469780b3e49bac7641b7df13c82de
Author: Dalai Felinto
Date:   Fri Jul 8 15:07:24 2022 +0200
Branches: gpencil-new-data-proposal
https://developer.blender.org/rB149877ce4cf469780b3e49bac7641b7df13c82de

Cleanup: make format

===

M   source/blender/blenkernel/intern/customdata.cc
M   source/blender/blenkernel/intern/particle.c
M   source/blender/draw/engines/overlay/overlay_shader.c
M   source/blender/draw/intern/draw_cache_impl_particles.c

===

diff --git a/source/blender/blenkernel/intern/customdata.cc 
b/source/blender/blenkernel/intern/customdata.cc
index 26fbd7d7b54..277218033e9 100644
--- a/source/blender/blenkernel/intern/customdata.cc
+++ b/source/blender/blenkernel/intern/customdata.cc
@@ -3550,8 +3550,6 @@ void CustomData_bmesh_update_active_layers(CustomData 
*fdata, CustomData *ldata)
   }
 }
 
-
-
 void CustomData_bmesh_init_pool(CustomData *data, int totelem, const char 
htype)
 {
   int chunksize;
diff --git a/source/blender/blenkernel/intern/particle.c 
b/source/blender/blenkernel/intern/particle.c
index b5ff12f3caa..2471d3baa59 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -58,13 +58,13 @@
 #include "BKE_main.h"
 #include "BKE_material.h"
 #include "BKE_mesh.h"
+#include "BKE_mesh_legacy_convert.h"
 #include "BKE_modifier.h"
 #include "BKE_object.h"
 #include "BKE_particle.h"
 #include "BKE_pointcache.h"
 #include "BKE_scene.h"
 #include "BKE_texture.h"
-#include "BKE_mesh_legacy_convert.h"
 
 #include "DEG_depsgraph.h"
 #include "DEG_depsgraph_build.h"
diff --git a/source/blender/draw/engines/overlay/overlay_shader.c 
b/source/blender/draw/engines/overlay/overlay_shader.c
index faa76ff74b6..2373363ab9d 100644
--- a/source/blender/draw/engines/overlay/overlay_shader.c
+++ b/source/blender/draw/engines/overlay/overlay_shader.c
@@ -659,7 +659,7 @@ GPUShader *OVERLAY_shader_outline_prepass_curves()
   if (!sh_data->outline_prepass_curves) {
 sh_data->outline_prepass_curves = GPU_shader_create_from_info_name(
 draw_ctx->sh_cfg ? "overlay_outline_prepass_curves_clipped" :
-"overlay_outline_prepass_curves");
+   "overlay_outline_prepass_curves");
   }
   return sh_data->outline_prepass_curves;
 }
diff --git a/source/blender/draw/intern/draw_cache_impl_particles.c 
b/source/blender/draw/intern/draw_cache_impl_particles.c
index 16201e809c7..dee7a8cec37 100644
--- a/source/blender/draw/intern/draw_cache_impl_particles.c
+++ b/source/blender/draw/intern/draw_cache_impl_particles.c
@@ -24,9 +24,9 @@
 
 #include "BKE_customdata.h"
 #include "BKE_mesh.h"
+#include "BKE_mesh_legacy_convert.h"
 #include "BKE_particle.h"
 #include "BKE_pointcache.h"
-#include "BKE_mesh_legacy_convert.h"
 
 #include "ED_particle.h"

___
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] [becb1530b1c] master: Hair Curves: The new curves object is now available

2022-07-08 Thread Dalai Felinto

Commit: becb1530b1c81a408e202ebd3c43037928dc1679
Author: Dalai Felinto
Date:   Fri Jul 8 14:41:21 2022 +0200
Branches: master
https://developer.blender.org/rBbecb1530b1c81a408e202ebd3c43037928dc1679

Hair Curves: The new curves object is now available

This commit doesn't implement any new feature but makes the new curves
object type no longer experimental.

Documentation:

* 
https://docs.blender.org/manual/en/3.3/modeling/curves/primitives.html#empty-hair
* 
https://docs.blender.org/manual/en/3.3/sculpt_paint/curves_sculpting/introduction.html

Note: This also makes the Selection Paint tool available. This tool
should have been moved out of the "New Curves Tool" flag when we got the
selection drawing to work.

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

===

M   release/scripts/startup/bl_ui/properties_particle.py
M   release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
M   release/scripts/startup/bl_ui/space_userpref.py
M   release/scripts/startup/bl_ui/space_view3d.py
M   source/blender/editors/object/object_add.cc
M   source/blender/makesdna/DNA_userdef_types.h
M   source/blender/makesrna/intern/rna_userdef.c

===

diff --git a/release/scripts/startup/bl_ui/properties_particle.py 
b/release/scripts/startup/bl_ui/properties_particle.py
index db4e609be65..ae94accf5c7 100644
--- a/release/scripts/startup/bl_ui/properties_particle.py
+++ b/release/scripts/startup/bl_ui/properties_particle.py
@@ -72,7 +72,7 @@ class PARTICLE_MT_context_menu(Menu):
 props.use_active = False
 props.remove_target_particles = True
 
-if experimental.use_new_curves_type and psys.settings.type == 'HAIR':
+if psys.settings.type == 'HAIR':
 layout.operator(
 "curves.convert_from_particle_system",
 text="Convert to Curves")
diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py 
b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
index 9f7ca89b8c9..02abbd43986 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@ -3172,14 +3172,8 @@ class VIEW3D_PT_tools_active(ToolSelectPanelHelper, 
Panel):
 ),
 ],
 'SCULPT_CURVES': [
-lambda context: (
-(
-_defs_curves_sculpt.selection_paint,
-None,
-)
-if context is None or 
context.preferences.experimental.use_new_curves_tools
-else ()
-),
+_defs_curves_sculpt.selection_paint,
+None,
 _defs_curves_sculpt.comb,
 _defs_curves_sculpt.add,
 _defs_curves_sculpt.delete,
diff --git a/release/scripts/startup/bl_ui/space_userpref.py 
b/release/scripts/startup/bl_ui/space_userpref.py
index 603110b76e9..cccbb63d27c 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -2272,7 +2272,6 @@ class 
USERPREF_PT_experimental_prototypes(ExperimentalPanel, Panel):
 def draw(self, context):
 self._draw_items(
 context, (
-({"property": "use_new_curves_type"}, "T68981"),
 ({"property": "use_new_curves_tools"}, "T68981"),
 ({"property": "use_new_point_cloud_type"}, "T75717"),
 ({"property": "use_sculpt_texture_paint"}, "T96225"),
diff --git a/release/scripts/startup/bl_ui/space_view3d.py 
b/release/scripts/startup/bl_ui/space_view3d.py
index 72119030919..92dc4138530 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -718,19 +718,17 @@ class VIEW3D_HT_header(Header):
 
 row = layout.row(align=True)
 
-experimental = context.preferences.experimental
-if experimental.use_new_curves_tools:
-# Combine the "use selection" toggle with the "set domain" 
operators
-# to allow turning selection off directly.
-domain = curves.selection_domain
-if domain == 'POINT':
-row.prop(curves, "use_sculpt_selection", text="", 
icon='CURVE_BEZCIRCLE')
-else:
-row.operator("curves.set_selection_domain", text="", 
icon='CURVE_BEZCIRCLE').domain = 'POINT'
-if domain == 'CURVE':
-row.prop(curves, "use_sculpt_selection", text="", 
icon='CURVE_PATH')
-else:
-

[Bf-blender-cvs] [2c55d8c1cf6] master: Cleanup: make format

2022-07-08 Thread Dalai Felinto

Commit: 2c55d8c1cf6acd633f8acf9adc4e545cd965822c
Author: Dalai Felinto
Date:   Fri Jul 8 15:07:24 2022 +0200
Branches: master
https://developer.blender.org/rB2c55d8c1cf6acd633f8acf9adc4e545cd965822c

Cleanup: make format

===

M   source/blender/blenkernel/intern/customdata.cc
M   source/blender/blenkernel/intern/particle.c
M   source/blender/draw/engines/overlay/overlay_shader.c
M   source/blender/draw/intern/draw_cache_impl_particles.c

===

diff --git a/source/blender/blenkernel/intern/customdata.cc 
b/source/blender/blenkernel/intern/customdata.cc
index 26fbd7d7b54..277218033e9 100644
--- a/source/blender/blenkernel/intern/customdata.cc
+++ b/source/blender/blenkernel/intern/customdata.cc
@@ -3550,8 +3550,6 @@ void CustomData_bmesh_update_active_layers(CustomData 
*fdata, CustomData *ldata)
   }
 }
 
-
-
 void CustomData_bmesh_init_pool(CustomData *data, int totelem, const char 
htype)
 {
   int chunksize;
diff --git a/source/blender/blenkernel/intern/particle.c 
b/source/blender/blenkernel/intern/particle.c
index b5ff12f3caa..2471d3baa59 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -58,13 +58,13 @@
 #include "BKE_main.h"
 #include "BKE_material.h"
 #include "BKE_mesh.h"
+#include "BKE_mesh_legacy_convert.h"
 #include "BKE_modifier.h"
 #include "BKE_object.h"
 #include "BKE_particle.h"
 #include "BKE_pointcache.h"
 #include "BKE_scene.h"
 #include "BKE_texture.h"
-#include "BKE_mesh_legacy_convert.h"
 
 #include "DEG_depsgraph.h"
 #include "DEG_depsgraph_build.h"
diff --git a/source/blender/draw/engines/overlay/overlay_shader.c 
b/source/blender/draw/engines/overlay/overlay_shader.c
index faa76ff74b6..2373363ab9d 100644
--- a/source/blender/draw/engines/overlay/overlay_shader.c
+++ b/source/blender/draw/engines/overlay/overlay_shader.c
@@ -659,7 +659,7 @@ GPUShader *OVERLAY_shader_outline_prepass_curves()
   if (!sh_data->outline_prepass_curves) {
 sh_data->outline_prepass_curves = GPU_shader_create_from_info_name(
 draw_ctx->sh_cfg ? "overlay_outline_prepass_curves_clipped" :
-"overlay_outline_prepass_curves");
+   "overlay_outline_prepass_curves");
   }
   return sh_data->outline_prepass_curves;
 }
diff --git a/source/blender/draw/intern/draw_cache_impl_particles.c 
b/source/blender/draw/intern/draw_cache_impl_particles.c
index 16201e809c7..dee7a8cec37 100644
--- a/source/blender/draw/intern/draw_cache_impl_particles.c
+++ b/source/blender/draw/intern/draw_cache_impl_particles.c
@@ -24,9 +24,9 @@
 
 #include "BKE_customdata.h"
 #include "BKE_mesh.h"
+#include "BKE_mesh_legacy_convert.h"
 #include "BKE_particle.h"
 #include "BKE_pointcache.h"
-#include "BKE_mesh_legacy_convert.h"
 
 #include "ED_particle.h"

___
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] [c52a18abf84] master: UI: Curves Sculpting - Remove duplicated entry for Curve Length

2022-07-05 Thread Dalai Felinto

Commit: c52a18abf84b29ca19aa79ef1ce580e67a437779
Author: Dalai Felinto
Date:   Tue Jul 5 17:43:34 2022 +0200
Branches: master
https://developer.blender.org/rBc52a18abf84b29ca19aa79ef1ce580e67a437779

UI: Curves Sculpting - Remove duplicated entry for Curve Length

===

M   release/scripts/startup/bl_ui/properties_paint_common.py

===

diff --git a/release/scripts/startup/bl_ui/properties_paint_common.py 
b/release/scripts/startup/bl_ui/properties_paint_common.py
index f0034a3d710..9b1cf11f6e7 100644
--- a/release/scripts/startup/bl_ui/properties_paint_common.py
+++ b/release/scripts/startup/bl_ui/properties_paint_common.py
@@ -782,7 +782,6 @@ def brush_settings(layout, context, brush, popover=False):
 elif mode == 'SCULPT_CURVES':
 if brush.curves_sculpt_tool == 'ADD':
 layout.prop(brush.curves_sculpt_settings, "add_amount")
-layout.prop(brush.curves_sculpt_settings, "curve_length")
 col = layout.column(heading="Interpolate", align=True)
 col.prop(brush.curves_sculpt_settings, "interpolate_length", 
text="Length")
 col.prop(brush.curves_sculpt_settings, "interpolate_shape", 
text="Shape")

___
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] [abbc8333ac1] master: Fix curves sculpting Selection Paint missing refresh

2022-07-04 Thread Dalai Felinto

Commit: abbc8333ac1ea150fd89d6b32f548ad2da5ae686
Author: Dalai Felinto
Date:   Mon Jul 4 16:08:29 2022 +0200
Branches: master
https://developer.blender.org/rBabbc8333ac1ea150fd89d6b32f548ad2da5ae686

Fix curves sculpting Selection Paint missing refresh

This was reported as part of D15219 but it is a problem in master, not
in the patch.

EEVEE is drawing with a cheap sampling when navigating or painting, but
we need to clear the painting flag when we are done painting.

For a rainy day: DRW_state_is_navigating() should be renamed to indicate
that it also checks for the painting flag.

===

M   source/blender/editors/sculpt_paint/curves_sculpt_intern.hh
M   source/blender/editors/sculpt_paint/curves_sculpt_selection_paint.cc

===

diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_intern.hh 
b/source/blender/editors/sculpt_paint/curves_sculpt_intern.hh
index b26649e746b..4cfaf7ebfc9 100644
--- a/source/blender/editors/sculpt_paint/curves_sculpt_intern.hh
+++ b/source/blender/editors/sculpt_paint/curves_sculpt_intern.hh
@@ -111,7 +111,7 @@ class CurvesSculptCommonContext {
   const Scene *scene = nullptr;
   ARegion *region = nullptr;
   const View3D *v3d = nullptr;
-  const RegionView3D *rv3d = nullptr;
+  RegionView3D *rv3d = nullptr;
 
   CurvesSculptCommonContext(const bContext );
 };
diff --git 
a/source/blender/editors/sculpt_paint/curves_sculpt_selection_paint.cc 
b/source/blender/editors/sculpt_paint/curves_sculpt_selection_paint.cc
index b40aebcaaf1..353b84236a3 100644
--- a/source/blender/editors/sculpt_paint/curves_sculpt_selection_paint.cc
+++ b/source/blender/editors/sculpt_paint/curves_sculpt_selection_paint.cc
@@ -140,6 +140,7 @@ struct SelectionPaintOperationExecutor {
  * selection is handled as a generic attribute for now. */
 DEG_id_tag_update(_id_->id, ID_RECALC_GEOMETRY);
 WM_main_add_notifier(NC_GEOM | ND_DATA, _id_->id);
+ctx_.rv3d->rflag &= ~RV3D_PAINTING;
 ED_region_tag_redraw(ctx_.region);
   }

___
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] [3ffc5583411] master: Sculpt Curves: UI tweaks and shortcut

2022-07-01 Thread Dalai Felinto

Commit: 3ffc5583411ac6e1286586881bdbe1207a34b386
Author: Dalai Felinto
Date:   Fri Jul 1 10:20:07 2022 +0200
Branches: master
https://developer.blender.org/rB3ffc5583411ac6e1286586881bdbe1207a34b386

Sculpt Curves: UI tweaks and shortcut

* Minimum Distance -> Distance Mix
* Max Count -> Count Max
* Shift + A for selection grow

This follows better the names we have in geometry nodes in the Distribute Points
node when using the Poisson Disk method (Distance Min, Distance Max).

The shortcut for the selection grow is the same we use in mesh sculpt
for the Expand Mask operator (which behaves a bit similar).

===

M   release/scripts/presets/keyconfig/keymap_data/blender_default.py
M   release/scripts/startup/bl_ui/space_view3d.py

===

diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py 
b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
index d12d68ee5a0..c0db6c5f523 100644
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@ -5625,6 +5625,7 @@ def km_sculpt_curves(params):
 *_template_paint_radial_control("curves_sculpt"),
 *_template_items_select_actions(params, "sculpt_curves.select_all"),
 ("sculpt_curves.min_distance_edit", {"type": 'R', "value": 'PRESS', 
"shift": True}, {}),
+("sculpt_curves.select_grow", {"type": 'A', "value": 'PRESS', "shift": 
True}, {}),
 ])
 
 return keymap
diff --git a/release/scripts/startup/bl_ui/space_view3d.py 
b/release/scripts/startup/bl_ui/space_view3d.py
index c2342e8949a..5a38c4175a8 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -550,12 +550,12 @@ class _draw_tool_settings_context_mode:
 row = layout.row(align=True)
 row.prop(brush.curves_sculpt_settings, "density_mode", text="", 
expand=True)
 row = layout.row(align=True)
-row.prop(brush.curves_sculpt_settings, "minimum_distance")
+row.prop(brush.curves_sculpt_settings, "minimum_distance", 
text="Distance Min")
 row.operator_context = 'INVOKE_REGION_WIN'
 row.operator("sculpt_curves.min_distance_edit", text="", 
icon='DRIVER_DISTANCE')
 row = layout.row(align=True)
 row.enabled = brush.curves_sculpt_settings.density_mode != 'REMOVE'
-row.prop(brush.curves_sculpt_settings, "density_add_attempts", 
text="Max Count")
+row.prop(brush.curves_sculpt_settings, "density_add_attempts", 
text="Count Max")
 layout.popover("VIEW3D_PT_tools_brush_falloff")
 layout.popover("VIEW3D_PT_curves_sculpt_add_shape", text="Curve 
Shape")
 elif curves_tool == "SLIDE":

___
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] [2287b98e7ea] blender-v3.2-release: Cleanup: Fix building warnings on gcc 9.4.0

2022-06-24 Thread Dalai Felinto

Commit: 2287b98e7ea07048126cecdabb050511f3417bb5
Author: Dalai Felinto
Date:   Fri Jun 24 11:24:11 2022 +0200
Branches: blender-v3.2-release
https://developer.blender.org/rB2287b98e7ea07048126cecdabb050511f3417bb5

Cleanup: Fix building warnings on gcc 9.4.0

Solution by Jacques Lucke

===

M   source/blender/editors/sculpt_paint/paint_vertex_color_ops.cc

===

diff --git a/source/blender/editors/sculpt_paint/paint_vertex_color_ops.cc 
b/source/blender/editors/sculpt_paint/paint_vertex_color_ops.cc
index f5652384177..5881be4922f 100644
--- a/source/blender/editors/sculpt_paint/paint_vertex_color_ops.cc
+++ b/source/blender/editors/sculpt_paint/paint_vertex_color_ops.cc
@@ -298,7 +298,7 @@ static bool transform_active_color(Mesh , const 
TransformFn _fn)
   attribute_math::convert_to_static_type(color_attribute.varray.type(), 
[&](auto dummy) {
 using T = decltype(dummy);
 threading::parallel_for(selection.index_range(), 1024, [&](IndexRange 
range) {
-  for (const int i : selection.slice(range)) {
+  for ([[maybe_unused]] const int i : selection.slice(range)) {
 if constexpr (std::is_same_v) {
   ColorGeometry4f color = 
color_attribute.varray.get(i);
   transform_fn(color);

___
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] [f1d191120f4] master: Fix T99130: Spline factor gets messed up if one hair is too short

2022-06-24 Thread Dalai Felinto

Commit: f1d191120f4f1d762369b19bdbf8d9be29000d77
Author: Dalai Felinto
Date:   Fri Jun 24 12:42:52 2022 +0200
Branches: master
https://developer.blender.org/rBf1d191120f4f1d762369b19bdbf8d9be29000d77

Fix T99130: Spline factor gets messed up if one hair is too short

In the cases where length is zero, we simply equally distribute the
value based on the control point/curve index.

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

===

M   source/blender/nodes/geometry/nodes/node_geo_curve_spline_parameter.cc

===

diff --git 
a/source/blender/nodes/geometry/nodes/node_geo_curve_spline_parameter.cc 
b/source/blender/nodes/geometry/nodes/node_geo_curve_spline_parameter.cc
index ae2b4fd779d..b98541e3446 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_curve_spline_parameter.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_curve_spline_parameter.cc
@@ -119,10 +119,20 @@ static VArray 
construct_curve_parameter_varray(const bke::CurvesGeometry
   for (const int i_curve : range) {
 const float total_length = 
curves.evaluated_length_total_for_curve(i_curve,

cyclic[i_curve]);
-const float factor = total_length == 0.0f ? 0.0f : 1.0f / total_length;
 MutableSpan curve_lengths = 
lengths.slice(curves.points_for_curve(i_curve));
-for (float  : curve_lengths) {
-  value *= factor;
+if (total_length > 0.0f) {
+  const float factor = 1.0f / total_length;
+  for (float  : curve_lengths) {
+value *= factor;
+  }
+}
+else {
+  /* It is arbitrary what to do in those rare cases when all the 
points are
+   * in the same position. In this case we are just arbitrarily giving 
a valid
+   * value in the range based on the point index. */
+  for (const int i : curve_lengths.index_range()) {
+curve_lengths[i] = i / (curve_lengths.size() - 1.0f);
+  }
 }
   }
 });
@@ -135,9 +145,19 @@ static VArray 
construct_curve_parameter_varray(const bke::CurvesGeometry
 const int last_index = curves.curves_num() - 1;
 const int total_length = lengths.last() + 
curves.evaluated_length_total_for_curve(
   last_index, 
cyclic[last_index]);
-const float factor = total_length == 0.0f ? 0.0f : 1.0f / total_length;
-for (float  : lengths) {
-  value *= factor;
+if (total_length > 0.0f) {
+  const float factor = 1.0f / total_length;
+  for (float  : lengths) {
+value *= factor;
+  }
+}
+else {
+  /* It is arbitrary what to do in those rare cases when all the points are
+   * in the same position. In this case we are just arbitrarily giving a 
valid
+   * value in the range based on the curve index. */
+  for (const int i : lengths.index_range()) {
+lengths[i] = i / (lengths.size() - 1.0f);
+  }
 }
 return VArray::ForContainer(std::move(lengths));
   }

___
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] [79973494eca] master: Cleanup: Fix building warnings on gcc 9.4.0

2022-06-24 Thread Dalai Felinto

Commit: 79973494eca596bc633ca0d2da30d5e19ccd1733
Author: Dalai Felinto
Date:   Fri Jun 24 11:24:11 2022 +0200
Branches: master
https://developer.blender.org/rB79973494eca596bc633ca0d2da30d5e19ccd1733

Cleanup: Fix building warnings on gcc 9.4.0

Solution by Jacques Lucke

===

M   source/blender/editors/sculpt_paint/paint_vertex_color_ops.cc

===

diff --git a/source/blender/editors/sculpt_paint/paint_vertex_color_ops.cc 
b/source/blender/editors/sculpt_paint/paint_vertex_color_ops.cc
index 0fb4ded3b2a..a7c44a17e05 100644
--- a/source/blender/editors/sculpt_paint/paint_vertex_color_ops.cc
+++ b/source/blender/editors/sculpt_paint/paint_vertex_color_ops.cc
@@ -294,7 +294,7 @@ static bool transform_active_color(Mesh , const 
TransformFn _fn)
   attribute_math::convert_to_static_type(color_attribute.varray.type(), 
[&](auto dummy) {
 using T = decltype(dummy);
 threading::parallel_for(selection.index_range(), 1024, [&](IndexRange 
range) {
-  for (const int i : selection.slice(range)) {
+  for ([[maybe_unused]] const int i : selection.slice(range)) {
 if constexpr (std::is_same_v) {
   ColorGeometry4f color = 
color_attribute.varray.get(i);
   transform_fn(color);

___
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] [31d80ddeaad] master: Revert "LibOverride: Handle dependencies in both directions in partial override cases."

2022-06-22 Thread Dalai Felinto

Commit: 31d80ddeaad2615d258e1d4fa5703308c458055e
Author: Dalai Felinto
Date:   Wed Jun 22 10:34:55 2022 +0200
Branches: master
https://developer.blender.org/rB31d80ddeaad2615d258e1d4fa5703308c458055e

Revert "LibOverride: Handle dependencies in both directions in partial override 
cases."

This reverts commit f0b4aa5d59e3b3754bfcf3827f7524d34c809c62.

This commit was making files to get bigger and bigger every time they
were saved and re-opened.

In the orphaned data in the outliner new collections would show up
there, even after continuously purging it. This would lead to a massive
file which get also very slow.

This problem will fix itself after a few re-open/re-saves of the files.
For anyone also experimenting this you can fix this faster by purging
the unused data multiple times in the file.

Example of file from the Project Heist (rev. 1014):
heist/pro/shots/010_opening/010_0050/010_0050.anim.blend

===

M   source/blender/blenkernel/intern/lib_override.cc

===

diff --git a/source/blender/blenkernel/intern/lib_override.cc 
b/source/blender/blenkernel/intern/lib_override.cc
index 0b91a1e2866..22012662180 100644
--- a/source/blender/blenkernel/intern/lib_override.cc
+++ b/source/blender/blenkernel/intern/lib_override.cc
@@ -687,51 +687,6 @@ static void 
lib_override_group_tag_data_clear(LibOverrideGroupTagData *data)
   memset(data, 0, sizeof(*data));
 }
 
-static void 
lib_override_hierarchy_dependencies_recursive_tag_from(LibOverrideGroupTagData 
*data)
-{
-  Main *bmain = data->bmain;
-  ID *id = data->id_root;
-  const bool is_override = data->is_override;
-
-  if ((*(uint *)>tag & data->tag) == 0) {
-/* This ID is not tagged, no reason to proceed further to its parents. */
-return;
-  }
-
-  MainIDRelationsEntry *entry = static_cast(
-  BLI_ghash_lookup(bmain->relations->relations_from_pointers, id));
-  BLI_assert(entry != nullptr);
-
-  if (entry->tags & MAINIDRELATIONS_ENTRY_TAGS_PROCESSED_FROM) {
-/* This ID has already been processed. */
-return;
-  }
-  /* This way we won't process again that ID, should we encounter it again 
through another
-   * relationship hierarchy. */
-  entry->tags |= MAINIDRELATIONS_ENTRY_TAGS_PROCESSED_FROM;
-
-  for (MainIDRelationsEntryItem *from_id_entry = entry->from_ids; 
from_id_entry != nullptr;
-   from_id_entry = from_id_entry->next) {
-if ((from_id_entry->usage_flag & 
IDWALK_CB_OVERRIDE_LIBRARY_NOT_OVERRIDABLE) != 0) {
-  /* Never consider non-overridable relationships ('from', 'parents', 
'owner' etc. pointers)
-   * as actual dependencies. */
-  continue;
-}
-/* We only consider IDs from the same library. */
-ID *from_id = from_id_entry->id_pointer.from;
-if (from_id == nullptr || from_id->lib != id->lib ||
-(is_override && !ID_IS_OVERRIDE_LIBRARY(from_id))) {
-  /* IDs from different libraries, or non-override IDs in case we are 
processing overrides,
-   * are both barriers of dependency. */
-  continue;
-}
-from_id->tag |= data->tag;
-LibOverrideGroupTagData sub_data = *data;
-sub_data.id_root = from_id;
-lib_override_hierarchy_dependencies_recursive_tag_from(_data);
-  }
-}
-
 /* Tag all IDs in dependency relationships within an override hierarchy/group.
  *
  * Requires existing `Main.relations`.
@@ -748,13 +703,13 @@ static bool 
lib_override_hierarchy_dependencies_recursive_tag(LibOverrideGroupTa
   BLI_ghash_lookup(bmain->relations->relations_from_pointers, id));
   BLI_assert(entry != nullptr);
 
-  if (entry->tags & MAINIDRELATIONS_ENTRY_TAGS_PROCESSED_TO) {
+  if (entry->tags & MAINIDRELATIONS_ENTRY_TAGS_PROCESSED) {
 /* This ID has already been processed. */
 return (*(uint *)>tag & data->tag) != 0;
   }
   /* This way we won't process again that ID, should we encounter it again 
through another
* relationship hierarchy. */
-  entry->tags |= MAINIDRELATIONS_ENTRY_TAGS_PROCESSED_TO;
+  entry->tags |= MAINIDRELATIONS_ENTRY_TAGS_PROCESSED;
 
   for (MainIDRelationsEntryItem *to_id_entry = entry->to_ids; to_id_entry != 
nullptr;
to_id_entry = to_id_entry->next) {
@@ -778,15 +733,6 @@ static bool 
lib_override_hierarchy_dependencies_recursive_tag(LibOverrideGroupTa
 }
   }
 
-  /* If the current ID is/has been tagged for override above, then check its 
reversed dependencies
-   * (i.e. IDs that depend on the current one).
-   *
-   * This will cover e.g. the case where user override an armature, and would 
expect the mesh
-   * object deformed by that armature to also be overridden. */
-  if ((*(uint *)>tag & data->tag) != 0) {
-lib_override_hierarchy_dependencies_recursive_tag_from(data);
-  }
-
   return (*(uint *)>tag & data->tag) != 0

[Bf-blender-cvs] [18960c08fde] master: UI: Custom Properties - Rename properties to remove "Use/Is"

2022-06-17 Thread Dalai Felinto

Commit: 18960c08fde76dcd839e323d60b5775101229937
Author: Dalai Felinto
Date:   Thu Jun 16 16:50:03 2022 +0200
Branches: master
https://developer.blender.org/rB18960c08fde76dcd839e323d60b5775101229937

UI: Custom Properties - Rename properties to remove "Use/Is"

There is no need to have use/is in the final name. This is implicitly
represented by the checkbox already.

This does not change the Python API, only the names we show in the user
interface.

* Is Library Overridable -> Library Overridable
* Use Soft Limits -> Soft Limits

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

===

M   release/scripts/startup/bl_operators/wm.py

===

diff --git a/release/scripts/startup/bl_operators/wm.py 
b/release/scripts/startup/bl_operators/wm.py
index 0eaada7249b..50fc6bad720 100644
--- a/release/scripts/startup/bl_operators/wm.py
+++ b/release/scripts/startup/bl_operators/wm.py
@@ -1352,7 +1352,7 @@ class WM_OT_properties_edit(Operator):
 items=rna_custom_property_type_items,
 )
 is_overridable_library: BoolProperty(
-name="Is Library Overridable",
+name="Library Overridable",
 description="Allow the property to be overridden when the data-block 
is linked",
 default=False,
 )
@@ -1363,7 +1363,7 @@ class WM_OT_properties_edit(Operator):
 # Shared for integer and string properties.
 
 use_soft_limits: BoolProperty(
-name="Use Soft Limits",
+name="Soft Limits",
 description=(
 "Limits the Property Value slider to a range, "
 "values outside the range must be inputted numerically"

___
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] [8b9469ec361] master: Cleanup: Fix build for make lite and add . to code comments

2022-06-16 Thread Dalai Felinto

Commit: 8b9469ec361594bc8401bf29d5a11f71895182b4
Author: Dalai Felinto
Date:   Thu Jun 16 16:37:01 2022 +0200
Branches: master
https://developer.blender.org/rB8b9469ec361594bc8401bf29d5a11f71895182b4

Cleanup: Fix build for make lite and add . to code comments

Issue introduced on e6eefdd4020e.

===

M   source/blender/makesrna/intern/rna_scene.c

===

diff --git a/source/blender/makesrna/intern/rna_scene.c 
b/source/blender/makesrna/intern/rna_scene.c
index 28fc2483ad3..9e2a1d81bd3 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -2712,7 +2712,8 @@ static char *rna_FFmpegSettings_path(const PointerRNA 
*UNUSED(ptr))
   return BLI_strdup("render.ffmpeg");
 }
 
-/* FFMpeg Codec setting update hook */
+#  ifdef WITH_FFMPEG
+/* FFMpeg Codec setting update hook. */
 static void rna_FFmpegSettings_codec_update(Main *UNUSED(bmain),
 Scene *UNUSED(scene),
 PointerRNA *ptr)
@@ -2721,11 +2722,12 @@ static void rna_FFmpegSettings_codec_update(Main 
*UNUSED(bmain),
   if (!ELEM(codec_data->codec, AV_CODEC_ID_H264, AV_CODEC_ID_MPEG4, 
AV_CODEC_ID_VP9)) {
 /* Constant Rate Factor (CRF) setting is only available for H264,
  * MPEG4 and WEBM/VP9 codecs. So changing encoder quality mode to
- * CBR as CRF is not supported
+ * CBR as CRF is not supported.
  */
 codec_data->constant_rate_factor = FFM_CRF_NONE;
   }
 }
+#  endif
 
 #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] [798b49109b2] master: ID Type: Sort the items alphabetically

2022-06-16 Thread Dalai Felinto

Commit: 798b49109b2959e25f8224cf8bd0e631236fbb37
Author: Dalai Felinto
Date:   Thu Jun 16 15:25:09 2022 +0200
Branches: master
https://developer.blender.org/rB798b49109b2959e25f8224cf8bd0e631236fbb37

ID Type: Sort the items alphabetically

This also renames Hair Curves to Curves. Meaning that until we get
rid of the old curve type we will have both of those entires there:

* Curve
* Curves

This rna enum is used among other things in the driver UI to pick
which data-block you want the property from.

===

M   source/blender/makesrna/intern/rna_ID.c

===

diff --git a/source/blender/makesrna/intern/rna_ID.c 
b/source/blender/makesrna/intern/rna_ID.c
index b5cf8abaac6..8d2ee0ab534 100644
--- a/source/blender/makesrna/intern/rna_ID.c
+++ b/source/blender/makesrna/intern/rna_ID.c
@@ -33,41 +33,41 @@ const EnumPropertyItem rna_enum_id_type_items[] = {
 {ID_AC, "ACTION", ICON_ACTION, "Action", ""},
 {ID_AR, "ARMATURE", ICON_ARMATURE_DATA, "Armature", ""},
 {ID_BR, "BRUSH", ICON_BRUSH_DATA, "Brush", ""},
-{ID_CA, "CAMERA", ICON_CAMERA_DATA, "Camera", ""},
 {ID_CF, "CACHEFILE", ICON_FILE, "Cache File", ""},
+{ID_CA, "CAMERA", ICON_CAMERA_DATA, "Camera", ""},
+{ID_GR, "COLLECTION", ICON_OUTLINER_COLLECTION, "Collection", ""},
 {ID_CU_LEGACY, "CURVE", ICON_CURVE_DATA, "Curve", ""},
+{ID_CV, "CURVES", ICON_CURVES_DATA, "Curves", ""},
 {ID_VF, "FONT", ICON_FONT_DATA, "Font", ""},
 {ID_GD, "GREASEPENCIL", ICON_GREASEPENCIL, "Grease Pencil", ""},
-{ID_GR, "COLLECTION", ICON_OUTLINER_COLLECTION, "Collection", ""},
 {ID_IM, "IMAGE", ICON_IMAGE_DATA, "Image", ""},
 {ID_KE, "KEY", ICON_SHAPEKEY_DATA, "Key", ""},
-{ID_LA, "LIGHT", ICON_LIGHT_DATA, "Light", ""},
+{ID_LT, "LATTICE", ICON_LATTICE_DATA, "Lattice", ""},
 {ID_LI, "LIBRARY", ICON_LIBRARY_DATA_DIRECT, "Library", ""},
+{ID_LA, "LIGHT", ICON_LIGHT_DATA, "Light", ""},
+{ID_LP, "LIGHT_PROBE", ICON_LIGHTPROBE_CUBEMAP, "Light Probe", ""},
 {ID_LS, "LINESTYLE", ICON_LINE_DATA, "Line Style", ""},
-{ID_LT, "LATTICE", ICON_LATTICE_DATA, "Lattice", ""},
 {ID_MSK, "MASK", ICON_MOD_MASK, "Mask", ""},
 {ID_MA, "MATERIAL", ICON_MATERIAL_DATA, "Material", ""},
-{ID_MB, "META", ICON_META_DATA, "Metaball", ""},
 {ID_ME, "MESH", ICON_MESH_DATA, "Mesh", ""},
+{ID_MB, "META", ICON_META_DATA, "Metaball", ""},
 {ID_MC, "MOVIECLIP", ICON_TRACKER, "Movie Clip", ""},
 {ID_NT, "NODETREE", ICON_NODETREE, "Node Tree", ""},
 {ID_OB, "OBJECT", ICON_OBJECT_DATA, "Object", ""},
 {ID_PC, "PAINTCURVE", ICON_CURVE_BEZCURVE, "Paint Curve", ""},
 {ID_PAL, "PALETTE", ICON_COLOR, "Palette", ""},
 {ID_PA, "PARTICLE", ICON_PARTICLE_DATA, "Particle", ""},
-{ID_LP, "LIGHT_PROBE", ICON_LIGHTPROBE_CUBEMAP, "Light Probe", ""},
+{ID_PT, "POINTCLOUD", ICON_POINTCLOUD_DATA, "Point Cloud", ""},
 {ID_SCE, "SCENE", ICON_SCENE_DATA, "Scene", ""},
 {ID_SIM, "SIMULATION", ICON_PHYSICS, "Simulation", ""}, /* TODO: Use 
correct icon. */
 {ID_SO, "SOUND", ICON_SOUND, "Sound", ""},
 {ID_SPK, "SPEAKER", ICON_SPEAKER, "Speaker", ""},
 {ID_TXT, "TEXT", ICON_TEXT, "Text", ""},
 {ID_TE, "TEXTURE", ICON_TEXTURE_DATA, "Texture", ""},
-{ID_CV, "CURVES", ICON_CURVES_DATA, "Hair Curves", ""},
-{ID_PT, "POINTCLOUD", ICON_POINTCLOUD_DATA, "Point Cloud", ""},
 {ID_VO, "VOLUME", ICON_VOLUME_DATA, "Volume", ""},
 {ID_WM, "WINDOWMANAGER", ICON_WINDOW, "Window Manager", ""},
-{ID_WO, "WORLD", ICON_WORLD_DATA, "World", ""},
 {ID_WS, "WORKSPACE", ICON_WORKSPACE, "Workspace", ""},
+{ID_WO, "WORLD", ICON_WORLD_DATA, "World", ""},
 {0, NULL, 0, NULL, NULL},
 };

___
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 [62953] trunk/lib/resources/icon_geom.blend: Setup the file for rendering

2022-06-15 Thread Dalai Felinto

Revision: 62953
  https://developer.blender.org/rBL62953
Author:   dfelinto
Date: 2022-06-15 19:04:54 +0200 (Wed, 15 Jun 2022)
Log Message:
---
Setup the file for rendering

I am rendering the curves sculpt tool icons to use
for their brushes as well.

The setup in case things get lost is to just set the world
background color to #282828.

Modified Paths:
--
trunk/lib/resources/icon_geom.blend

Modified: trunk/lib/resources/icon_geom.blend
===
(Binary files 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] [7e89bbb2ff3] master: UI: Implement icons for the curve sculpt tools brushes

2022-06-15 Thread Dalai Felinto

Commit: 7e89bbb2ff3e060807beaef200d9173befeba528
Author: Dalai Felinto
Date:   Wed Jun 15 12:14:21 2022 +0200
Branches: master
https://developer.blender.org/rB7e89bbb2ff3e060807beaef200d9173befeba528

UI: Implement icons for the curve sculpt tools brushes

I'm using the tool icons for the brush themselves.

Note: This includes a few brushes that are only defined in D15134.
Those are simply the icons rendered with a world background of #282828.

===

A   release/datafiles/brushicons/curves_sculpt_add.png
A   release/datafiles/brushicons/curves_sculpt_comb.png
A   release/datafiles/brushicons/curves_sculpt_cut.png
A   release/datafiles/brushicons/curves_sculpt_delete.png
A   release/datafiles/brushicons/curves_sculpt_density.png
A   release/datafiles/brushicons/curves_sculpt_grow_shrink.png
A   release/datafiles/brushicons/curves_sculpt_pinch.png
A   release/datafiles/brushicons/curves_sculpt_puff.png
A   release/datafiles/brushicons/curves_sculpt_slide.png
A   release/datafiles/brushicons/curves_sculpt_smooth.png
A   release/datafiles/brushicons/curves_sculpt_snake_hook.png
A   release/datafiles/brushicons/paint_select.png
M   source/blender/editors/datafiles/CMakeLists.txt
M   source/blender/editors/include/ED_datafiles.h
M   source/blender/editors/include/UI_icons.h
M   source/blender/editors/interface/interface_icons.c
M   source/blender/makesrna/intern/rna_brush.c

===

diff --git a/release/datafiles/brushicons/curves_sculpt_add.png 
b/release/datafiles/brushicons/curves_sculpt_add.png
new file mode 100644
index 000..e8b81b73919
Binary files /dev/null and b/release/datafiles/brushicons/curves_sculpt_add.png 
differ
diff --git a/release/datafiles/brushicons/curves_sculpt_comb.png 
b/release/datafiles/brushicons/curves_sculpt_comb.png
new file mode 100644
index 000..bdf49e413e3
Binary files /dev/null and 
b/release/datafiles/brushicons/curves_sculpt_comb.png differ
diff --git a/release/datafiles/brushicons/curves_sculpt_cut.png 
b/release/datafiles/brushicons/curves_sculpt_cut.png
new file mode 100644
index 000..7f9e116fcd1
Binary files /dev/null and b/release/datafiles/brushicons/curves_sculpt_cut.png 
differ
diff --git a/release/datafiles/brushicons/curves_sculpt_delete.png 
b/release/datafiles/brushicons/curves_sculpt_delete.png
new file mode 100644
index 000..361b8e335a5
Binary files /dev/null and 
b/release/datafiles/brushicons/curves_sculpt_delete.png differ
diff --git a/release/datafiles/brushicons/curves_sculpt_density.png 
b/release/datafiles/brushicons/curves_sculpt_density.png
new file mode 100644
index 000..305fa02298f
Binary files /dev/null and 
b/release/datafiles/brushicons/curves_sculpt_density.png differ
diff --git a/release/datafiles/brushicons/curves_sculpt_grow_shrink.png 
b/release/datafiles/brushicons/curves_sculpt_grow_shrink.png
new file mode 100644
index 000..e4a76c6d6e4
Binary files /dev/null and 
b/release/datafiles/brushicons/curves_sculpt_grow_shrink.png differ
diff --git a/release/datafiles/brushicons/curves_sculpt_pinch.png 
b/release/datafiles/brushicons/curves_sculpt_pinch.png
new file mode 100644
index 000..cc98203ef57
Binary files /dev/null and 
b/release/datafiles/brushicons/curves_sculpt_pinch.png differ
diff --git a/release/datafiles/brushicons/curves_sculpt_puff.png 
b/release/datafiles/brushicons/curves_sculpt_puff.png
new file mode 100644
index 000..e5b48b8a96c
Binary files /dev/null and 
b/release/datafiles/brushicons/curves_sculpt_puff.png differ
diff --git a/release/datafiles/brushicons/curves_sculpt_slide.png 
b/release/datafiles/brushicons/curves_sculpt_slide.png
new file mode 100644
index 000..7627cf76791
Binary files /dev/null and 
b/release/datafiles/brushicons/curves_sculpt_slide.png differ
diff --git a/release/datafiles/brushicons/curves_sculpt_smooth.png 
b/release/datafiles/brushicons/curves_sculpt_smooth.png
new file mode 100644
index 000..7c7fd8fef4a
Binary files /dev/null and 
b/release/datafiles/brushicons/curves_sculpt_smooth.png differ
diff --git a/release/datafiles/brushicons/curves_sculpt_snake_hook.png 
b/release/datafiles/brushicons/curves_sculpt_snake_hook.png
new file mode 100644
index 000..468abe66c08
Binary files /dev/null and 
b/release/datafiles/brushicons/curves_sculpt_snake_hook.png differ
diff --git a/release/datafiles/brushicons/paint_select.png 
b/release/datafiles/brushicons/paint_select.png
new file mode 100644
index 000..38f9a1250b2
Binary files /dev/null and b/release/datafiles/brushicons/paint_select.png 
differ
diff --git a/source/blender/editors/datafiles/CMakeLists.txt 
b/source/blender/editors/datafiles/CMakeLists.txt
index a7abaab88ff..9da2c4819a3 100644
--- a/source/blender/editors/datafiles/CMakeLists.txt
+++ b/source/blender/editors

[Bf-blender-cvs] [0a3650210f8] master: UI: Fix sculpt curve not being able to get brush icons

2022-06-15 Thread Dalai Felinto

Commit: 0a3650210f83de7d0983eed7d52efe5ec602b4d4
Author: Dalai Felinto
Date:   Wed Jun 15 18:30:14 2022 +0200
Branches: master
https://developer.blender.org/rB0a3650210f83de7d0983eed7d52efe5ec602b4d4

UI: Fix sculpt curve not being able to get brush icons

This commit doesn't add the brush icons themselves, but
it fix the code that allow them to be used.

===

M   source/blender/editors/interface/interface_icons.c

===

diff --git a/source/blender/editors/interface/interface_icons.c 
b/source/blender/editors/interface/interface_icons.c
index 332b9b44b0a..ca4021a9be8 100644
--- a/source/blender/editors/interface/interface_icons.c
+++ b/source/blender/editors/interface/interface_icons.c
@@ -2034,6 +2034,9 @@ static int ui_id_brush_get_icon(const bContext *C, ID *id)
   else if (ob->mode & OB_MODE_TEXTURE_PAINT) {
 paint_mode = PAINT_MODE_TEXTURE_3D;
   }
+  else if (ob->mode & OB_MODE_SCULPT_CURVES) {
+paint_mode = PAINT_MODE_SCULPT_CURVES;
+  }
 }
 else if (space_type == SPACE_IMAGE) {
   if (area->spacetype == space_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] [15b4120064f] master: Make Instance Face: Support instanced collections too

2022-06-15 Thread Dalai Felinto

Commit: 15b4120064f192c29ed5b324bf8e63aa49b95ca6
Author: Dalai Felinto
Date:   Wed Jun 15 13:01:39 2022 +0200
Branches: master
https://developer.blender.org/rB15b4120064f192c29ed5b324bf8e63aa49b95ca6

Make Instance Face: Support instanced collections too

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

===

M   release/scripts/startup/bl_operators/object.py

===

diff --git a/release/scripts/startup/bl_operators/object.py 
b/release/scripts/startup/bl_operators/object.py
index 60f534b3ab6..6e08d557353 100644
--- a/release/scripts/startup/bl_operators/object.py
+++ b/release/scripts/startup/bl_operators/object.py
@@ -596,6 +596,8 @@ class MakeDupliFace(Operator):
 for obj in context.selected_objects:
 if obj.type == 'MESH':
 linked[obj.data].append(obj)
+elif obj.type == 'EMPTY' and obj.instance_type == 'COLLECTION' and 
obj.instance_collection:
+linked[obj.instance_collection].append(obj)
 
 for data, objects in linked.items():
 face_verts = [axis for obj in objects
@@ -621,7 +623,12 @@ class MakeDupliFace(Operator):
 ob_new = bpy.data.objects.new(mesh.name, mesh)
 context.collection.objects.link(ob_new)
 
-ob_inst = bpy.data.objects.new(data.name, data)
+if type(data) is bpy.types.Collection:
+ob_inst = bpy.data.objects.new(data.name, None)
+ob_inst.instance_type = 'COLLECTION'
+ob_inst.instance_collection = data
+else:
+ob_inst = bpy.data.objects.new(data.name, data)
 context.collection.objects.link(ob_inst)
 
 ob_new.instance_type = 'FACES'

___
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 [62952] trunk/lib/resources/icon_geom.blend: Rename curve sculpt density and slide brushes

2022-06-15 Thread Dalai Felinto

Revision: 62952
  https://developer.blender.org/rBL62952
Author:   dfelinto
Date: 2022-06-15 11:58:51 +0200 (Wed, 15 Jun 2022)
Log Message:
---
Rename curve sculpt density and slide brushes

They were missing their sculpt_ prefix.

Modified Paths:
--
trunk/lib/resources/icon_geom.blend

Modified: trunk/lib/resources/icon_geom.blend
===
(Binary files 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] [412c4688939] master: UI: Icons - Rename Density and Slide sculpt curve icons

2022-06-15 Thread Dalai Felinto

Commit: 412c4688939f94e2e40d6c517ec9db7fd0cbb8e4
Author: Dalai Felinto
Date:   Wed Jun 15 11:45:53 2022 +0200
Branches: master
https://developer.blender.org/rB412c4688939f94e2e40d6c517ec9db7fd0cbb8e4

UI: Icons - Rename Density and Slide sculpt curve icons

Those tools will get renamed to follow the standard we have
for the other tools (i.e., add sculpt_ in their name).

===

R100release/datafiles/icons/ops.curves.density.dat  
release/datafiles/icons/ops.curves.sculpt_density.dat
R100release/datafiles/icons/ops.curves.slide.dat
release/datafiles/icons/ops.curves.sculpt_slide.dat
M   source/blender/editors/datafiles/CMakeLists.txt

===

diff --git a/release/datafiles/icons/ops.curves.density.dat 
b/release/datafiles/icons/ops.curves.sculpt_density.dat
similarity index 100%
rename from release/datafiles/icons/ops.curves.density.dat
rename to release/datafiles/icons/ops.curves.sculpt_density.dat
diff --git a/release/datafiles/icons/ops.curves.slide.dat 
b/release/datafiles/icons/ops.curves.sculpt_slide.dat
similarity index 100%
rename from release/datafiles/icons/ops.curves.slide.dat
rename to release/datafiles/icons/ops.curves.sculpt_slide.dat
diff --git a/source/blender/editors/datafiles/CMakeLists.txt 
b/source/blender/editors/datafiles/CMakeLists.txt
index 34ae7697d2d..a7abaab88ff 100644
--- a/source/blender/editors/datafiles/CMakeLists.txt
+++ b/source/blender/editors/datafiles/CMakeLists.txt
@@ -772,17 +772,17 @@ set_property(GLOBAL PROPERTY ICON_GEOM_NAMES
   ops.curve.pen
   ops.curve.radius
   ops.curve.vertex_random
-  ops.curves.density
   ops.curves.sculpt_add
   ops.curves.sculpt_comb
   ops.curves.sculpt_cut
   ops.curves.sculpt_delete
+  ops.curves.sculpt_density
   ops.curves.sculpt_grow_shrink
   ops.curves.sculpt_pinch
   ops.curves.sculpt_puff
+  ops.curves.sculpt_slide
   ops.curves.sculpt_smooth
   ops.curves.sculpt_snake_hook
-  ops.curves.slide
   ops.generic.cursor
   ops.generic.select
   ops.generic.select_box

___
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] [e6548c03f9f] master: UI: Sculpt Curves Slide icon

2022-06-09 Thread Dalai Felinto

Commit: e6548c03f9f345789f0a93405047b978b109b3fc
Author: Dalai Felinto
Date:   Thu Jun 9 17:17:58 2022 +0200
Branches: master
https://developer.blender.org/rBe6548c03f9f345789f0a93405047b978b109b3fc

UI: Sculpt Curves Slide icon

===

A   release/datafiles/icons/ops.curves.slide.dat
M   source/blender/editors/datafiles/CMakeLists.txt

===

diff --git a/release/datafiles/icons/ops.curves.slide.dat 
b/release/datafiles/icons/ops.curves.slide.dat
new file mode 100644
index 000..7f143ad92cc
Binary files /dev/null and b/release/datafiles/icons/ops.curves.slide.dat differ
diff --git a/source/blender/editors/datafiles/CMakeLists.txt 
b/source/blender/editors/datafiles/CMakeLists.txt
index 3b975e580ba..34ae7697d2d 100644
--- a/source/blender/editors/datafiles/CMakeLists.txt
+++ b/source/blender/editors/datafiles/CMakeLists.txt
@@ -782,6 +782,7 @@ set_property(GLOBAL PROPERTY ICON_GEOM_NAMES
   ops.curves.sculpt_puff
   ops.curves.sculpt_smooth
   ops.curves.sculpt_snake_hook
+  ops.curves.slide
   ops.generic.cursor
   ops.generic.select
   ops.generic.select_box

___
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 [62948] trunk/lib/resources/icon_geom.blend: Curves Sculpt Slide icon

2022-06-09 Thread Dalai Felinto

Revision: 62948
  https://developer.blender.org/rBL62948
Author:   dfelinto
Date: 2022-06-09 17:17:34 +0200 (Thu, 09 Jun 2022)
Log Message:
---
Curves Sculpt Slide icon

Modified Paths:
--
trunk/lib/resources/icon_geom.blend

Modified: trunk/lib/resources/icon_geom.blend
===
(Binary files 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] [e05e1e36918] blender-v3.2-release: Licenses: Attribution document for Blender 3.2

2022-06-08 Thread Dalai Felinto

Commit: e05e1e369187945ea2f9c9feb3caa1f6d577321e
Author: Dalai Felinto
Date:   Wed Jun 8 12:22:46 2022 +0200
Branches: blender-v3.2-release
https://developer.blender.org/rBe05e1e369187945ea2f9c9feb3caa1f6d577321e

Licenses: Attribution document for Blender 3.2

A few libraries were updated, a few were added, and a few were missing
from the previous license document.

===

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

===

diff --git a/release/license/THIRD-PARTY-LICENSES.txt 
b/release/license/THIRD-PARTY-LICENSES.txt
index 59f53832c9b..34ece3b778f 100644
--- a/release/license/THIRD-PARTY-LICENSES.txt
+++ b/release/license/THIRD-PARTY-LICENSES.txt
@@ -1,4 +1,4 @@
-** Blosc; version 1.5.0 -- https://github.com/Blosc/c-blosc
+** Blosc; version 1.21.1 -- https://github.com/Blosc/c-blosc
 For Blosc - A blocking, shuffling and lossless compression library
 
 Copyright (C) 2009-2018 Francesc Alted 
@@ -22,12 +22,12 @@ PERFORMANCE OF THIS SOFTWARE.
 ** Audaspace; version 1.3.0 -- https://audaspace.github.io/
 ** Cuda Wrangler; version cbf465b -- https://github.com/CudaWrangler/cuew
 ** Draco; version 1.3.6 -- https://google.github.io/draco/
-** Embree; version 3.10 -- https://github.com/embree/embree
+** Embree; version 3.13.3 -- https://github.com/embree/embree
 ** Mantaflow; version 0.13 -- http://mantaflow.com/
-** oneAPI Threading Building Block; version 2020_U2 --
+** 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.1 -- https://www.openimagedenoise.org/
+** OpenImageDenoise; version 1.4.3 -- https://www.openimagedenoise.org/
 ** OpenSSL; version 1.1.1 -- https://www.openssl.org/
 ** OpenXR SDK; version 1.0.17 -- https://khronos.org/openxr
 ** RangeTree; version 40ebed8aa209 -- https://github.com/ideasman42/rangetree-c
@@ -267,7 +267,7 @@ limitations under the License.
 
 ** NASM; version 2.15.02 -- https://www.nasm.us/
 Contributions since 2008-12-15 are Copyright Intel Corporation.
-** OpenJPEG; version 2.3.1 -- https://github.com/uclouvain/openjpeg
+** OpenJPEG; version 2.4.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
@@ -316,22 +316,35 @@ All rights reserved.
 ** Google Logging; version 4.4.0 -- https://github.com/google/glog
 Copyright (c) 2006, Google Inc.
 All rights reserved.
-** ISPC; version 1.16.0 -- https://github.com/ispc/ispc
+** Imath; version 3.1.3 -- https://github.com/AcademySoftwareFoundation/Imath
+Contributors to the OpenEXR Project.
+** ISPC; version 1.17.0 -- https://github.com/ispc/ispc
 Copyright Intel Corporation
 ** NumPy; version 1.22.0 -- https://numpy.org/
 Copyright (c) 2005-2021, NumPy Developers.
-** Open Shading Language; version 1.11.14.1 --
+** 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 --
 https://github.com/imageworks/OpenShadingLanguage
 Copyright Contributors to the Open Shading Language project.
-** OpenColorIO; version 2.0.0 --
+** OpenColorIO; version 2.1.1 --
 https://github.com/AcademySoftwareFoundation/OpenColorIO
 Copyright Contributors to the OpenColorIO Project.
-** OpenEXR; version 2.5.5 --
+** OpenEXR; version 3.1.4 --
 https://github.com/AcademySoftwareFoundation/openexr
 Copyright Contributors to the OpenEXR Project. All rights reserved.
-** OpenImageIO; version 2.2.15.1 -- http://www.openimageio.org
+** OpenImageIO; version 2.3.13.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
+Copyright (c) 2008-2010, Sony Pictures Imageworks Inc
+All rights reserved.
+** Vorbis; version 1.3.7 -- https://xiph.org/vorbis/
+Copyright (c) 2002-2020 Xiph.org Foundation
+** VPX; version 1.11.0 -- https://github.com/webmproject/libvpx
+Copyright (c) 2010, The WebM Project authors. All rights reserved.
+** WebP; version 1.2.2 -- https://github.com/webmproject/libwebp
+Copyright (c) 2010, Google Inc. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
@@ -493,6 +506,9 @@ effect of CC0 on those rights.
 
 --
 
+** FLAC; version 1.3.4 -- https://xiph.org/flac/
+Copyright (C) 2001-2009  Josh Coalson
+Copyright (C) 2011-2016  Xiph.Org Foundation
 ** Potrace; version 1.16 -- http://potrace.sourceforge.net/
 Copyright (C) 2001-2019 Peter Selinger.
 
@@ -819,12 +835,12 @@ Yoyodyne, Inc., hereby disclaims all copyright interest 
in the program

[Bf-blender-cvs] [a857156578c] master: UI: Curves Sculpt density + smooth brushes

2022-06-07 Thread Dalai Felinto

Commit: a857156578c99cbfc8abd658abfeac74d09affa3
Author: Dalai Felinto
Date:   Tue Jun 7 19:06:15 2022 +0200
Branches: master
https://developer.blender.org/rBa857156578c99cbfc8abd658abfeac74d09affa3

UI: Curves Sculpt density + smooth brushes

More information in the svn log. But basically the smooth brush
is re-using the previous one we had for hair, and the density is
representing the hair root points that are removed to reach the
desired density.

Those brushes are used by D15134.

===

A   release/datafiles/icons/ops.curves.density.dat
A   release/datafiles/icons/ops.curves.sculpt_smooth.dat
M   source/blender/editors/datafiles/CMakeLists.txt

===

diff --git a/release/datafiles/icons/ops.curves.density.dat 
b/release/datafiles/icons/ops.curves.density.dat
new file mode 100644
index 000..f336de79082
Binary files /dev/null and b/release/datafiles/icons/ops.curves.density.dat 
differ
diff --git a/release/datafiles/icons/ops.curves.sculpt_smooth.dat 
b/release/datafiles/icons/ops.curves.sculpt_smooth.dat
new file mode 100644
index 000..ba4bd081f33
Binary files /dev/null and 
b/release/datafiles/icons/ops.curves.sculpt_smooth.dat differ
diff --git a/source/blender/editors/datafiles/CMakeLists.txt 
b/source/blender/editors/datafiles/CMakeLists.txt
index 59370b53995..3b975e580ba 100644
--- a/source/blender/editors/datafiles/CMakeLists.txt
+++ b/source/blender/editors/datafiles/CMakeLists.txt
@@ -772,6 +772,7 @@ set_property(GLOBAL PROPERTY ICON_GEOM_NAMES
   ops.curve.pen
   ops.curve.radius
   ops.curve.vertex_random
+  ops.curves.density
   ops.curves.sculpt_add
   ops.curves.sculpt_comb
   ops.curves.sculpt_cut
@@ -779,6 +780,7 @@ set_property(GLOBAL PROPERTY ICON_GEOM_NAMES
   ops.curves.sculpt_grow_shrink
   ops.curves.sculpt_pinch
   ops.curves.sculpt_puff
+  ops.curves.sculpt_smooth
   ops.curves.sculpt_snake_hook
   ops.generic.cursor
   ops.generic.select

___
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 [62947] trunk/lib/resources/icon_geom.blend: Sculpt Curves: Density

2022-06-07 Thread Dalai Felinto

Revision: 62947
  https://developer.blender.org/rBL62947
Author:   dfelinto
Date: 2022-06-07 19:04:56 +0200 (Tue, 07 Jun 2022)
Log Message:
---
Sculpt Curves: Density

This icon represents the root points of the hair curves that
are removed due to the density/distance.

It follows the isometric perspective we have in the edit mesh tools.

(Thank you Pablo Vazquez for pointing/suggesting that out, my original
take had the points going on the other direction).

Modified Paths:
--
trunk/lib/resources/icon_geom.blend

Modified: trunk/lib/resources/icon_geom.blend
===
(Binary files 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] SVN commit: bf-blender [62946] trunk/lib/resources/icon_geom.blend: Sculpt Curves: Smooth Icon

2022-06-07 Thread Dalai Felinto

Revision: 62946
  https://developer.blender.org/rBL62946
Author:   dfelinto
Date: 2022-06-07 17:14:52 +0200 (Tue, 07 Jun 2022)
Log Message:
---
Sculpt Curves: Smooth Icon

Re-use the existing icon we have for the old hair system.

Modified Paths:
--
trunk/lib/resources/icon_geom.blend

Modified: trunk/lib/resources/icon_geom.blend
===
(Binary files 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] SVN commit: bf-blender [62945] trunk/lib/resources/icon_geom.blend: Apply mirror modifier for pinch icon

2022-06-07 Thread Dalai Felinto

Revision: 62945
  https://developer.blender.org/rBL62945
Author:   dfelinto
Date: 2022-06-07 16:09:46 +0200 (Tue, 07 Jun 2022)
Log Message:
---
Apply mirror modifier for pinch icon

There is a strange bug where I get difference results
with different builds of Blender whether the icon is
applied or not applied.

To avoid spend more time on this I am applying the modifier now.
If the problem shows up again into the future I can investigate
this properly.

Modified Paths:
--
trunk/lib/resources/icon_geom.blend

Modified: trunk/lib/resources/icon_geom.blend
===
(Binary files 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] [3fe7d049d21] master: Fix new curve objects showing as UNKNOWN in the outliner

2022-06-03 Thread Dalai Felinto

Commit: 3fe7d049d21b4ad939ea8fb2df1f80c4f107a699
Author: Dalai Felinto
Date:   Fri Jun 3 18:40:14 2022 +0200
Branches: master
https://developer.blender.org/rB3fe7d049d21b4ad939ea8fb2df1f80c4f107a699

Fix new curve objects showing as UNKNOWN in the outliner

The fix is to unify with the name we had for the old Curves objects.

That means that we will see them bothi (old and new curves) in the outliner
(under two different categories but with different names).

This is considered to be a temporary solution until we remove the old
curve system entirely.

===

M   source/blender/blenkernel/intern/curves.cc

===

diff --git a/source/blender/blenkernel/intern/curves.cc 
b/source/blender/blenkernel/intern/curves.cc
index 589a1a9208e..9abd5a7fdf0 100644
--- a/source/blender/blenkernel/intern/curves.cc
+++ b/source/blender/blenkernel/intern/curves.cc
@@ -208,8 +208,8 @@ IDTypeInfo IDType_ID_CV = {
 /*id_filter */ FILTER_ID_CV,
 /*main_listbase_index */ INDEX_ID_CV,
 /*struct_size */ sizeof(Curves),
-/*name */ "Hair Curves",
-/*name_plural */ "Hair Curves",
+/*name */ "Curves",
+/*name_plural */ "curves",
 /*translation_context */ BLT_I18NCONTEXT_ID_CURVES,
 /*flags */ IDTYPE_FLAGS_APPEND_IS_REUSABLE,
 /*asset_type_info */ nullptr,

___
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] [e7156be86e8] master: Merge remote-tracking branch 'origin/blender-v3.2-release'

2022-06-03 Thread Dalai Felinto

Commit: e7156be86e8daa13c43f4347349a91d7fcc51cc1
Author: Dalai Felinto
Date:   Fri Jun 3 16:13:51 2022 +0200
Branches: master
https://developer.blender.org/rBe7156be86e8daa13c43f4347349a91d7fcc51cc1

Merge remote-tracking branch 'origin/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] [0b38b8dafaa] blender-v3.2-release: Spreadsheet Editor: Support int 8 attribute

2022-06-03 Thread Dalai Felinto

Commit: 0b38b8dafaa237ec2e7427db969055e84d2c72c9
Author: Dalai Felinto
Date:   Fri Jun 3 15:52:28 2022 +0200
Branches: blender-v3.2-release
https://developer.blender.org/rB0b38b8dafaa237ec2e7427db969055e84d2c72c9

Spreadsheet Editor: Support int 8 attribute

This was leading to some crashes and warnings such as:

"Code marked as unreachable has been executed. Please report this as a bug."

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

===

M   source/blender/editors/space_spreadsheet/space_spreadsheet.cc
M   source/blender/editors/space_spreadsheet/spreadsheet_column.cc
M   source/blender/editors/space_spreadsheet/spreadsheet_row_filter.cc
M   source/blender/editors/space_spreadsheet/spreadsheet_row_filter_ui.cc
M   source/blender/makesdna/DNA_space_types.h
M   source/blender/makesrna/intern/rna_space.c

===

diff --git a/source/blender/editors/space_spreadsheet/space_spreadsheet.cc 
b/source/blender/editors/space_spreadsheet/space_spreadsheet.cc
index b3d6c395e89..d731b6c6717 100644
--- a/source/blender/editors/space_spreadsheet/space_spreadsheet.cc
+++ b/source/blender/editors/space_spreadsheet/space_spreadsheet.cc
@@ -304,6 +304,7 @@ static float get_default_column_width(const ColumnValues 
)
   switch (values.type()) {
 case SPREADSHEET_VALUE_TYPE_BOOL:
   return 2.0f;
+case SPREADSHEET_VALUE_TYPE_INT8:
 case SPREADSHEET_VALUE_TYPE_INT32:
   return float_width;
 case SPREADSHEET_VALUE_TYPE_FLOAT:
diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_column.cc 
b/source/blender/editors/space_spreadsheet/spreadsheet_column.cc
index a29aa1fd026..46e98acb8e8 100644
--- a/source/blender/editors/space_spreadsheet/spreadsheet_column.cc
+++ b/source/blender/editors/space_spreadsheet/spreadsheet_column.cc
@@ -23,6 +23,9 @@ eSpreadsheetColumnValueType cpp_type_to_column_type(const 
CPPType )
   if (type.is()) {
 return SPREADSHEET_VALUE_TYPE_BOOL;
   }
+  if (type.is()) {
+return SPREADSHEET_VALUE_TYPE_INT8;
+  }
   if (type.is()) {
 return SPREADSHEET_VALUE_TYPE_INT32;
   }
diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_row_filter.cc 
b/source/blender/editors/space_spreadsheet/spreadsheet_row_filter.cc
index 3ae4536b652..4f3d43ded92 100644
--- a/source/blender/editors/space_spreadsheet/spreadsheet_row_filter.cc
+++ b/source/blender/editors/space_spreadsheet/spreadsheet_row_filter.cc
@@ -73,6 +73,35 @@ static void apply_row_filter(const SpreadsheetRowFilter 
_filter,
   }
 }
   }
+  else if (column_data.type().is()) {
+const int value = row_filter.value_int;
+switch (row_filter.operation) {
+  case SPREADSHEET_ROW_FILTER_EQUAL: {
+apply_filter_operation(
+column_data.typed(),
+[&](const int cell) { return cell == value; },
+prev_mask,
+new_indices);
+break;
+  }
+  case SPREADSHEET_ROW_FILTER_GREATER: {
+apply_filter_operation(
+column_data.typed(),
+[value](const int cell) { return cell > value; },
+prev_mask,
+new_indices);
+break;
+  }
+  case SPREADSHEET_ROW_FILTER_LESS: {
+apply_filter_operation(
+column_data.typed(),
+[&](const int cell) { return cell < value; },
+prev_mask,
+new_indices);
+break;
+  }
+}
+  }
   else if (column_data.type().is()) {
 const int value = row_filter.value_int;
 switch (row_filter.operation) {
diff --git 
a/source/blender/editors/space_spreadsheet/spreadsheet_row_filter_ui.cc 
b/source/blender/editors/space_spreadsheet/spreadsheet_row_filter_ui.cc
index 7c1ac024c12..d42a371c666 100644
--- a/source/blender/editors/space_spreadsheet/spreadsheet_row_filter_ui.cc
+++ b/source/blender/editors/space_spreadsheet/spreadsheet_row_filter_ui.cc
@@ -63,6 +63,7 @@ static std::string value_string(const SpreadsheetRowFilter 
_filter,
 const eSpreadsheetColumnValueType data_type)
 {
   switch (data_type) {
+case SPREADSHEET_VALUE_TYPE_INT8:
 case SPREADSHEET_VALUE_TYPE_INT32:
   return std::to_string(row_filter.value_int);
 case SPREADSHEET_VALUE_TYPE_FLOAT: {
@@ -200,6 +201,10 @@ static void spreadsheet_filter_panel_draw(const bContext 
*C, Panel *panel)
   }
 
   switch (static_cast(column->data_type)) {
+case SPREADSHEET_VALUE_TYPE_INT8:
+  uiItemR(layout, filter_ptr, "operation", 0, nullptr, ICON_NONE);
+  uiItemR(layout, filter_ptr, "value_int8", 0, IFACE_("Value"), ICON_NONE);
+  break;
 case SPREADSHEET_VALUE_TYPE_INT32:
   uiItemR(layout, filter_ptr, "operation", 0, nullptr, ICON_NONE);
   uiItemR(layout, filter_ptr, "value_int", 0, IFACE_("Value"), ICON_N

[Bf-blender-cvs] [c1277c5d250] master: Merge remote-tracking branch 'origin/blender-v3.2-release'

2022-05-30 Thread Dalai Felinto

Commit: c1277c5d25028ab2a09afc174ae4518d5f8e2b9e
Author: Dalai Felinto
Date:   Mon May 30 16:44:22 2022 +0200
Branches: master
https://developer.blender.org/rBc1277c5d25028ab2a09afc174ae4518d5f8e2b9e

Merge remote-tracking branch 'origin/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] [de610d06a6b] blender-v3.2-release: Cleanup: make format

2022-05-30 Thread Dalai Felinto

Commit: de610d06a6b7c169c44138717a54baa890105730
Author: Dalai Felinto
Date:   Mon May 30 16:17:25 2022 +0200
Branches: blender-v3.2-release
https://developer.blender.org/rBde610d06a6b7c169c44138717a54baa890105730

Cleanup: make format

===

M   source/blender/draw/intern/shaders/common_subdiv_ibo_lines_comp.glsl
M   source/blender/draw/intern/shaders/common_subdiv_ibo_tris_comp.glsl

===

diff --git 
a/source/blender/draw/intern/shaders/common_subdiv_ibo_lines_comp.glsl 
b/source/blender/draw/intern/shaders/common_subdiv_ibo_lines_comp.glsl
index 5084dcc0746..3244b7960d8 100644
--- a/source/blender/draw/intern/shaders/common_subdiv_ibo_lines_comp.glsl
+++ b/source/blender/draw/intern/shaders/common_subdiv_ibo_lines_comp.glsl
@@ -35,7 +35,8 @@ void emit_line(uint line_offset, uint quad_index, uint 
start_loop_index, uint co
   uint coarse_quad_index = 
coarse_polygon_index_from_subdiv_quad_index(quad_index,

coarse_poly_count);
 
-  if (is_face_hidden(coarse_quad_index) || (input_origindex[vertex_index] == 
ORIGINDEX_NONE && optimal_display)) {
+  if (is_face_hidden(coarse_quad_index) ||
+  (input_origindex[vertex_index] == ORIGINDEX_NONE && optimal_display)) {
 output_lines[line_offset + 0] = 0x;
 output_lines[line_offset + 1] = 0x;
   }
@@ -62,13 +63,13 @@ void main()
   uint loop_index = num_subdiv_loops + index * 2;
 
   if (lines_loose_flags[index] != 0) {
-  /* Line is hidden. */
-  output_lines[line_offset] = 0x;
-  output_lines[line_offset + 1] = 0x;
+/* Line is hidden. */
+output_lines[line_offset] = 0x;
+output_lines[line_offset + 1] = 0x;
   }
   else {
-  output_lines[line_offset] = loop_index;
-  output_lines[line_offset + 1] = loop_index + 1;
+output_lines[line_offset] = loop_index;
+output_lines[line_offset + 1] = loop_index + 1;
   }
 
 #else
diff --git 
a/source/blender/draw/intern/shaders/common_subdiv_ibo_tris_comp.glsl 
b/source/blender/draw/intern/shaders/common_subdiv_ibo_tris_comp.glsl
index f1275b36c34..ce3c8478d3f 100644
--- a/source/blender/draw/intern/shaders/common_subdiv_ibo_tris_comp.glsl
+++ b/source/blender/draw/intern/shaders/common_subdiv_ibo_tris_comp.glsl
@@ -46,19 +46,19 @@ void main()
 #endif
 
   if (is_face_hidden(coarse_quad_index)) {
-  output_tris[triangle_loop_index + 0] = 0x;
-  output_tris[triangle_loop_index + 1] = 0x;
-  output_tris[triangle_loop_index + 2] = 0x;
-  output_tris[triangle_loop_index + 3] = 0x;
-  output_tris[triangle_loop_index + 4] = 0x;
-  output_tris[triangle_loop_index + 5] = 0x;
+output_tris[triangle_loop_index + 0] = 0x;
+output_tris[triangle_loop_index + 1] = 0x;
+output_tris[triangle_loop_index + 2] = 0x;
+output_tris[triangle_loop_index + 3] = 0x;
+output_tris[triangle_loop_index + 4] = 0x;
+output_tris[triangle_loop_index + 5] = 0x;
   }
   else {
-  output_tris[triangle_loop_index + 0] = loop_index + 0;
-  output_tris[triangle_loop_index + 1] = loop_index + 1;
-  output_tris[triangle_loop_index + 2] = loop_index + 2;
-  output_tris[triangle_loop_index + 3] = loop_index + 0;
-  output_tris[triangle_loop_index + 4] = loop_index + 2;
-  output_tris[triangle_loop_index + 5] = loop_index + 3;
-   }
+output_tris[triangle_loop_index + 0] = loop_index + 0;
+output_tris[triangle_loop_index + 1] = loop_index + 1;
+output_tris[triangle_loop_index + 2] = loop_index + 2;
+output_tris[triangle_loop_index + 3] = loop_index + 0;
+output_tris[triangle_loop_index + 4] = loop_index + 2;
+output_tris[triangle_loop_index + 5] = loop_index + 3;
+  }
 }

___
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] [65bd9974d1a] master: Cleanup: make format

2022-05-30 Thread Dalai Felinto

Commit: 65bd9974d1a6e3b66b9613a60e521a5211631304
Author: Dalai Felinto
Date:   Mon May 30 16:16:25 2022 +0200
Branches: master
https://developer.blender.org/rB65bd9974d1a6e3b66b9613a60e521a5211631304

Cleanup: make format

===

M   source/blender/blenkernel/BKE_curves.hh
M   source/blender/blenkernel/intern/curve_bezier.cc

===

diff --git a/source/blender/blenkernel/BKE_curves.hh 
b/source/blender/blenkernel/BKE_curves.hh
index 632fd5ebc49..cc056dab248 100644
--- a/source/blender/blenkernel/BKE_curves.hh
+++ b/source/blender/blenkernel/BKE_curves.hh
@@ -486,7 +486,8 @@ bool segment_is_vector(Span handle_types_left,
  * Return true if the curve's last cyclic segment has a vector type.
  * This only makes a difference in the shape of cyclic curves.
  */
-bool last_cyclic_segment_is_vector(Span handle_types_left, 
Span handle_types_right);
+bool last_cyclic_segment_is_vector(Span handle_types_left,
+   Span handle_types_right);
 
 /**
  * Return true if the handle types at the index are free (#BEZIER_HANDLE_FREE) 
or vector
diff --git a/source/blender/blenkernel/intern/curve_bezier.cc 
b/source/blender/blenkernel/intern/curve_bezier.cc
index 33888aa071c..5ba17f1761b 100644
--- a/source/blender/blenkernel/intern/curve_bezier.cc
+++ b/source/blender/blenkernel/intern/curve_bezier.cc
@@ -49,7 +49,8 @@ void calculate_evaluated_offsets(const Span 
handle_types_left,
   }
 
   if (cyclic) {
-offset += last_cyclic_segment_is_vector(handle_types_left, 
handle_types_right) ? 1 : resolution;
+offset += last_cyclic_segment_is_vector(handle_types_left, 
handle_types_right) ? 1 :
+   
  resolution;
   }
   else {
 offset++;

___
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] [afd81e26af9] blender-v3.2-release: Fix T98446: Spreadsheets filter not working on Name column

2022-05-30 Thread Dalai Felinto

Commit: afd81e26af9e8179578873a22fb07965b648f458
Author: Dalai Felinto
Date:   Mon May 30 16:11:52 2022 +0200
Branches: blender-v3.2-release
https://developer.blender.org/rBafd81e26af9e8179578873a22fb07965b648f458

Fix T98446: Spreadsheets filter not working on Name column

===

M   source/blender/editors/space_spreadsheet/spreadsheet_row_filter.cc

===

diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_row_filter.cc 
b/source/blender/editors/space_spreadsheet/spreadsheet_row_filter.cc
index eb8f111baa0..3ae4536b652 100644
--- a/source/blender/editors/space_spreadsheet/spreadsheet_row_filter.cc
+++ b/source/blender/editors/space_spreadsheet/spreadsheet_row_filter.cc
@@ -190,33 +190,29 @@ static void apply_row_filter(const SpreadsheetRowFilter 
_filter,
   }
   else if (column_data.type().is()) {
 const StringRef value = row_filter.value_string;
-switch (row_filter.operation) {
-  case SPREADSHEET_ROW_FILTER_EQUAL: {
-apply_filter_operation(
-column_data.typed(),
-[&](const InstanceReference cell) {
-  switch (cell.type()) {
-case InstanceReference::Type::Object: {
-  return value == (reinterpret_cast(cell.object()).name 
+ 2);
-}
-case InstanceReference::Type::Collection: {
-  return value == (reinterpret_cast(cell.collection()).name + 2);
-}
-case InstanceReference::Type::GeometrySet: {
-  return false;
-}
-case InstanceReference::Type::None: {
-  return false;
-}
-  }
-  BLI_assert_unreachable();
+
+apply_filter_operation(
+column_data.typed(),
+[&](const InstanceReference cell) {
+  switch (cell.type()) {
+case InstanceReference::Type::Object: {
+  return value == (reinterpret_cast(cell.object()).name + 2);
+}
+case InstanceReference::Type::Collection: {
+  return value == (reinterpret_cast(cell.collection()).name 
+ 2);
+}
+case InstanceReference::Type::GeometrySet: {
   return false;
-},
-prev_mask,
-new_indices);
-break;
-  }
-}
+}
+case InstanceReference::Type::None: {
+  return false;
+}
+  }
+  BLI_assert_unreachable();
+  return false;
+},
+prev_mask,
+new_indices);
   }
 }

___
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] [a9a4bcc3d14] blender-v3.2-release: Fix building: stub for OpenSubdiv

2022-05-30 Thread Dalai Felinto

Commit: a9a4bcc3d14af907dd8001735789717cb8721422
Author: Dalai Felinto
Date:   Mon May 30 16:10:22 2022 +0200
Branches: blender-v3.2-release
https://developer.blender.org/rBa9a4bcc3d14af907dd8001735789717cb8721422

Fix building: stub for OpenSubdiv

Building problem introduced on 24e74f8bef813820. It affects `make lite`
and other builds that skip OpenSubdiv.

===

M   intern/opensubdiv/stub/opensubdiv_evaluator_stub.cc

===

diff --git a/intern/opensubdiv/stub/opensubdiv_evaluator_stub.cc 
b/intern/opensubdiv/stub/opensubdiv_evaluator_stub.cc
index 78c1d23d2cc..bc39326b57d 100644
--- a/intern/opensubdiv/stub/opensubdiv_evaluator_stub.cc
+++ b/intern/opensubdiv/stub/opensubdiv_evaluator_stub.cc
@@ -23,8 +23,7 @@
 OpenSubdiv_Evaluator *openSubdiv_createEvaluatorFromTopologyRefiner(
 struct OpenSubdiv_TopologyRefiner * /*topology_refiner*/,
 eOpenSubdivEvaluator /*evaluator_type*/,
-OpenSubdiv_EvaluatorCache * /*evaluator_cache*/,
-const OpenSubdiv_EvaluatorSettings * /*settings*/)
+OpenSubdiv_EvaluatorCache * /*evaluator_cache*/)
 {
   return NULL;
 }

___
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 [62936] trunk/lib/resources/icon_geom.blend: Curves Sculpt pinch icon

2022-05-25 Thread Dalai Felinto

Revision: 62936
  https://developer.blender.org/rBL62936
Author:   dfelinto
Date: 2022-05-25 17:34:08 +0200 (Wed, 25 May 2022)
Log Message:
---
Curves Sculpt pinch icon

Modified Paths:
--
trunk/lib/resources/icon_geom.blend

Modified: trunk/lib/resources/icon_geom.blend
===
(Binary files 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] [496394daad0] master: UI: Curves Sculpt pinch icon

2022-05-25 Thread Dalai Felinto

Commit: 496394daad0b0ff3670ea276588e990d5d580521
Author: Dalai Felinto
Date:   Wed May 25 17:33:12 2022 +0200
Branches: master
https://developer.blender.org/rB496394daad0b0ff3670ea276588e990d5d580521

UI: Curves Sculpt pinch icon

===

A   release/datafiles/icons/ops.curves.sculpt_pinch.dat
M   source/blender/editors/datafiles/CMakeLists.txt

===

diff --git a/release/datafiles/icons/ops.curves.sculpt_pinch.dat 
b/release/datafiles/icons/ops.curves.sculpt_pinch.dat
new file mode 100644
index 000..49f40efc931
Binary files /dev/null and 
b/release/datafiles/icons/ops.curves.sculpt_pinch.dat differ
diff --git a/source/blender/editors/datafiles/CMakeLists.txt 
b/source/blender/editors/datafiles/CMakeLists.txt
index 9bedfb6ee58..59370b53995 100644
--- a/source/blender/editors/datafiles/CMakeLists.txt
+++ b/source/blender/editors/datafiles/CMakeLists.txt
@@ -777,6 +777,7 @@ set_property(GLOBAL PROPERTY ICON_GEOM_NAMES
   ops.curves.sculpt_cut
   ops.curves.sculpt_delete
   ops.curves.sculpt_grow_shrink
+  ops.curves.sculpt_pinch
   ops.curves.sculpt_puff
   ops.curves.sculpt_snake_hook
   ops.generic.cursor

___
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 [62935] trunk/lib/resources/icon_geom.blend: Update icons to use proper material color

2022-05-25 Thread Dalai Felinto

Revision: 62935
  https://developer.blender.org/rBL62935
Author:   dfelinto
Date: 2022-05-25 15:59:09 +0200 (Wed, 25 May 2022)
Log Message:
---
Update icons to use proper material color

More details on:
 * rB288e7d0af0c251b109736890ffab636f47943181
 * rBf381c31ac69cb8a6175a54dc31863e13e9b199d6

I changed all the materials colors to the value we were expecting them to be.
That means the material colors result in the same original value before the
color space fixes in the icon generator script.'

Modified Paths:
--
trunk/lib/resources/icon_geom.blend

Modified: trunk/lib/resources/icon_geom.blend
===
(Binary files 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] [288e7d0af0c] master: Tool Icons: Support curve and objects with modifiers + color space fix

2022-05-25 Thread Dalai Felinto

Commit: 288e7d0af0c251b109736890ffab636f47943181
Author: Dalai Felinto
Date:   Thu May 19 18:46:47 2022 +0200
Branches: master
https://developer.blender.org/rB288e7d0af0c251b109736890ffab636f47943181

Tool Icons: Support curve and objects with modifiers + color space fix

This allows for the new tool icons to use geometry nodes.

In order to do this I also had to use the new API for accessing the
attributes (instead of vertex colors). Which in turn requires a few
changes to use linear color space.

I went ahead and updated the entire code to use the linear space
everywhere. I will update the icon files manually to make sure the final
result is similar to what we have now.

Note: We now use round instead of int. That plus the changes regarding the
color space will lead to some icons to change slightly (no perceived
visual change).

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

===

M   release/datafiles/blender_icons_geom.py

===

diff --git a/release/datafiles/blender_icons_geom.py 
b/release/datafiles/blender_icons_geom.py
index 815bc6d49a4..b95baf3419e 100644
--- a/release/datafiles/blender_icons_geom.py
+++ b/release/datafiles/blender_icons_geom.py
@@ -45,6 +45,8 @@ import bpy
 
 # Generic functions
 
+OBJECTS_TYPES_MESH_COMPATIBLE = {'CURVE', 'MESH'}
+
 
 def area_tri_signed_2x_v2(v1, v2, v3):
 return (v1[0] - v2[0]) * (v2[1] - v3[1]) + (v1[1] - v2[1]) * (v3[0] - 
v2[0])
@@ -70,13 +72,14 @@ class TriMesh:
 @staticmethod
 def _tri_copy_from_object(ob):
 import bmesh
-assert(ob.type == 'MESH')
+assert(ob.type in OBJECTS_TYPES_MESH_COMPATIBLE)
 bm = bmesh.new()
-bm.from_mesh(ob.data)
+bm.from_mesh(ob.to_mesh())
 bmesh.ops.triangulate(bm, faces=bm.faces)
 me = bpy.data.meshes.new(ob.name + ".copy")
 bm.to_mesh(me)
 bm.free()
+ob.to_mesh_clear()
 return me
 
 
@@ -118,7 +121,7 @@ def object_child_map(objects):
 
 def mesh_data_lists_from_mesh(me, material_colors):
 me_loops = me.loops[:]
-me_loops_color = me.vertex_colors.active.data[:]
+me_loops_color = me.attributes.active_color.data[:]
 me_verts = me.vertices[:]
 me_polys = me.polygons[:]
 
@@ -164,16 +167,30 @@ def mesh_data_lists_from_mesh(me, material_colors):
 v1.co.xy[:],
 v2.co.xy[:],
 ),
-# RGBA color.
-tuple((
-[int(c * b * 255) for c, b in zip(cn.color, base_color)]
-for cn in (c0, c1, c2)
-)),
+# RGBA color in sRGB color space.
+(
+color_multiply_and_from_linear_to_srgb(base_color, c0),
+color_multiply_and_from_linear_to_srgb(base_color, c1),
+color_multiply_and_from_linear_to_srgb(base_color, c2),
+),
 ))
 i1 = i2
 return tris_data
 
 
+def color_multiply_and_from_linear_to_srgb(base_color, vertex_color):
+"""
+Return the RGBA color in sRGB and byte format (0-255).
+
+base_color and vertex_color are expected in linear space.
+The final color is the product between the base color and the vertex color.
+"""
+import mathutils
+color_linear = [c * b for c, b in zip(vertex_color.color, base_color)]
+color_srgb = mathutils.Color(color_linear[:3]).from_scene_linear_to_srgb()
+return tuple(round(c * 255) for c in (*color_srgb, color_linear[3]))
+
+
 def mesh_data_lists_from_objects(ob_parent, ob_children):
 tris_data = []
 
@@ -203,7 +220,7 @@ def write_mesh_to_py(fh, ob, ob_children):
 assert(axis_range <= 255)
 # -1..1 -> 0..255
 f = (f + 1.0) * 0.5
-f = int(round(f * axis_range))
+f = round(f * axis_range)
 return min(max(f, 0), axis_range)
 
 def vert_as_byte_pair(v):
@@ -300,6 +317,7 @@ def main():
 args = parser.parse_args(argv)
 
 objects = []
+depsgraph = bpy.context.view_layer.depsgraph
 
 if args.group:
 group = bpy.data.collections.get(args.group)
@@ -314,23 +332,25 @@ def main():
 for ob in objects_source:
 
 # Skip non-mesh objects
-if ob.type != 'MESH':
+if ob.type not in OBJECTS_TYPES_MESH_COMPATIBLE:
 continue
-name = ob.name
+
+ob_eval = ob.evaluated_get(depsgraph)
+name = ob_eval.name
 
 # Skip copies of objects
 if name.rpartition(".")[2].isdigit():
 continue
 
-if not ob.data.vertex_colors:
+if not ob_eval.data.attributes.active_color:
 print("Skipping:", name, "(no vertex colors)")
 continue
 
-objects.append((name, ob))
+objects.append((nam

[Bf-blender-cvs] [f381c31ac69] master: UI: Update icons after the latest changes in the generator script

2022-05-25 Thread Dalai Felinto

Commit: f381c31ac69cb8a6175a54dc31863e13e9b199d6
Author: Dalai Felinto
Date:   Wed May 25 15:52:54 2022 +0200
Branches: master
https://developer.blender.org/rBf381c31ac69cb8a6175a54dc31863e13e9b199d6

UI: Update icons after the latest changes in the generator script

There should be no visible change. The difference is mostly on how we
changed the rounding to handle the conversion from color space to the
new linear space of the attribute colors.

To convert the materials in icon_geom.blend I used:

```
import bpy
from mathutils import Color

def convert_material(material):
  if not material.use_nodes:
return

  if not material.node_tree:
return

  node_tree = material.node_tree
  for node in node_tree.nodes:
if node.type != 'RGB':
  continue

  color_original = node.outputs[0].default_value
  color_new = Color(color_original[:3]).from_srgb_to_scene_linear()
  color = (*color_new, color_original[3])
  node.outputs[0].default_value = color

def main():
  for material in bpy.data.materials:
convert_material(material)

main()
```

===

M   release/datafiles/icons/brush.gpencil_draw.erase.dat
M   release/datafiles/icons/brush.paint_texture.multiply.dat
M   release/datafiles/icons/brush.paint_vertex.replace.dat
M   release/datafiles/icons/brush.particle.comb.dat
M   release/datafiles/icons/brush.particle.cut.dat
M   release/datafiles/icons/brush.particle.puff.dat
M   release/datafiles/icons/brush.particle.smooth.dat
M   release/datafiles/icons/brush.sculpt.boundary.dat
M   release/datafiles/icons/brush.sculpt.cloth.dat
M   release/datafiles/icons/brush.sculpt.displacement_eraser.dat
M   release/datafiles/icons/brush.sculpt.displacement_smear.dat
M   release/datafiles/icons/brush.sculpt.draw_face_sets.dat
M   release/datafiles/icons/brush.sculpt.draw_sharp.dat
M   release/datafiles/icons/brush.sculpt.elastic_deform.dat
M   release/datafiles/icons/brush.sculpt.fill.dat
M   release/datafiles/icons/brush.sculpt.flatten.dat
M   release/datafiles/icons/brush.sculpt.grab.dat
M   release/datafiles/icons/brush.sculpt.layer.dat
M   release/datafiles/icons/brush.sculpt.multiplane_scrape.dat
M   release/datafiles/icons/brush.sculpt.nudge.dat
M   release/datafiles/icons/brush.sculpt.pinch.dat
M   release/datafiles/icons/brush.sculpt.pose.dat
M   release/datafiles/icons/brush.sculpt.rotate.dat
M   release/datafiles/icons/brush.sculpt.scrape.dat
M   release/datafiles/icons/brush.sculpt.smooth.dat
M   release/datafiles/icons/brush.sculpt.snake_hook.dat
M   release/datafiles/icons/brush.sculpt.thumb.dat
M   release/datafiles/icons/brush.sculpt.topology.dat
M   release/datafiles/icons/brush.uv_sculpt.relax.dat
M   release/datafiles/icons/ops.armature.bone.roll.dat
M   release/datafiles/icons/ops.curve.pen.dat
M   release/datafiles/icons/ops.curve.radius.dat
M   release/datafiles/icons/ops.curve.vertex_random.dat
M   release/datafiles/icons/ops.curves.sculpt_comb.dat
M   release/datafiles/icons/ops.curves.sculpt_cut.dat
M   release/datafiles/icons/ops.curves.sculpt_delete.dat
M   release/datafiles/icons/ops.curves.sculpt_puff.dat
M   release/datafiles/icons/ops.generic.select_box.dat
M   release/datafiles/icons/ops.generic.select_circle.dat
M   release/datafiles/icons/ops.generic.select_lasso.dat
M   release/datafiles/icons/ops.generic.select_paint.dat
M   release/datafiles/icons/ops.gpencil.draw.eraser.dat
M   release/datafiles/icons/ops.gpencil.edit_bend.dat
M   release/datafiles/icons/ops.gpencil.edit_shear.dat
M   release/datafiles/icons/ops.gpencil.edit_to_sphere.dat
M   release/datafiles/icons/ops.gpencil.radius.dat
M   release/datafiles/icons/ops.gpencil.stroke_cutter.dat
M   release/datafiles/icons/ops.gpencil.transform_fill.dat
M   release/datafiles/icons/ops.mesh.rip.dat
M   release/datafiles/icons/ops.mesh.rip_edge.dat
M   release/datafiles/icons/ops.mesh.vertices_smooth.dat
M   release/datafiles/icons/ops.node.links_cut.dat
M   release/datafiles/icons/ops.pose.push.dat
M   release/datafiles/icons/ops.pose.relax.dat
M   release/datafiles/icons/ops.sculpt.border_face_set.dat
M   release/datafiles/icons/ops.sculpt.box_trim.dat
M   release/datafiles/icons/ops.sculpt.cloth_filter.dat
M   release/datafiles/icons/ops.sculpt.face_set_edit.dat
M   release/datafiles/icons/ops.sculpt.lasso_face_set.dat
M   release/datafiles/icons/ops.sculpt.lasso_trim.dat
M   release/datafiles/icons/ops.transform.bone_envelope.dat
M   release/datafiles/icons/ops.transform.bone_size.dat
M   release/datafiles/icons/ops.transform.edge_slide.dat
M   release/datafiles/icons/ops.transform.push_pull.dat
M   release/datafiles/icons/ops.transform.resize.cage.dat
M   release/datafiles/icons

[Bf-blender-cvs] [332d87375d7] master: UI: Fix ops.sculpt.cloth_filter icon

2022-05-25 Thread Dalai Felinto

Commit: 332d87375d747995748121d7931c0a8e045fe936
Author: Dalai Felinto
Date:   Wed May 25 12:56:51 2022 +0200
Branches: master
https://developer.blender.org/rB332d87375d747995748121d7931c0a8e045fe936

UI: Fix ops.sculpt.cloth_filter icon

This icon was using a material with a slightly different shade of
purple. I removed all the duplicated materials in icons_geom.blend
and this was the only "functional" change (though it is not noticeable).

===

M   release/datafiles/icons/ops.sculpt.cloth_filter.dat

===

diff --git a/release/datafiles/icons/ops.sculpt.cloth_filter.dat 
b/release/datafiles/icons/ops.sculpt.cloth_filter.dat
index dc20c8f0bfd..c8289ee84e2 100644
Binary files a/release/datafiles/icons/ops.sculpt.cloth_filter.dat and 
b/release/datafiles/icons/ops.sculpt.cloth_filter.dat 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] SVN commit: bf-blender [62934] trunk/lib/resources/icon_geom.blend: Unifying materials used by the icons

2022-05-25 Thread Dalai Felinto

Revision: 62934
  https://developer.blender.org/rBL62934
Author:   dfelinto
Date: 2022-05-25 12:56:26 +0200 (Wed, 25 May 2022)
Log Message:
---
Unifying materials used by the icons

The only icon that change with this is the ops.sculpt.cloth_filter.

This icon for some reason was using a slightly different hue of purple. It
was not noticeable but it is now unified.

Basically I got rid of all the duplicated materials, and simplifed them.

Modified Paths:
--
trunk/lib/resources/icon_geom.blend

Modified: trunk/lib/resources/icon_geom.blend
===
(Binary files 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] [3e4f84d10d2] master: Merge remote-tracking branch 'origin/blender-v3.2-release'

2022-05-23 Thread Dalai Felinto

Commit: 3e4f84d10d248fd44ad7365f102ba1a44d655fe3
Author: Dalai Felinto
Date:   Mon May 23 15:57:33 2022 +0200
Branches: master
https://developer.blender.org/rB3e4f84d10d248fd44ad7365f102ba1a44d655fe3

Merge remote-tracking branch 'origin/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] SVN commit: bf-blender [62931] trunk/lib/resources/icon_geom.blend: Expose the paint select icon

2022-05-19 Thread Dalai Felinto

Revision: 62931
  https://developer.blender.org/rBL62931
Author:   dfelinto
Date: 2022-05-19 15:28:47 +0200 (Thu, 19 May 2022)
Log Message:
---
Expose the paint select icon

Modified Paths:
--
trunk/lib/resources/icon_geom.blend

Modified: trunk/lib/resources/icon_geom.blend
===
(Binary files 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] [d0fabb318ef] master: UI: Expose new tool icon: Selection Paint

2022-05-19 Thread Dalai Felinto

Commit: d0fabb318eff5b36b961acaf92fbe5273fdcc8d4
Author: Dalai Felinto
Date:   Thu May 19 15:25:35 2022 +0200
Branches: master
https://developer.blender.org/rBd0fabb318eff5b36b961acaf92fbe5273fdcc8d4

UI: Expose new tool icon: Selection Paint

This icon will be used by the curves paint select brush.

===

A   release/datafiles/icons/ops.generic.select_paint.dat
M   source/blender/editors/datafiles/CMakeLists.txt

===

diff --git a/release/datafiles/icons/ops.generic.select_paint.dat 
b/release/datafiles/icons/ops.generic.select_paint.dat
new file mode 100644
index 000..26d76d4548f
Binary files /dev/null and 
b/release/datafiles/icons/ops.generic.select_paint.dat differ
diff --git a/source/blender/editors/datafiles/CMakeLists.txt 
b/source/blender/editors/datafiles/CMakeLists.txt
index d8ecb2c5ae0..9bedfb6ee58 100644
--- a/source/blender/editors/datafiles/CMakeLists.txt
+++ b/source/blender/editors/datafiles/CMakeLists.txt
@@ -784,6 +784,7 @@ set_property(GLOBAL PROPERTY ICON_GEOM_NAMES
   ops.generic.select_box
   ops.generic.select_circle
   ops.generic.select_lasso
+  ops.generic.select_paint
   ops.gpencil.draw
   ops.gpencil.draw.eraser
   ops.gpencil.draw.line

___
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 [62924] trunk/lib/resources/icon_geom.blend: UI: Tweak Sculpting Trim icons

2022-05-12 Thread Dalai Felinto

Revision: 62924
  https://developer.blender.org/rBL62924
Author:   dfelinto
Date: 2022-05-12 18:56:02 +0200 (Thu, 12 May 2022)
Log Message:
---
UI: Tweak Sculpting Trim icons

Note the icon file has two new icons which are not used at the moment
(they are in the Unused collection):

* ops.generic.select_paint
* ops.generic.select_line

Modified Paths:
--
trunk/lib/resources/icon_geom.blend

Modified: trunk/lib/resources/icon_geom.blend
===
(Binary files 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] [17fc8db104f] master: UI: Tweak Sculpting Trim icons

2022-05-12 Thread Dalai Felinto

Commit: 17fc8db104f67a7283059deba613d5040845f055
Author: Dalai Felinto
Date:   Thu May 12 18:51:52 2022 +0200
Branches: master
https://developer.blender.org/rB17fc8db104f67a7283059deba613d5040845f055

UI: Tweak Sculpting Trim icons

Update the trim icons so they don't show a dashed line. Instead they
have now a continuous red line.

This is important because the sculpting tools are planning to use the
same icons for selection as the regular tools. And those icons use
dashed line to represent selection.

Note the icon file has two new icons which are not used at the moment
(they are in the Unused collection):

* ops.generic.select_paint
* ops.generic.select_line

===

M   release/datafiles/icons/ops.sculpt.box_trim.dat
M   release/datafiles/icons/ops.sculpt.lasso_trim.dat

===

diff --git a/release/datafiles/icons/ops.sculpt.box_trim.dat 
b/release/datafiles/icons/ops.sculpt.box_trim.dat
index 9a2e691a621..558c2b162ac 100644
Binary files a/release/datafiles/icons/ops.sculpt.box_trim.dat and 
b/release/datafiles/icons/ops.sculpt.box_trim.dat differ
diff --git a/release/datafiles/icons/ops.sculpt.lasso_trim.dat 
b/release/datafiles/icons/ops.sculpt.lasso_trim.dat
index e87cdb97fec..60c33fc9f2f 100644
Binary files a/release/datafiles/icons/ops.sculpt.lasso_trim.dat and 
b/release/datafiles/icons/ops.sculpt.lasso_trim.dat 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] [77d3e6b439a] master: Curves: Add notifier to update spreadsheet when sculpting

2022-05-12 Thread Dalai Felinto

Commit: 77d3e6b439a6d08aeaf93f385af9594735686f71
Author: Dalai Felinto
Date:   Thu May 12 11:47:02 2022 +0200
Branches: master
https://developer.blender.org/rB77d3e6b439a6d08aeaf93f385af9594735686f71

Curves: Add notifier to update spreadsheet when sculpting

===

M   source/blender/editors/sculpt_paint/curves_sculpt_add.cc
M   source/blender/editors/sculpt_paint/curves_sculpt_comb.cc
M   source/blender/editors/sculpt_paint/curves_sculpt_delete.cc
M   source/blender/editors/sculpt_paint/curves_sculpt_grow_shrink.cc
M   source/blender/editors/sculpt_paint/curves_sculpt_snake_hook.cc

===

diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_add.cc 
b/source/blender/editors/sculpt_paint/curves_sculpt_add.cc
index f214efb44be..5539fda750f 100644
--- a/source/blender/editors/sculpt_paint/curves_sculpt_add.cc
+++ b/source/blender/editors/sculpt_paint/curves_sculpt_add.cc
@@ -37,6 +37,8 @@
 #include "ED_screen.h"
 #include "ED_view3d.h"
 
+#include "WM_api.h"
+
 /**
  * The code below uses a prefix naming convention to indicate the coordinate 
space:
  * cu: Local space of the curves object that is being edited.
@@ -252,6 +254,7 @@ struct AddOperationExecutor {
 curves_->update_curve_types();
 
 DEG_id_tag_update(_id_->id, ID_RECALC_GEOMETRY);
+WM_main_add_notifier(NC_GEOM | ND_DATA, _id_->id);
 ED_region_tag_redraw(region_);
   }
 
diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_comb.cc 
b/source/blender/editors/sculpt_paint/curves_sculpt_comb.cc
index 28258a26f74..41199be8886 100644
--- a/source/blender/editors/sculpt_paint/curves_sculpt_comb.cc
+++ b/source/blender/editors/sculpt_paint/curves_sculpt_comb.cc
@@ -37,6 +37,8 @@
 
 #include "UI_interface.h"
 
+#include "WM_api.h"
+
 /**
  * The code below uses a prefix naming convention to indicate the coordinate 
space:
  * cu: Local space of the curves object that is being edited.
@@ -186,6 +188,7 @@ struct CombOperationExecutor {
 
 curves_->tag_positions_changed();
 DEG_id_tag_update(_id_->id, ID_RECALC_GEOMETRY);
+WM_main_add_notifier(NC_GEOM | ND_DATA, _id_->id);
 ED_region_tag_redraw(region_);
   }
 
diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_delete.cc 
b/source/blender/editors/sculpt_paint/curves_sculpt_delete.cc
index 3f3c48ecbb6..a4962fc6b5a 100644
--- a/source/blender/editors/sculpt_paint/curves_sculpt_delete.cc
+++ b/source/blender/editors/sculpt_paint/curves_sculpt_delete.cc
@@ -35,6 +35,8 @@
 #include "ED_screen.h"
 #include "ED_view3d.h"
 
+#include "WM_api.h"
+
 /**
  * The code below uses a suffix naming convention to indicate the coordinate 
space:
  * cu: Local space of the curves object that is being edited.
@@ -137,6 +139,7 @@ struct DeleteOperationExecutor {
 curves_->remove_curves(mask);
 
 DEG_id_tag_update(_id_->id, ID_RECALC_GEOMETRY);
+WM_main_add_notifier(NC_GEOM | ND_DATA, _id_->id);
 ED_region_tag_redraw(region_);
   }
 
diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_grow_shrink.cc 
b/source/blender/editors/sculpt_paint/curves_sculpt_grow_shrink.cc
index 4ac4559cbbc..e4963fd4ca4 100644
--- a/source/blender/editors/sculpt_paint/curves_sculpt_grow_shrink.cc
+++ b/source/blender/editors/sculpt_paint/curves_sculpt_grow_shrink.cc
@@ -36,6 +36,8 @@
 #include "ED_screen.h"
 #include "ED_view3d.h"
 
+#include "WM_api.h"
+
 #include "curves_sculpt_intern.hh"
 
 /**
@@ -356,6 +358,7 @@ struct CurvesEffectOperationExecutor {
 
 curves_->tag_positions_changed();
 DEG_id_tag_update(_id_->id, ID_RECALC_GEOMETRY);
+WM_main_add_notifier(NC_GEOM | ND_DATA, _id_->id);
 ED_region_tag_redraw(region_);
   }
 
diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_snake_hook.cc 
b/source/blender/editors/sculpt_paint/curves_sculpt_snake_hook.cc
index d2814c17682..973751e9045 100644
--- a/source/blender/editors/sculpt_paint/curves_sculpt_snake_hook.cc
+++ b/source/blender/editors/sculpt_paint/curves_sculpt_snake_hook.cc
@@ -37,6 +37,8 @@
 #include "ED_screen.h"
 #include "ED_view3d.h"
 
+#include "WM_api.h"
+
 /**
  * The code below uses a prefix naming convention to indicate the coordinate 
space:
  * - `cu`: Local space of the curves object that is being edited.
@@ -147,6 +149,7 @@ struct SnakeHookOperatorExecutor {
 
 curves_->tag_positions_changed();
 DEG_id_tag_update(_id_->id, ID_RECALC_GEOMETRY);
+WM_main_add_notifier(NC_GEOM | ND_DATA, _id_->id);
 ED_region_tag_redraw(region_);
   }

___
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] [28240f78cef] master: UI: Geometry Nodes Icon

2022-05-10 Thread Dalai Felinto

Commit: 28240f78cefd880e65c71a971570425fcbab9264
Author: Dalai Felinto
Date:   Tue May 10 19:21:26 2022 +0200
Branches: master
https://developer.blender.org/rB28240f78cefd880e65c71a971570425fcbab9264

UI: Geometry Nodes Icon

Geometry Nodes (new) icon. So far we were using the generic node-tree
icon for geometry nodes, not anymore.

The new icon is composed of 4 spheres that is a reference to the
original pebbles demo. Scattering points was also the turning point for
the project (which originally was focusing on dynamic effects), and to
this day is one of the first steps for everything procedural such as
hair.

Note that the modifier icon is still showing as white in the outliner.
The alternative is to be blue everywhere.

Patch review and feedback by Hans Goudey.

Icon creation in collaboration with Pablo Vazquez.

===

M   release/datafiles/blender_icons.svg
A   release/datafiles/blender_icons16/icon16_geometry_nodes.dat
A   release/datafiles/blender_icons32/icon32_geometry_nodes.dat
M   source/blender/editors/include/UI_icons.h
M   source/blender/editors/space_node/node_context_path.cc
M   source/blender/makesrna/intern/rna_modifier.c
M   source/blender/makesrna/intern/rna_nodetree.c
M   source/blender/makesrna/intern/rna_space.c
M   source/blender/modifiers/intern/MOD_nodes.cc
M   source/blender/nodes/geometry/node_geometry_tree.cc

===

diff --git a/release/datafiles/blender_icons.svg 
b/release/datafiles/blender_icons.svg
index 6f0216176d7..f8164d1f646 100644
--- a/release/datafiles/blender_icons.svg
+++ b/release/datafiles/blender_icons.svg
@@ -13657,6 +13657,38 @@
  d="m 475.00071,508.00091 c -3.8601,0 -7,-3.1399 -7,-7 0,-3.8601 
3.1399,-7 7,-7 3.8601,0 7,3.1399 7,7 0,3.8601 -3.1399,7 -7,7 z m 
2.96094,-1.99804 a 1.0001,1.0001 0 0 0 1.04102,-0.98633 1.0001,1.0001 0 0 0 
-0.20899,-0.62305 l -2.57617,-3.43555 1.60742,-2.41015 a 1.0001,1.0001 0 1 0 
-1.66406,-1.10938 l -1.91211,2.86914 a 1.0001,1.0001 0 0 0 -0.26367,0.68164 
1.0001,1.0001 0 0 0 0.004,0.0801 1.0001,1.0001 0 0 0 0.30664,0.66016 l 
2.89844,3.86328 a 1.0001,1.0001 0 0 0 0.76758,0.41016 z"
  
style="color:#00;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#00;letter-spacing:nor
 [...]
 
+
+  
+
+
+
+
+  
+
 https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [f5428736a76] master: Cleanup: Trailing white-space

2022-05-06 Thread Dalai Felinto

Commit: f5428736a76add4bce46da452aed6bd04ee8e71b
Author: Dalai Felinto
Date:   Fri May 6 12:32:11 2022 +0200
Branches: master
https://developer.blender.org/rBf5428736a76add4bce46da452aed6bd04ee8e71b

Cleanup: Trailing white-space

===

M   release/scripts/startup/bl_ui/space_view3d.py

===

diff --git a/release/scripts/startup/bl_ui/space_view3d.py 
b/release/scripts/startup/bl_ui/space_view3d.py
index b5bbf33b6bc..60a28fb1ebf 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -2057,7 +2057,7 @@ class VIEW3D_MT_curve_add(Menu):
 layout.operator("curve.primitive_nurbs_circle_add", text="Nurbs 
Circle", icon='CURVE_NCIRCLE')
 layout.operator("curve.primitive_nurbs_path_add", text="Path", 
icon='CURVE_PATH')
 
-experimental = context.preferences.experimental 
+experimental = context.preferences.experimental
 if experimental.use_new_curves_type:
 layout.separator()

___
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] [d02b8c1c3b8] master: UI: Expand the Snap Curves to Surface operator

2022-05-06 Thread Dalai Felinto

Commit: d02b8c1c3b8b5b3abe3728581126ffea7b4f4996
Author: Dalai Felinto
Date:   Fri May 6 12:15:31 2022 +0200
Branches: master
https://developer.blender.org/rBd02b8c1c3b8b5b3abe3728581126ffea7b4f4996

UI: Expand the Snap Curves to Surface operator

The different methods are too different. It is worth having them as
individual choices by the users.

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

===

M   release/scripts/startup/bl_ui/space_view3d.py

===

diff --git a/release/scripts/startup/bl_ui/space_view3d.py 
b/release/scripts/startup/bl_ui/space_view3d.py
index 660e7b2322b..b5bbf33b6bc 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -3149,7 +3149,9 @@ class VIEW3D_MT_sculpt_curves(Menu):
 def draw(self, _context):
 layout = self.layout
 
-layout.operator("curves.snap_curves_to_surface")
+layout.operator("curves.snap_curves_to_surface", text="Snap to 
Deformed Surface").attach_mode = 'DEFORM'
+layout.operator("curves.snap_curves_to_surface", text="Snap to Nearest 
Surface").attach_mode = 'NEAREST'
+layout.separator()
 layout.operator("curves.convert_to_particle_system", text="Convert to 
Particle System")

___
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 [62909] trunk/lib/resources/icon_geom.blend: Sculpt Curves: Puff brush

2022-05-03 Thread Dalai Felinto

Revision: 62909
  https://developer.blender.org/rBL62909
Author:   dfelinto
Date: 2022-05-03 17:49:38 +0200 (Tue, 03 May 2022)
Log Message:
---
Sculpt Curves: Puff brush

Modified Paths:
--
trunk/lib/resources/icon_geom.blend

Modified: trunk/lib/resources/icon_geom.blend
===
(Binary files 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] [04df0a3b8cb] master: Sculpt Curves Puff icon

2022-05-03 Thread Dalai Felinto

Commit: 04df0a3b8cb176d29ecc1fc37cb98cb823226520
Author: Dalai Felinto
Date:   Tue May 3 17:49:04 2022 +0200
Branches: master
https://developer.blender.org/rB04df0a3b8cb176d29ecc1fc37cb98cb823226520

Sculpt Curves Puff icon

===

A   release/datafiles/icons/ops.curves.sculpt_puff.dat
M   source/blender/editors/datafiles/CMakeLists.txt

===

diff --git a/release/datafiles/icons/ops.curves.sculpt_puff.dat 
b/release/datafiles/icons/ops.curves.sculpt_puff.dat
new file mode 100644
index 000..db2bab46bfe
Binary files /dev/null and b/release/datafiles/icons/ops.curves.sculpt_puff.dat 
differ
diff --git a/source/blender/editors/datafiles/CMakeLists.txt 
b/source/blender/editors/datafiles/CMakeLists.txt
index 9e7e00d5656..d8ecb2c5ae0 100644
--- a/source/blender/editors/datafiles/CMakeLists.txt
+++ b/source/blender/editors/datafiles/CMakeLists.txt
@@ -777,6 +777,7 @@ set_property(GLOBAL PROPERTY ICON_GEOM_NAMES
   ops.curves.sculpt_cut
   ops.curves.sculpt_delete
   ops.curves.sculpt_grow_shrink
+  ops.curves.sculpt_puff
   ops.curves.sculpt_snake_hook
   ops.generic.cursor
   ops.generic.select

___
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 [62888] trunk/lib/resources/icon_geom.blend: Fix vertex paint icon color

2022-04-22 Thread Dalai Felinto

Revision: 62888
  https://developer.blender.org/rBL62888
Author:   dfelinto
Date: 2022-04-22 15:55:22 +0200 (Fri, 22 Apr 2022)
Log Message:
---
Fix vertex paint icon color

Note: I had to manually fix the file since it was created
from an older version of the SVN file.

https://developer.blender.org/D14694

Original patch by Ramil Roosileht (Limarest)

Modified Paths:
--
trunk/lib/resources/icon_geom.blend

Modified: trunk/lib/resources/icon_geom.blend
===
(Binary files 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] [4fa3eadce99] master: Icons: Re-sync Blender with latest svn icon file

2022-04-14 Thread Dalai Felinto

Commit: 4fa3eadce99a87de90b8119e49cfd8ccba56c305
Author: Dalai Felinto
Date:   Thu Apr 14 09:57:15 2022 +0200
Branches: master
https://developer.blender.org/rB4fa3eadce99a87de90b8119e49cfd8ccba56c305

Icons: Re-sync Blender with latest svn icon file

There are no real difference from the previous icons, but since some
manual changes were introduced in the icons file, we still needed
a final sync between them.

===

M   release/datafiles/icons/brush.sculpt.displacement_smear.dat
M   release/datafiles/icons/brush.sculpt.draw_sharp.dat

===

diff --git a/release/datafiles/icons/brush.sculpt.displacement_smear.dat 
b/release/datafiles/icons/brush.sculpt.displacement_smear.dat
index 5d422130ea3..9e4df45b2d2 100644
Binary files a/release/datafiles/icons/brush.sculpt.displacement_smear.dat and 
b/release/datafiles/icons/brush.sculpt.displacement_smear.dat differ
diff --git a/release/datafiles/icons/brush.sculpt.draw_sharp.dat 
b/release/datafiles/icons/brush.sculpt.draw_sharp.dat
index 1877c0ae4d4..9bea1b02894 100644
Binary files a/release/datafiles/icons/brush.sculpt.draw_sharp.dat and 
b/release/datafiles/icons/brush.sculpt.draw_sharp.dat 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] [fb84408aa5a] master: Cleanup: Update icons_geom CMakeLists.txt

2022-04-13 Thread Dalai Felinto

Commit: fb84408aa5abd01dd803a5497fd5b55ef10c7aa2
Author: Dalai Felinto
Date:   Wed Apr 13 15:18:16 2022 +0200
Branches: master
https://developer.blender.org/rBfb84408aa5abd01dd803a5497fd5b55ef10c7aa2

Cleanup: Update icons_geom CMakeLists.txt

===

M   source/blender/editors/datafiles/CMakeLists.txt

===

diff --git a/source/blender/editors/datafiles/CMakeLists.txt 
b/source/blender/editors/datafiles/CMakeLists.txt
index fb6621c846d..9e7e00d5656 100644
--- a/source/blender/editors/datafiles/CMakeLists.txt
+++ b/source/blender/editors/datafiles/CMakeLists.txt
@@ -767,9 +767,9 @@ set_property(GLOBAL PROPERTY ICON_GEOM_NAMES
   ops.armature.extrude_cursor
   ops.armature.extrude_move
   ops.curve.draw
-  ops.curve.pen
   ops.curve.extrude_cursor
   ops.curve.extrude_move
+  ops.curve.pen
   ops.curve.radius
   ops.curve.vertex_random
   ops.curves.sculpt_add
@@ -848,8 +848,8 @@ set_property(GLOBAL PROPERTY ICON_GEOM_NAMES
   ops.sculpt.border_hide
   ops.sculpt.border_mask
   ops.sculpt.box_trim
-  ops.sculpt.color_filter
   ops.sculpt.cloth_filter
+  ops.sculpt.color_filter
   ops.sculpt.face_set_edit
   ops.sculpt.lasso_face_set
   ops.sculpt.lasso_mask

___
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] [babd027faef] master: Cleanup: make format

2022-04-13 Thread Dalai Felinto

Commit: babd027faef947ae0417f3d2e61ec8188c823ad2
Author: Dalai Felinto
Date:   Wed Apr 13 12:30:29 2022 +0200
Branches: master
https://developer.blender.org/rBbabd027faef947ae0417f3d2e61ec8188c823ad2

Cleanup: make format

===

M   source/blender/blenloader/intern/versioning_defaults.c

===

diff --git a/source/blender/blenloader/intern/versioning_defaults.c 
b/source/blender/blenloader/intern/versioning_defaults.c
index cec6d520af3..f65976ee55f 100644
--- a/source/blender/blenloader/intern/versioning_defaults.c
+++ b/source/blender/blenloader/intern/versioning_defaults.c
@@ -533,7 +533,8 @@ void BLO_update_defaults_startup_blend(Main *bmain, const 
char *app_template)
 /* Match default for new meshes. */
 mesh->smoothresh = DEG2RADF(30);
 /* Match voxel remesher options for all existing meshes in templates. */
-mesh->flag |= ME_REMESH_REPROJECT_VOLUME | ME_REMESH_REPROJECT_PAINT_MASK 
| ME_REMESH_REPROJECT_SCULPT_FACE_SETS | ME_REMESH_REPROJECT_VERTEX_COLORS;
+mesh->flag |= ME_REMESH_REPROJECT_VOLUME | ME_REMESH_REPROJECT_PAINT_MASK |
+  ME_REMESH_REPROJECT_SCULPT_FACE_SETS | 
ME_REMESH_REPROJECT_VERTEX_COLORS;
 
 /* For Sculpting template. */
 if (app_template && STREQ(app_template, "Sculpting")) {

___
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] [cf5d582b77f] master: Fix T97207: Move to Collections Menu Grayed out when in Local View

2022-04-13 Thread Dalai Felinto

Commit: cf5d582b77fbb7bf392a94248228846bfb774a15
Author: Dalai Felinto
Date:   Wed Apr 13 12:22:35 2022 +0200
Branches: master
https://developer.blender.org/rBcf5d582b77fbb7bf392a94248228846bfb774a15

Fix T97207: Move to Collections Menu Grayed out when in Local View

This behaviour was introduced in a687d98e6782 to bring the old obscure
"M" operator to remove objects from the local view. In order to avoid
the keymap clash with the Move to Collection operator, the Move to
Collection was artificially restricted to work in local view.

In retrospect, the "Remove from Local View" operator is in the menu anyways,
so it didn't even need to have a shortcut (back in 2.79 the operator was
not in a menu).

The changes introduced here are:
* No shortcut for "Remove from Local View"
* No more restrictions to "Move/Link to Collection" from local view.

Thanks for Philipp Oeser for digging the old commit that introduced this
and for the rationale on the changes.

===

M   release/scripts/presets/keyconfig/keymap_data/blender_default.py
M   source/blender/editors/object/object_edit.c

===

diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py 
b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
index a1913945364..be6ea28e72e 100644
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@ -1387,7 +1387,6 @@ def km_view3d(params):
 ("view3d.localview", {"type": 'NUMPAD_SLASH', "value": 'PRESS'}, None),
 ("view3d.localview", {"type": 'SLASH', "value": 'PRESS'}, None),
 ("view3d.localview", {"type": 'MOUSESMARTZOOM', "value": 'ANY'}, None),
-("view3d.localview_remove_from", {"type": 'M', "value": 'PRESS'}, 
None),
 # Navigation.
 ("view3d.rotate", {"type": 'MOUSEROTATE', "value": 'ANY'}, None),
 *((
diff --git a/source/blender/editors/object/object_edit.c 
b/source/blender/editors/object/object_edit.c
index cc8644285c0..2518b2d201d 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -1828,13 +1828,6 @@ static bool move_to_collection_poll(bContext *C)
   if (CTX_wm_space_outliner(C) != NULL) {
 return ED_outliner_collections_editor_poll(C);
   }
-
-  View3D *v3d = CTX_wm_view3d(C);
-
-  if (v3d && v3d->localvd) {
-return false;
-  }
-
   return ED_operator_objectmode(C);
 }

___
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] [bb6d0165b40] tracking_tools: Curves Sculpting Icons: Snake Hook and Grow updates

2022-04-12 Thread Dalai Felinto

Commit: bb6d0165b40ebaf06c3ba8820e645d0a4abe7bbf
Author: Dalai Felinto
Date:   Mon Apr 11 15:09:54 2022 +0200
Branches: tracking_tools
https://developer.blender.org/rBbb6d0165b40ebaf06c3ba8820e645d0a4abe7bbf

Curves Sculpting Icons: Snake Hook and Grow updates

This implements the icon for snake hook, as well as tweak the
growth brush to make it bigger and with the triangles more
distinct for better reading of the icon.

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

===

M   release/datafiles/icons/ops.curves.sculpt_grow_shrink.dat
A   release/datafiles/icons/ops.curves.sculpt_snake_hook.dat
M   source/blender/editors/datafiles/CMakeLists.txt

===

diff --git a/release/datafiles/icons/ops.curves.sculpt_grow_shrink.dat 
b/release/datafiles/icons/ops.curves.sculpt_grow_shrink.dat
index 9b3453085e4..13f19185030 100644
Binary files a/release/datafiles/icons/ops.curves.sculpt_grow_shrink.dat and 
b/release/datafiles/icons/ops.curves.sculpt_grow_shrink.dat differ
diff --git a/release/datafiles/icons/ops.curves.sculpt_grow_shrink.dat 
b/release/datafiles/icons/ops.curves.sculpt_snake_hook.dat
similarity index 53%
copy from release/datafiles/icons/ops.curves.sculpt_grow_shrink.dat
copy to release/datafiles/icons/ops.curves.sculpt_snake_hook.dat
index 9b3453085e4..15128701d0a 100644
Binary files a/release/datafiles/icons/ops.curves.sculpt_grow_shrink.dat and 
b/release/datafiles/icons/ops.curves.sculpt_snake_hook.dat differ
diff --git a/source/blender/editors/datafiles/CMakeLists.txt 
b/source/blender/editors/datafiles/CMakeLists.txt
index 8fca0c46c82..fb6621c846d 100644
--- a/source/blender/editors/datafiles/CMakeLists.txt
+++ b/source/blender/editors/datafiles/CMakeLists.txt
@@ -777,6 +777,7 @@ set_property(GLOBAL PROPERTY ICON_GEOM_NAMES
   ops.curves.sculpt_cut
   ops.curves.sculpt_delete
   ops.curves.sculpt_grow_shrink
+  ops.curves.sculpt_snake_hook
   ops.generic.cursor
   ops.generic.select
   ops.generic.select_box

___
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] [20846596b5a] master: Curves Sculpting Icons: Snake Hook and Grow updates

2022-04-11 Thread Dalai Felinto

Commit: 20846596b5a9c9f834ead780dd88bc9eb8c650e9
Author: Dalai Felinto
Date:   Mon Apr 11 15:09:54 2022 +0200
Branches: master
https://developer.blender.org/rB20846596b5a9c9f834ead780dd88bc9eb8c650e9

Curves Sculpting Icons: Snake Hook and Grow updates

This implements the icon for snake hook, as well as tweak the
growth brush to make it bigger and with the triangles more
distinct for better reading of the icon.

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

===

M   release/datafiles/icons/ops.curves.sculpt_grow_shrink.dat
A   release/datafiles/icons/ops.curves.sculpt_snake_hook.dat
M   source/blender/editors/datafiles/CMakeLists.txt

===

diff --git a/release/datafiles/icons/ops.curves.sculpt_grow_shrink.dat 
b/release/datafiles/icons/ops.curves.sculpt_grow_shrink.dat
index 9b3453085e4..13f19185030 100644
Binary files a/release/datafiles/icons/ops.curves.sculpt_grow_shrink.dat and 
b/release/datafiles/icons/ops.curves.sculpt_grow_shrink.dat differ
diff --git a/release/datafiles/icons/ops.curves.sculpt_grow_shrink.dat 
b/release/datafiles/icons/ops.curves.sculpt_snake_hook.dat
similarity index 53%
copy from release/datafiles/icons/ops.curves.sculpt_grow_shrink.dat
copy to release/datafiles/icons/ops.curves.sculpt_snake_hook.dat
index 9b3453085e4..15128701d0a 100644
Binary files a/release/datafiles/icons/ops.curves.sculpt_grow_shrink.dat and 
b/release/datafiles/icons/ops.curves.sculpt_snake_hook.dat differ
diff --git a/source/blender/editors/datafiles/CMakeLists.txt 
b/source/blender/editors/datafiles/CMakeLists.txt
index 8fca0c46c82..fb6621c846d 100644
--- a/source/blender/editors/datafiles/CMakeLists.txt
+++ b/source/blender/editors/datafiles/CMakeLists.txt
@@ -777,6 +777,7 @@ set_property(GLOBAL PROPERTY ICON_GEOM_NAMES
   ops.curves.sculpt_cut
   ops.curves.sculpt_delete
   ops.curves.sculpt_grow_shrink
+  ops.curves.sculpt_snake_hook
   ops.generic.cursor
   ops.generic.select
   ops.generic.select_box

___
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 [62875] trunk/lib/resources/icon_geom.blend: Curves Sculpting: Snake Hook + Tweaks to Grow

2022-04-11 Thread Dalai Felinto

Revision: 62875
  https://developer.blender.org/rBL62875
Author:   dfelinto
Date: 2022-04-11 15:04:33 +0200 (Mon, 11 Apr 2022)
Log Message:
---
Curves Sculpting: Snake Hook + Tweaks to Grow

Differential Review: https://developer.blender.org/D14616

Modified Paths:
--
trunk/lib/resources/icon_geom.blend

Modified: trunk/lib/resources/icon_geom.blend
===
(Binary files 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] [520e80d9ccb] temp-T96710-pbvh-pixels: Fix T97123: Applying modifier to multi-user: other objects were also converted

2022-04-08 Thread Dalai Felinto

Commit: 520e80d9ccb96bc9c22ca7ccbca946357ad6243b
Author: Dalai Felinto
Date:   Thu Apr 7 14:51:59 2022 +0200
Branches: temp-T96710-pbvh-pixels
https://developer.blender.org/rB520e80d9ccb96bc9c22ca7ccbca946357ad6243b

Fix T97123: Applying modifier to multi-user: other objects were also converted

The first element of the iterator was not being tested against the flag.
So in some cases it would lead to more objects been made into
single-user than the active (or selected) ones.

===

M   source/blender/blenkernel/intern/collection.c

===

diff --git a/source/blender/blenkernel/intern/collection.c 
b/source/blender/blenkernel/intern/collection.c
index c215321bc30..939f7c7b3ff 100644
--- a/source/blender/blenkernel/intern/collection.c
+++ b/source/blender/blenkernel/intern/collection.c
@@ -1929,6 +1929,26 @@ void BKE_scene_objects_iterator_begin(BLI_Iterator 
*iter, void *data_in)
   scene_objects_iterator_begin(iter, scene, NULL);
 }
 
+static void scene_objects_iterator_skip_invalid_flag(BLI_Iterator *iter)
+{
+  if (!iter->valid) {
+return;
+  }
+
+  /* Unpack the data. */
+  SceneObjectsIteratorExData *data = iter->data;
+  iter->data = data->iter_data;
+
+  Object *ob = iter->current;
+  if (ob && (ob->flag & data->flag) == 0) {
+iter->skip = true;
+  }
+
+  /* Pack the data. */
+  data->iter_data = iter->data;
+  iter->data = data;
+}
+
 void BKE_scene_objects_iterator_begin_ex(BLI_Iterator *iter, void *data_in)
 {
   SceneObjectsIteratorExData *data = data_in;
@@ -1938,6 +1958,8 @@ void BKE_scene_objects_iterator_begin_ex(BLI_Iterator 
*iter, void *data_in)
   /* Pack the data. */
   data->iter_data = iter->data;
   iter->data = data_in;
+
+  scene_objects_iterator_skip_invalid_flag(iter);
 }
 
 void BKE_scene_objects_iterator_next_ex(struct BLI_Iterator *iter)
@@ -1948,14 +1970,11 @@ void BKE_scene_objects_iterator_next_ex(struct 
BLI_Iterator *iter)
 
   BKE_scene_objects_iterator_next(iter);
 
-  Object *ob = iter->current;
-  if (ob && (ob->flag & data->flag) == 0) {
-iter->skip = true;
-  }
-
   /* Pack the data. */
   data->iter_data = iter->data;
   iter->data = data;
+
+  scene_objects_iterator_skip_invalid_flag(iter);
 }
 
 void BKE_scene_objects_iterator_end_ex(struct BLI_Iterator *iter)

___
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] [9db15f502c1] master: Fix T97123: Applying modifier to multi-user: other objects were also converted

2022-04-07 Thread Dalai Felinto

Commit: 9db15f502c105f96f0ec939dd2fc79f4567a4bf7
Author: Dalai Felinto
Date:   Thu Apr 7 14:51:59 2022 +0200
Branches: master
https://developer.blender.org/rB9db15f502c105f96f0ec939dd2fc79f4567a4bf7

Fix T97123: Applying modifier to multi-user: other objects were also converted

The first element of the iterator was not being tested against the flag.
So in some cases it would lead to more objects been made into
single-user than the active (or selected) ones.

===

M   source/blender/blenkernel/intern/collection.c

===

diff --git a/source/blender/blenkernel/intern/collection.c 
b/source/blender/blenkernel/intern/collection.c
index c215321bc30..939f7c7b3ff 100644
--- a/source/blender/blenkernel/intern/collection.c
+++ b/source/blender/blenkernel/intern/collection.c
@@ -1929,6 +1929,26 @@ void BKE_scene_objects_iterator_begin(BLI_Iterator 
*iter, void *data_in)
   scene_objects_iterator_begin(iter, scene, NULL);
 }
 
+static void scene_objects_iterator_skip_invalid_flag(BLI_Iterator *iter)
+{
+  if (!iter->valid) {
+return;
+  }
+
+  /* Unpack the data. */
+  SceneObjectsIteratorExData *data = iter->data;
+  iter->data = data->iter_data;
+
+  Object *ob = iter->current;
+  if (ob && (ob->flag & data->flag) == 0) {
+iter->skip = true;
+  }
+
+  /* Pack the data. */
+  data->iter_data = iter->data;
+  iter->data = data;
+}
+
 void BKE_scene_objects_iterator_begin_ex(BLI_Iterator *iter, void *data_in)
 {
   SceneObjectsIteratorExData *data = data_in;
@@ -1938,6 +1958,8 @@ void BKE_scene_objects_iterator_begin_ex(BLI_Iterator 
*iter, void *data_in)
   /* Pack the data. */
   data->iter_data = iter->data;
   iter->data = data_in;
+
+  scene_objects_iterator_skip_invalid_flag(iter);
 }
 
 void BKE_scene_objects_iterator_next_ex(struct BLI_Iterator *iter)
@@ -1948,14 +1970,11 @@ void BKE_scene_objects_iterator_next_ex(struct 
BLI_Iterator *iter)
 
   BKE_scene_objects_iterator_next(iter);
 
-  Object *ob = iter->current;
-  if (ob && (ob->flag & data->flag) == 0) {
-iter->skip = true;
-  }
-
   /* Pack the data. */
   data->iter_data = iter->data;
   iter->data = data;
+
+  scene_objects_iterator_skip_invalid_flag(iter);
 }
 
 void BKE_scene_objects_iterator_end_ex(struct BLI_Iterator *iter)

___
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 [62865] trunk/lib/resources/icon_geom.blend: Curves sculpt icons

2022-03-31 Thread Dalai Felinto

Revision: 62865
  https://developer.blender.org/rBL62865
Author:   dfelinto
Date: 2022-03-31 10:34:27 +0200 (Thu, 31 Mar 2022)
Log Message:
---
Curves sculpt icons

Modified Paths:
--
trunk/lib/resources/icon_geom.blend

Modified: trunk/lib/resources/icon_geom.blend
===
(Binary files 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] [9b25fafbec3] master: Cleanup: Left over from review of apply transform

2022-03-30 Thread Dalai Felinto

Commit: 9b25fafbec3f3d7324600b6ce0aacfbee7d0e21e
Author: Dalai Felinto
Date:   Wed Mar 30 12:23:39 2022 +0200
Branches: master
https://developer.blender.org/rB9b25fafbec3f3d7324600b6ce0aacfbee7d0e21e

Cleanup: Left over from review of apply transform

I miss the review notes about this for the
8621fdb10dc402eeff5aa996eeb992a513afd4c0 commit.

===

M   source/blender/editors/object/object_transform.cc

===

diff --git a/source/blender/editors/object/object_transform.cc 
b/source/blender/editors/object/object_transform.cc
index e279ebbb02e..36d70eeef64 100644
--- a/source/blender/editors/object/object_transform.cc
+++ b/source/blender/editors/object/object_transform.cc
@@ -621,7 +621,7 @@ static bool apply_objects_internal_can_multiuser(bContext 
*C)
 }
 
 /**
- * Check if the current selection need to be made into single user
+ * Check if the current selection need to be made into single user.
  *
  * It assumes that all selected objects share the same object data.
  */
@@ -648,10 +648,10 @@ static int apply_objects_internal(bContext *C,
   Depsgraph *depsgraph = CTX_data_ensure_evaluated_depsgraph(C);
   float rsmat[3][3], obmat[3][3], iobmat[3][3], mat[4][4], scale;
   bool changed = true;
-  bool do_multi_user = apply_objects_internal_can_multiuser(C);
+  bool const do_multi_user = apply_objects_internal_can_multiuser(C);
   float obact_invmat[4][4], obact_parent[4][4], obact_parentinv[4][4];
 
-  /* Only used when do_multi_user is set .*/
+  /* Only used when do_multi_user is set. */
   Object *obact = NULL;
   bool make_single_user = false;

___
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] [8621fdb10dc] master: Apply Object Transform: Multi-user data support

2022-03-30 Thread Dalai Felinto

Commit: 8621fdb10dc402eeff5aa996eeb992a513afd4c0
Author: Dalai Felinto
Date:   Wed Mar 30 11:07:29 2022 +0200
Branches: master
https://developer.blender.org/rB8621fdb10dc402eeff5aa996eeb992a513afd4c0

Apply Object Transform: Multi-user data support

The current behaviour is to prevent multi-user data from having its
transformation applied.

However in some particular cases it is possible to apply them:
* If all the users of the multi-user data are part of the selection.
* If not all the users are in the selection but the selection is made
single-user.

The active object is used as reference to set the transformation of the
other selected objects.

Note: For simplicity sake, this new behaviour is only available if all
the selection is using the same data.

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

===

M   release/scripts/startup/bl_ui/space_view3d.py
M   source/blender/editors/object/object_transform.cc

===

diff --git a/release/scripts/startup/bl_ui/space_view3d.py 
b/release/scripts/startup/bl_ui/space_view3d.py
index e78ea9d7fc1..0919faa8460 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -2640,6 +2640,8 @@ class VIEW3D_MT_object_apply(Menu):
 
 def draw(self, _context):
 layout = self.layout
+# Need invoke for the popup confirming the multi-user data operation
+layout.operator_context = 'INVOKE_DEFAULT'
 
 props = layout.operator("object.transform_apply", text="Location", 
text_ctxt=i18n_contexts.default)
 props.location, props.rotation, props.scale = True, False, False
diff --git a/source/blender/editors/object/object_transform.cc 
b/source/blender/editors/object/object_transform.cc
index da75703a0d9..e279ebbb02e 100644
--- a/source/blender/editors/object/object_transform.cc
+++ b/source/blender/editors/object/object_transform.cc
@@ -587,18 +587,99 @@ static Array 
sorted_selected_editable_objects(bContext *C)
   return sorted_objects;
 }
 
+/**
+ * Check if we need and can handle the special multiuser case.
+ */
+static bool apply_objects_internal_can_multiuser(bContext *C)
+{
+  Object *obact = CTX_data_active_object(C);
+
+  if (ELEM(NULL, obact, obact->data)) {
+return false;
+  }
+
+  if (ID_REAL_USERS(obact->data) == 1) {
+return false;
+  }
+
+  bool all_objects_same_data = true;
+  bool obact_selected = false;
+
+  CTX_DATA_BEGIN (C, Object *, ob, selected_editable_objects) {
+if (ob->data != obact->data) {
+  all_objects_same_data = false;
+  break;
+}
+
+if (ob == obact) {
+  obact_selected = true;
+}
+  }
+  CTX_DATA_END;
+
+  return all_objects_same_data && obact_selected;
+}
+
+/**
+ * Check if the current selection need to be made into single user
+ *
+ * It assumes that all selected objects share the same object data.
+ */
+static bool apply_objects_internal_need_single_user(bContext *C)
+{
+  Object *ob = CTX_data_active_object(C);
+  BLI_assert(apply_objects_internal_can_multiuser(C));
+
+  /* Counting the number of objects is valid since it's known the
+   * selection is only made up of users of the active objects data. */
+  return (ID_REAL_USERS(ob->data) > CTX_DATA_COUNT(C, 
selected_editable_objects));
+}
+
 static int apply_objects_internal(bContext *C,
   ReportList *reports,
   bool apply_loc,
   bool apply_rot,
   bool apply_scale,
-  bool do_props)
+  bool do_props,
+  bool do_single_user)
 {
   Main *bmain = CTX_data_main(C);
   Scene *scene = CTX_data_scene(C);
   Depsgraph *depsgraph = CTX_data_ensure_evaluated_depsgraph(C);
   float rsmat[3][3], obmat[3][3], iobmat[3][3], mat[4][4], scale;
   bool changed = true;
+  bool do_multi_user = apply_objects_internal_can_multiuser(C);
+  float obact_invmat[4][4], obact_parent[4][4], obact_parentinv[4][4];
+
+  /* Only used when do_multi_user is set .*/
+  Object *obact = NULL;
+  bool make_single_user = false;
+
+  if (do_multi_user) {
+obact = CTX_data_active_object(C);
+invert_m4_m4(obact_invmat, obact->obmat);
+
+Object workob;
+BKE_object_workob_calc_parent(depsgraph, scene, obact, );
+copy_m4_m4(obact_parent, workob.obmat);
+copy_m4_m4(obact_parentinv, obact->parentinv);
+
+if (apply_objects_internal_need_single_user(C)) {
+  if (do_single_user) {
+make_single_user = true;
+  }
+  else {
+ID *obact_data = static_cast(obact->data);
+BKE_reportf(reports,
+RPT_ERROR,
+"Cannot apply to a multi user: Object \"%s\

[Bf-blender-cvs] [35f34a3cf84] master: Modifiers: Support applying modifiers for multi-user data

2022-03-30 Thread Dalai Felinto

Commit: 35f34a3cf840852b70c1be5910be5517265d96cc
Author: Dalai Felinto
Date:   Wed Mar 30 11:06:10 2022 +0200
Branches: master
https://developer.blender.org/rB35f34a3cf840852b70c1be5910be5517265d96cc

Modifiers: Support applying modifiers for multi-user data

The current behaviour is to prevent multi-user data from having its
modifier applied.

Instead, with this patch, we now warn the user that if they want to
proceed the object will be made single-user.

Note that this only makes the object data single-user. Not the material
or actions.

As a future step we can apply the same behaviour for the Grease Pencil modifiers

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

===

M   source/blender/editors/include/ED_object.h
M   source/blender/editors/object/object_modifier.c
M   source/blender/editors/object/object_relations.c

===

diff --git a/source/blender/editors/include/ED_object.h 
b/source/blender/editors/include/ED_object.h
index abadbe5a5c6..54e434e0db5 100644
--- a/source/blender/editors/include/ED_object.h
+++ b/source/blender/editors/include/ED_object.h
@@ -381,6 +381,8 @@ struct Object *ED_object_add_type(struct bContext *C,
  */
 void ED_object_single_user(struct Main *bmain, struct Scene *scene, struct 
Object *ob);
 
+void ED_object_single_obdata_user(struct Main *bmain, struct Scene *scene, 
struct Object *ob);
+
 /* object motion paths */
 
 /**
diff --git a/source/blender/editors/object/object_modifier.c 
b/source/blender/editors/object/object_modifier.c
index 0e09fbb7ea4..545265b18b1 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -1363,7 +1363,7 @@ void OBJECT_OT_modifier_move_to_index(wmOperatorType *ot)
 /** \name Apply Modifier Operator
  * \{ */
 
-static bool modifier_apply_poll_ex(bContext *C, bool allow_shared)
+static bool modifier_apply_poll(bContext *C)
 {
   if (!edit_modifier_poll_generic(C, _Modifier, 0, false, false)) {
 return false;
@@ -1378,10 +1378,6 @@ static bool modifier_apply_poll_ex(bContext *C, bool 
allow_shared)
 CTX_wm_operator_poll_msg_set(C, "Modifiers cannot be applied on override 
data");
 return false;
   }
-  if (!allow_shared && (ob->data != NULL) && ID_REAL_USERS(ob->data) > 1) {
-CTX_wm_operator_poll_msg_set(C, "Modifiers cannot be applied to multi-user 
data");
-return false;
-  }
   if (md != NULL) {
 if ((ob->mode & OB_MODE_SCULPT) && (find_multires_modifier_before(scene, 
md)) &&
 (BKE_modifier_is_same_topology(md) == false)) {
@@ -1393,11 +1389,6 @@ static bool modifier_apply_poll_ex(bContext *C, bool 
allow_shared)
   return true;
 }
 
-static bool modifier_apply_poll(bContext *C)
-{
-  return modifier_apply_poll_ex(C, false);
-}
-
 static int modifier_apply_exec_ex(bContext *C, wmOperator *op, int apply_as, 
bool keep_modifier)
 {
   Main *bmain = CTX_data_main(C);
@@ -1406,11 +1397,19 @@ static int modifier_apply_exec_ex(bContext *C, 
wmOperator *op, int apply_as, boo
   Object *ob = ED_object_active_context(C);
   ModifierData *md = edit_modifier_property_get(op, ob, 0);
   const bool do_report = RNA_boolean_get(op->ptr, "report");
+  const bool do_single_user = RNA_boolean_get(op->ptr, "single_user");
 
   if (md == NULL) {
 return OPERATOR_CANCELLED;
   }
 
+  if (do_single_user && ID_REAL_USERS(ob->data) > 1) {
+ED_object_single_obdata_user(bmain, scene, ob);
+BKE_main_id_newptr_and_tag_clear(bmain);
+WM_event_add_notifier(C, NC_WINDOW, NULL);
+DEG_relations_tag_update(bmain);
+  }
+
   int reports_len;
   char name[MAX_NAME];
   if (do_report) {
@@ -1447,6 +1446,19 @@ static int modifier_apply_invoke(bContext *C, wmOperator 
*op, const wmEvent *eve
 {
   int retval;
   if (edit_modifier_invoke_properties_with_hover(C, op, event, )) {
+PointerRNA ptr = CTX_data_pointer_get_type(C, "modifier", _Modifier);
+Object *ob = (ptr.owner_id != NULL) ? (Object *)ptr.owner_id : 
ED_object_active_context(C);
+
+if ((ob->data != NULL) && ID_REAL_USERS(ob->data) > 1) {
+  PropertyRNA *prop = RNA_struct_find_property(op->ptr, "single_user");
+  if (!RNA_property_is_set(op->ptr, prop)) {
+RNA_property_boolean_set(op->ptr, prop, true);
+  }
+  if (RNA_property_boolean_get(op->ptr, prop)) {
+return WM_operator_confirm_message(
+C, op, "Make object data single-user and apply modifier");
+  }
+}
 return modifier_apply_exec(C, op);
   }
   return retval;
@@ -1467,6 +1479,13 @@ void OBJECT_OT_modifier_apply(wmOperatorType *ot)
 
   edit_modifier_properties(ot);
   edit_modifier_report_property(ot);
+
+  PropertyRNA *prop = RNA_def_boolean(ot-&

[Bf-blender-cvs] [218bcff32db] master: Iterator to loop over objects based on a flag

2022-03-30 Thread Dalai Felinto

Commit: 218bcff32db55874ccc35300ddd21baa585350dd
Author: Dalai Felinto
Date:   Wed Mar 30 11:06:01 2022 +0200
Branches: master
https://developer.blender.org/rB218bcff32db55874ccc35300ddd21baa585350dd

Iterator to loop over objects based on a flag

===

M   source/blender/blenkernel/BKE_collection.h
M   source/blender/blenkernel/BKE_layer.h
M   source/blender/blenkernel/intern/collection.c

===

diff --git a/source/blender/blenkernel/BKE_collection.h 
b/source/blender/blenkernel/BKE_collection.h
index 7f4360d2e9c..a3bbcc8687a 100644
--- a/source/blender/blenkernel/BKE_collection.h
+++ b/source/blender/blenkernel/BKE_collection.h
@@ -346,6 +346,20 @@ void BKE_scene_objects_iterator_begin(struct BLI_Iterator 
*iter, void *data_in);
 void BKE_scene_objects_iterator_next(struct BLI_Iterator *iter);
 void BKE_scene_objects_iterator_end(struct BLI_Iterator *iter);
 
+/** Iterate over objects in the scene based on a flag.
+ *
+ * \note The object->flag is tested against flag.
+ * */
+typedef struct SceneObjectsIteratorExData {
+  struct Scene *scene;
+  int flag;
+  void *iter_data;
+} SceneObjectsIteratorExData;
+
+void BKE_scene_objects_iterator_begin_ex(struct BLI_Iterator *iter, void 
*data_in);
+void BKE_scene_objects_iterator_next_ex(struct BLI_Iterator *iter);
+void BKE_scene_objects_iterator_end_ex(struct BLI_Iterator *iter);
+
 /**
  * Generate a new #GSet (or extend given `objects_gset` if not NULL) with all 
objects referenced by
  * all collections of given `scene`.
diff --git a/source/blender/blenkernel/BKE_layer.h 
b/source/blender/blenkernel/BKE_layer.h
index 77a3223c064..c877035830c 100644
--- a/source/blender/blenkernel/BKE_layer.h
+++ b/source/blender/blenkernel/BKE_layer.h
@@ -436,15 +436,26 @@ void 
BKE_view_layer_visible_bases_iterator_end(BLI_Iterator *iter);
 IteratorBeginCb func_begin; \
 IteratorCb func_next, func_end; \
 void *data_in; \
-struct ObjectsVisibleIteratorData data_ = {NULL}; \
-data_.view_layer = _view_layer; \
-data_.v3d = _v3d; \
+\
+struct ObjectsVisibleIteratorData data_select_ = {NULL}; \
+data_select_.view_layer = _view_layer; \
+data_select_.v3d = _v3d; \
+\
+struct SceneObjectsIteratorExData data_flag_ = {NULL}; \
+data_flag_.scene = scene; \
+data_flag_.flag = flag; \
 \
 if (flag == SELECT) { \
   func_begin = _view_layer_selected_objects_iterator_begin; \
   func_next = _view_layer_selected_objects_iterator_next; \
   func_end = _view_layer_selected_objects_iterator_end; \
-  data_in = _; \
+  data_in = _select_; \
+} \
+else if (flag != 0) { \
+  func_begin = BKE_scene_objects_iterator_begin_ex; \
+  func_next = BKE_scene_objects_iterator_next_ex; \
+  func_end = BKE_scene_objects_iterator_end_ex; \
+  data_in = _flag_; \
 } \
 else { \
   func_begin = BKE_scene_objects_iterator_begin; \
diff --git a/source/blender/blenkernel/intern/collection.c 
b/source/blender/blenkernel/intern/collection.c
index bdaea487cfb..c215321bc30 100644
--- a/source/blender/blenkernel/intern/collection.c
+++ b/source/blender/blenkernel/intern/collection.c
@@ -1929,6 +1929,48 @@ void BKE_scene_objects_iterator_begin(BLI_Iterator 
*iter, void *data_in)
   scene_objects_iterator_begin(iter, scene, NULL);
 }
 
+void BKE_scene_objects_iterator_begin_ex(BLI_Iterator *iter, void *data_in)
+{
+  SceneObjectsIteratorExData *data = data_in;
+
+  BKE_scene_objects_iterator_begin(iter, data->scene);
+
+  /* Pack the data. */
+  data->iter_data = iter->data;
+  iter->data = data_in;
+}
+
+void BKE_scene_objects_iterator_next_ex(struct BLI_Iterator *iter)
+{
+  /* Unpack the data. */
+  SceneObjectsIteratorExData *data = iter->data;
+  iter->data = data->iter_data;
+
+  BKE_scene_objects_iterator_next(iter);
+
+  Object *ob = iter->current;
+  if (ob && (ob->flag & data->flag) == 0) {
+iter->skip = true;
+  }
+
+  /* Pack the data. */
+  data->iter_data = iter->data;
+  iter->data = data;
+}
+
+void BKE_scene_objects_iterator_end_ex(struct BLI_Iterator *iter)
+{
+  /* Unpack the data. */
+  SceneObjectsIteratorExData *data = iter->data;
+  iter->data = data->iter_data;
+
+  BKE_scene_objects_iterator_end(iter);
+
+  /* Pack the data. */
+  data->iter_data = iter->data;
+  iter->data = data;
+}
+
 /**
  * Ensures we only get each object once, even when included in several 
collections.
  */

___
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] [643da14a4ef] master: Fix `make source_archive_complete` for release branches

2022-03-24 Thread Dalai Felinto

Commit: 643da14a4efd6a0eeb9ed21dd68643fdc7a6359e
Author: Dalai Felinto
Date:   Wed Mar 23 12:01:11 2022 +0100
Branches: master
https://developer.blender.org/rB643da14a4efd6a0eeb9ed21dd68643fdc7a6359e

Fix `make source_archive_complete` for release branches

In Blender 3.1 we can't run the source_archive_complete because the
cmake program is trying to download the packages from svn trunk. However
3.2 (aka master) already changed the version of some of the source
packages.

For example the OpenXR-SDK. It should be looking for
OpenXR-SDK-1.0.17.tar.gz in:
https://svn.blender.org/svnroot/bf-blender/tags/blender-3.1-release/lib/packages/

But instead it tries to look for it in:
https://svn.blender.org/svnroot/bf-blender/trunk/lib/packages/

Which can't be found since it was replaced with OpenXR-SDK-1.0.22.tar.gz

---

Release checklist: https://wiki.blender.org/wiki/Process/Release_Checklist

The release checklist was updated to include the new instructions:
`In the release branch, update and uncomment BLENDER_VERSION in download.cmake`

Differential Revision: http://developer.blender.org/D14292

===

M   build_files/build_environment/cmake/download.cmake

===

diff --git a/build_files/build_environment/cmake/download.cmake 
b/build_files/build_environment/cmake/download.cmake
index b92073636f5..5ca46c15d8d 100644
--- a/build_files/build_environment/cmake/download.cmake
+++ b/build_files/build_environment/cmake/download.cmake
@@ -1,11 +1,16 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
+## Update and uncomment this in the release branch
+# set(BLENDER_VERSION 3.1)
+
 function(download_source dep)
   set(TARGET_FILE ${${dep}_FILE})
   set(TARGET_HASH_TYPE ${${dep}_HASH_TYPE})
   set(TARGET_HASH ${${dep}_HASH})
   if(PACKAGE_USE_UPSTREAM_SOURCES)
 set(TARGET_URI  ${${dep}_URI})
+  elseif(BLENDER_VERSION)
+set(TARGET_URI  
https://svn.blender.org/svnroot/bf-blender/tags/blender-${BLENDER_VERSION}-release/lib/packages/${TARGET_FILE})
   else()
 set(TARGET_URI  
https://svn.blender.org/svnroot/bf-blender/trunk/lib/packages/${TARGET_FILE})
   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] [7a028330d2d] master: Cleanup: clang-format

2022-03-24 Thread Dalai Felinto

Commit: 7a028330d2d1061bfaaa5125e3372fbee2cff26e
Author: Dalai Felinto
Date:   Thu Mar 24 11:01:12 2022 +0100
Branches: master
https://developer.blender.org/rB7a028330d2d1061bfaaa5125e3372fbee2cff26e

Cleanup: clang-format

===

M   intern/cycles/hydra/curves.h
M   intern/cycles/hydra/mesh.h
M   intern/cycles/hydra/node_util.h
M   intern/cycles/hydra/pointcloud.h
M   intern/cycles/hydra/volume.h
M   intern/cycles/scene/integrator.cpp
M   source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc
M   source/blender/makesrna/intern/rna_scene.c
M   source/blender/nodes/shader/nodes/node_shader_tex_sky.cc

===

diff --git a/intern/cycles/hydra/curves.h b/intern/cycles/hydra/curves.h
index a1ac4a86715..1eb4a51c0db 100644
--- a/intern/cycles/hydra/curves.h
+++ b/intern/cycles/hydra/curves.h
@@ -13,10 +13,11 @@ HDCYCLES_NAMESPACE_OPEN_SCOPE
 
 class HdCyclesCurves final : public HdCyclesGeometry {
  public:
-  HdCyclesCurves(const PXR_NS::SdfPath 
+  HdCyclesCurves(
+  const PXR_NS::SdfPath 
 #if PXR_VERSION < 2102
- ,
- const PXR_NS::SdfPath  = {}
+  ,
+  const PXR_NS::SdfPath  = {}
 #endif
   );
   ~HdCyclesCurves() override;
diff --git a/intern/cycles/hydra/mesh.h b/intern/cycles/hydra/mesh.h
index e7aa2e4fa94..8ec108534a1 100644
--- a/intern/cycles/hydra/mesh.h
+++ b/intern/cycles/hydra/mesh.h
@@ -14,10 +14,11 @@ HDCYCLES_NAMESPACE_OPEN_SCOPE
 
 class HdCyclesMesh final : public HdCyclesGeometry {
  public:
-  HdCyclesMesh(const PXR_NS::SdfPath 
+  HdCyclesMesh(
+  const PXR_NS::SdfPath 
 #if PXR_VERSION < 2102
-   ,
-   const PXR_NS::SdfPath  = {}
+  ,
+  const PXR_NS::SdfPath  = {}
 #endif
   );
   ~HdCyclesMesh() override;
diff --git a/intern/cycles/hydra/node_util.h b/intern/cycles/hydra/node_util.h
index e91f554cc45..009a4a9eb38 100644
--- a/intern/cycles/hydra/node_util.h
+++ b/intern/cycles/hydra/node_util.h
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "hydra/config.h"
 #include "graph/node.h"
+#include "hydra/config.h"
 
 #include 
 
diff --git a/intern/cycles/hydra/pointcloud.h b/intern/cycles/hydra/pointcloud.h
index aa1768e807f..a014a389dcc 100644
--- a/intern/cycles/hydra/pointcloud.h
+++ b/intern/cycles/hydra/pointcloud.h
@@ -13,10 +13,11 @@ HDCYCLES_NAMESPACE_OPEN_SCOPE
 
 class HdCyclesPoints final : public HdCyclesGeometry {
  public:
-  HdCyclesPoints(const PXR_NS::SdfPath 
+  HdCyclesPoints(
+  const PXR_NS::SdfPath 
 #if PXR_VERSION < 2102
- ,
- const PXR_NS::SdfPath  = {}
+  ,
+  const PXR_NS::SdfPath  = {}
 #endif
   );
   ~HdCyclesPoints() override;
diff --git a/intern/cycles/hydra/volume.h b/intern/cycles/hydra/volume.h
index 775a7cf069e..7fb5fa779b5 100644
--- a/intern/cycles/hydra/volume.h
+++ b/intern/cycles/hydra/volume.h
@@ -13,10 +13,11 @@ HDCYCLES_NAMESPACE_OPEN_SCOPE
 
 class HdCyclesVolume final : public HdCyclesGeometry {
  public:
-  HdCyclesVolume(const PXR_NS::SdfPath 
+  HdCyclesVolume(
+  const PXR_NS::SdfPath 
 #if PXR_VERSION < 2102
- ,
- const PXR_NS::SdfPath  = {}
+  ,
+  const PXR_NS::SdfPath  = {}
 #endif
   );
   ~HdCyclesVolume() override;
diff --git a/intern/cycles/scene/integrator.cpp 
b/intern/cycles/scene/integrator.cpp
index 755fbb9542b..fd559178073 100644
--- a/intern/cycles/scene/integrator.cpp
+++ b/intern/cycles/scene/integrator.cpp
@@ -109,8 +109,10 @@ NODE_DEFINE(Integrator)
   SOCKET_INT(denoise_start_sample, "Start Sample to Denoise", 0);
   SOCKET_BOOLEAN(use_denoise_pass_albedo, "Use Albedo Pass for Denoiser", 
true);
   SOCKET_BOOLEAN(use_denoise_pass_normal, "Use Normal Pass for Denoiser", 
true);
-  SOCKET_ENUM(
-  denoiser_prefilter, "Denoiser Prefilter", denoiser_prefilter_enum, 
DENOISER_PREFILTER_ACCURATE);
+  SOCKET_ENUM(denoiser_prefilter,
+  "Denoiser Prefilter",
+  denoiser_prefilter_enum,
+  DENOISER_PREFILTER_ACCURATE);
 
   return type;
 }
diff --git a/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc 
b/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc
index a027718a4f3..aa63e65b1e8 100644
--- a/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc
+++ b/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc
@@ -382,8 +382,8 @@ void OBJMesh::store_normal_coords_and_indices()
   normal_to_index.reserve(export_mesh_eval_->totpoly);
   loop_to_normal_index_.resize(export_mesh_eval_->totloop);
   loop_to_normal_index_.fill(-1);
-  const float(*lnors)[3] = (const float(*)[3])(
-  CustomData_get_layer(_mesh_eval_->ldata, CD_NORMAL));
+  const float(
+  *lnors)[3] = (const 
float(*)[3])(CustomData_get_layer(_mesh_eval_->ldata, CD_NO

[Bf-blender-cvs] [3b745f3455c] master: Cleanup: make format + extra parenthesis

2022-03-22 Thread Dalai Felinto

Commit: 3b745f3455c30f73a26f6c67f52f6a148bf98ca7
Author: Dalai Felinto
Date:   Tue Mar 22 11:36:10 2022 +0100
Branches: master
https://developer.blender.org/rB3b745f3455c30f73a26f6c67f52f6a148bf98ca7

Cleanup: make format + extra parenthesis

Nested ? : get better formatted with some parenthesis around the expressions.

===

M   source/blender/draw/engines/gpencil/gpencil_cache_utils.c

===

diff --git a/source/blender/draw/engines/gpencil/gpencil_cache_utils.c 
b/source/blender/draw/engines/gpencil/gpencil_cache_utils.c
index 7bfbcfa9e21..be35660a4d7 100644
--- a/source/blender/draw/engines/gpencil/gpencil_cache_utils.c
+++ b/source/blender/draw/engines/gpencil/gpencil_cache_utils.c
@@ -269,8 +269,8 @@ GPENCIL_tLayer *gpencil_layer_cache_add(GPENCIL_PrivateData 
*pd,
 
   float vert_col_opacity = (override_vertcol) ?
(is_vert_col_mode ? pd->vertex_paint_opacity : 
0.0f) :
-   pd->is_render ? gpl->vertex_paint_opacity :
-   pd->vertex_paint_opacity;
+   (pd->is_render ? gpl->vertex_paint_opacity :
+pd->vertex_paint_opacity);
   /* Negate thickness sign to tag that strokes are in screen space.
* Convert to world units (by default, 1 meter = 2000 pixels). */
   float thickness_scale = (is_screenspace) ? -1.0f : (gpd->pixfactor / 
GPENCIL_PIXEL_FACTOR);

___
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] [dd483215e58] master: Hair: Sculpt Mode Icons

2022-03-17 Thread Dalai Felinto

Commit: dd483215e58f09a8da8de9f79c6da080cdeeb92c
Author: Dalai Felinto
Date:   Thu Mar 17 12:12:51 2022 +0100
Branches: master
https://developer.blender.org/rBdd483215e58f09a8da8de9f79c6da080cdeeb92c

Hair: Sculpt Mode Icons

From hair particle mode:
* Add
* Comb
* Cut
* Grow

New:
* Delete

Only comb and delete are used at the moment (by the new tools which are
under experimental).

===

A   release/datafiles/icons/ops.curves.sculpt_add.dat
A   release/datafiles/icons/ops.curves.sculpt_comb.dat
A   release/datafiles/icons/ops.curves.sculpt_cut.dat
A   release/datafiles/icons/ops.curves.sculpt_delete.dat
A   release/datafiles/icons/ops.curves.sculpt_grow.dat
M   source/blender/editors/datafiles/CMakeLists.txt

===

diff --git a/release/datafiles/icons/ops.curves.sculpt_add.dat 
b/release/datafiles/icons/ops.curves.sculpt_add.dat
new file mode 100644
index 000..b66f4da5b71
Binary files /dev/null and b/release/datafiles/icons/ops.curves.sculpt_add.dat 
differ
diff --git a/release/datafiles/icons/ops.curves.sculpt_comb.dat 
b/release/datafiles/icons/ops.curves.sculpt_comb.dat
new file mode 100644
index 000..d6dd75a35d7
Binary files /dev/null and b/release/datafiles/icons/ops.curves.sculpt_comb.dat 
differ
diff --git a/release/datafiles/icons/ops.curves.sculpt_cut.dat 
b/release/datafiles/icons/ops.curves.sculpt_cut.dat
new file mode 100644
index 000..e7ef86e2fbc
Binary files /dev/null and b/release/datafiles/icons/ops.curves.sculpt_cut.dat 
differ
diff --git a/release/datafiles/icons/ops.curves.sculpt_delete.dat 
b/release/datafiles/icons/ops.curves.sculpt_delete.dat
new file mode 100644
index 000..896d472e017
Binary files /dev/null and 
b/release/datafiles/icons/ops.curves.sculpt_delete.dat differ
diff --git a/release/datafiles/icons/ops.curves.sculpt_grow.dat 
b/release/datafiles/icons/ops.curves.sculpt_grow.dat
new file mode 100644
index 000..9b3453085e4
Binary files /dev/null and b/release/datafiles/icons/ops.curves.sculpt_grow.dat 
differ
diff --git a/source/blender/editors/datafiles/CMakeLists.txt 
b/source/blender/editors/datafiles/CMakeLists.txt
index 48f9c50ad4e..d58bbec01cd 100644
--- a/source/blender/editors/datafiles/CMakeLists.txt
+++ b/source/blender/editors/datafiles/CMakeLists.txt
@@ -770,6 +770,11 @@ set_property(GLOBAL PROPERTY ICON_GEOM_NAMES
   ops.curve.extrude_move
   ops.curve.radius
   ops.curve.vertex_random
+  ops.curves.sculpt_add
+  ops.curves.sculpt_comb
+  ops.curves.sculpt_cut
+  ops.curves.sculpt_delete
+  ops.curves.sculpt_grow
   ops.generic.cursor
   ops.generic.select
   ops.generic.select_box

___
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] [b217eb73f58] blender-v3.1-release: Licenses: Attribution document for Blender 3.1

2022-03-08 Thread Dalai Felinto

Commit: b217eb73f58dc2a159bd464140fb4900e0c363a9
Author: Dalai Felinto
Date:   Tue Mar 8 18:26:50 2022 +0100
Branches: blender-v3.1-release
https://developer.blender.org/rBb217eb73f58dc2a159bd464140fb4900e0c363a9

Licenses: Attribution document for Blender 3.1

===

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

===

diff --git a/release/license/THIRD-PARTY-LICENSES.txt 
b/release/license/THIRD-PARTY-LICENSES.txt
index 2bd4ac23d6d..933f03b5564 100644
--- a/release/license/THIRD-PARTY-LICENSES.txt
+++ b/release/license/THIRD-PARTY-LICENSES.txt
@@ -318,7 +318,7 @@ Copyright (c) 2006, Google Inc.
 All rights reserved.
 ** ISPC; version 1.16.0 -- https://github.com/ispc/ispc
 Copyright Intel Corporation
-** NumPy; version 1.21.2 -- https://numpy.org/
+** NumPy; version 1.22.0 -- https://numpy.org/
 Copyright (c) 2005-2021, NumPy Developers.
 ** Open Shading Language; version 1.11.14.1 --
 https://github.com/imageworks/OpenShadingLanguage
@@ -822,7 +822,7 @@ Yoyodyne, Inc., hereby disclaims all copyright interest in 
the program
 ** FFTW; version 3.3.8 -- http://www.fftw.org/
 Copyright (c) 2003, 2007-14 Matteo Frigo
 Copyright (c) 2003, 2007-14 Massachusetts Institute of Technology
-** GMP; version 6.2.0 -- https://gmplib.org/
+** GMP; version 6.2.1 -- https://gmplib.org/
 Copyright 1996-2020 Free Software Foundation, Inc.
 ** OpenAL; version 1.20.1 -- http://openal-soft.org
 Copyright (c) 2015, Archontis Politis
@@ -1162,7 +1162,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.10.2 --
+** The FreeType Project; version 2.11.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 --
@@ -1174,7 +1174,7 @@ Project initiators:
 Christoph Lampert 
 Michael Militzer 
 Peter Ross 
-** Zstandard; version 1.5.0 -- https://github.com/facebook/zstd
+** Zstandard; version 1.6.0 -- https://github.com/facebook/zstd
 Copyright (c) 2016-present, Facebook, Inc. All rights reserved.
 
 GNU GENERAL PUBLIC LICENSE
@@ -2956,6 +2956,8 @@ December 9, 2010
 
 --
 
+** Brotli; version 1.0.9 -- https://github.com/google/brotli
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
 ** Expat; version 2.2.10 -- https://github.com/libexpat/libexpat/
 Copyright (c) 1998-2000 Thai Open Source Software Center Ltd and Clark Cooper
 Copyright (c) 2001-2019 Expat maintainers
@@ -3627,7 +3629,7 @@ disclaims all warranties with regard to this software.
 
 --
 
-** Python; version 3.9.7 -- https://www.python.org
+** Python; version 3.10.2 -- https://www.python.org
 Copyright (c) 2001-2021 Python Software Foundation. All rights reserved.
 
 A. HISTORY OF THE SOFTWARE

___
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

1 2 3 4 5 6 7 8 9 10 >

1 - 100 of 3789 matches

Mail list logo