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

[Antonio Vazquez]

Commit: ecd4984278be41c3194395d4b673d5212dfb596d
Author: Antonio Vazquez
Date:   Sun May 21 16:32:28 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rBecd4984278be41c3194395d4b673d5212dfb596d

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/draw/modes/object_mode.c
index d594635d5ea,89e085423d4..d2710b607ca
--- a/source/blender/draw/modes/object_mode.c
+++ b/source/blender/draw/modes/object_mode.c
@@@ -1366,11 -1506,8 +1521,11 @@@ static void OBJECT_cache_populate(void 
  			DRW_shgroup_camera(stl, ob, sl);
  			break;
  		case OB_EMPTY:
- 			DRW_shgroup_empty(stl, ob, sl);
+ 			DRW_shgroup_empty(stl, psl, ob, sl);
  			break;
 +		case OB_GPENCIL:
 +			DRW_shgroup_gpencil(stl, ob, sl);
 +			break;
  		case OB_SPEAKER:
  			DRW_shgroup_speaker(stl, ob, sl);
  			break;