[Bf-blender-cvs] [8aea0e8ac2f] geometry-nodes: Merge branch 'master' into geometry-nodes

[Hans Goudey]

Commit: 8aea0e8ac2fbc4486229a7cba5b8461ea6d8d7c1
Author: Hans Goudey
Date:   Sun Nov 22 15:01:42 2020 -0500
Branches: geometry-nodes
https://developer.blender.org/rB8aea0e8ac2fbc4486229a7cba5b8461ea6d8d7c1

Merge branch 'master' into geometry-nodes

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



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

diff --cc source/blender/editors/interface/interface_widgets.c
index 5c1eb4224a7,6d7e3ec1d8d..893ffd5c914
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@@ -3923,11 -3872,8 +3884,9 @@@ static void widget_unitvec
  static void widget_icon_has_anim(
      uiBut *but, uiWidgetColors *wcol, rcti *rect, int state, int roundboxalign)
  {
 -  if (state & (UI_BUT_ANIMATED | UI_BUT_ANIMATED_KEY | UI_BUT_DRIVEN | UI_BUT_REDALERT)) {
 +  if (state & (UI_BUT_ANIMATED | UI_BUT_ANIMATED_KEY | UI_BUT_DRIVEN | UI_BUT_REDALERT) &&
 +      but->emboss != UI_EMBOSS_NONE) {
      uiWidgetBase wtb;
-     float rad;
- 
      widget_init(&wtb);
      wtb.draw_outline = false;