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

[Antonio Vazquez]

Commit: b9c2800249b73c5e78e04155a6130461c4759c9f
Author: Antonio Vazquez
Date:   Thu Jul 13 11:34:52 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rBb9c2800249b73c5e78e04155a6130461c4759c9f

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/draw/intern/draw_manager.c
index 75916869706,b93b7e21df2..74aa7e85af0
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@@ -2818,14 -2836,10 +2838,16 @@@ static void DRW_engines_enable(const Sc
  
  	if (DRW_state_draw_support()) {
  		DRW_engines_enable_from_object_mode();
- 		DRW_engines_enable_from_mode(mode);
+ 		if ((obact == NULL) || (DRW_object_is_mode_shade(obact) != false)) {
+ 			DRW_engines_enable_from_mode(mode);
+ 		}
  	}
 +	else {
 +		/* if gpencil must draw the strokes, but not the object */
 +		if (mode == CTX_MODE_OBJECT) {
 +			DRW_engines_enable_from_mode(mode);
 +		}
 +	}
  }
  
  static void DRW_engines_disable(void)