[Bf-blender-cvs] [96d590565fd] temp-unified-collections: Merge branch 'blender2.8' into temp-unified-collections

[Brecht Van Lommel]

Commit: 96d590565fdd5b64e7b579c9c150cbb2c9152650
Author: Brecht Van Lommel
Date:   Mon May 14 22:05:03 2018 +0200
Branches: temp-unified-collections
https://developer.blender.org/rB96d590565fdd5b64e7b579c9c150cbb2c9152650

Merge branch 'blender2.8' into temp-unified-collections

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



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

diff --cc source/blender/editors/space_outliner/outliner_draw.c
index 9a5b4b43a28,5d981bdad0d..56d59312a6b
--- a/source/blender/editors/space_outliner/outliner_draw.c
+++ b/source/blender/editors/space_outliner/outliner_draw.c
@@@ -1147,14 -1128,10 +1148,16 @@@ static void tselem_draw_icon(uiBlock *b
  					tselem_draw_icon_uibut(&arg, ICON_OUTLINER_OB_SURFACE); break;
  				case OB_SPEAKER:
  					tselem_draw_icon_uibut(&arg, ICON_OUTLINER_OB_SPEAKER); break;
+ 				case OB_LIGHTPROBE:
+ 					tselem_draw_icon_uibut(&arg, ICON_OUTLINER_OB_LIGHTPROBE); break;
  				case OB_EMPTY:
 -					tselem_draw_icon_uibut(&arg, ICON_OUTLINER_OB_EMPTY); break;
 +					if (ob->dup_group) {
 +						tselem_draw_icon_uibut(&arg, ICON_OUTLINER_OB_GROUP_INSTANCE);
 +					}
 +					else {
 +						tselem_draw_icon_uibut(&arg, ICON_OUTLINER_OB_EMPTY);
 +					}
 +					break;
  			}
  		}
  		else {