[Bf-blender-cvs] [6b1b3383c69] master: Merge branch 'blender-v3.0-release'

[Julian Eisel]

Commit: 6b1b3383c69b2bf71daf96027294bc13d8d64fef
Author: Julian Eisel
Date:   Wed Nov 24 21:10:24 2021 +0100
Branches: master
https://developer.blender.org/rB6b1b3383c69b2bf71daf96027294bc13d8d64fef

Merge branch 'blender-v3.0-release'

===================================================================



===================================================================

diff --cc source/blender/editors/interface/interface_widgets.c
index 784f87d36c1,8faafd92b6e..911f1bfc90d
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@@ -3671,13 -3716,23 +3715,15 @@@ static void widget_treerow
  {
    uiButTreeRow *tree_row = (uiButTreeRow *)but;
    BLI_assert(but->type == UI_BTYPE_TREEROW);
-   widget_treerow_exec(wcol, rect, state, roundboxalign, tree_row->indentation);
+   widget_treerow_exec(wcol, rect, state, roundboxalign, tree_row->indentation, zoom);
  }
  
- 
 -static void widget_datasetrow(
 -    uiBut *but, uiWidgetColors *wcol, rcti *rect, int state, int roundboxalign, const float zoom)
 -{
 -  uiButDatasetRow *dataset_row = (uiButDatasetRow *)but;
 -  BLI_assert(but->type == UI_BTYPE_DATASETROW);
 -  widget_treerow_exec(wcol, rect, state, roundboxalign, dataset_row->indentation, zoom);
 -}
--
- static void widget_nodesocket(
-     uiBut *but, uiWidgetColors *wcol, rcti *rect, int UNUSED(state), int UNUSED(roundboxalign))
+ static void widget_nodesocket(uiBut *but,
+                               uiWidgetColors *wcol,
+                               rcti *rect,
+                               int UNUSED(state),
+                               int UNUSED(roundboxalign),
+                               const float UNUSED(zoom))
  {
    const int radi = 0.25f * BLI_rcti_size_y(rect);