[Bf-blender-cvs] [0c93bc2b63] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: 0c93bc2b637a6a3fe01b174dad2fb61895d004d2
Author: Campbell Barton
Date:   Sat Mar 25 13:39:47 2017 +1100
Branches: blender2.8
https://developer.blender.org/rB0c93bc2b637a6a3fe01b174dad2fb61895d004d2

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/editors/space_outliner/outliner_draw.c
index ee943db953,121fe81201..5d1323bbdd
--- a/source/blender/editors/space_outliner/outliner_draw.c
+++ b/source/blender/editors/space_outliner/outliner_draw.c
@@@ -846,11 -1052,9 +846,11 @@@ static void tselem_draw_icon(uiBlock *b
  	aspect = (0.8f * UI_UNIT_Y) / ICON_DEFAULT_HEIGHT;
  	x += 2.0f * aspect;
  	y += 2.0f * aspect;
- 	arg.x = x = x;
- 	arg.y = y = y;
+ 	arg.x = x;
+ 	arg.y = y;
  
 +#define ICON_DRAW(_icon) UI_icon_draw_alpha(x, y, _icon, alpha)
 +
  	if (tselem->type) {
  		switch (tselem->type) {
  			case TSE_ANIM_DATA: