[Bf-blender-cvs] [7e93fcca803] greasepencil-object: Merge branch 'blender2.8' into greasepencil-object

[Antonio Vazquez]

Commit: 7e93fcca8037f8933b8207612ad2804b6f784fa8
Author: Antonio Vazquez
Date:   Mon Aug 28 12:06:10 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rB7e93fcca8037f8933b8207612ad2804b6f784fa8

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/editors/space_outliner/outliner_draw.c
index bf26d4a800d,de820114159..c3d78eb05a9
--- a/source/blender/editors/space_outliner/outliner_draw.c
+++ b/source/blender/editors/space_outliner/outliner_draw.c
@@@ -1191,7 -1192,9 +1194,9 @@@ static void tselem_draw_icon(uiBlock *b
  				case ID_LS:
  					tselem_draw_icon_uibut(&arg, ICON_LINE_DATA); break;
  				case ID_GD:
 -					tselem_draw_icon_uibut(&arg, ICON_GREASEPENCIL); break;
 +					tselem_draw_icon_uibut(&arg, ICON_OUTLINER_DATA_GPENCIL); break;
+ 				default:
+ 					break;
  			}
  		}
  	}