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

Antonio Vazquez noreply at git.blender.org
Wed Nov 29 16:49:47 CET 2017


Commit: c89d24ccbddeb013957b7536a9e6a5e75fb3f2e0
Author: Antonio Vazquez
Date:   Wed Nov 29 16:49:39 2017 +0100
Branches: greasepencil-object
https://developer.blender.org/rBc89d24ccbddeb013957b7536a9e6a5e75fb3f2e0

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/draw/intern/draw_manager.c
index c9f3413f77b,57dd2e9cf5d..c902634ac9d
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@@ -3069,21 -3087,15 +3089,21 @@@ static void drw_engines_enable(const Sc
  	Object *obact = OBACT(view_layer);
  	const int mode = CTX_data_mode_enum_ex(scene->obedit, obact);
  
- 	DRW_engines_enable_from_engine(engine_type);
+ 	drw_engines_enable_from_engine(engine_type);
  
  	if (DRW_state_draw_support()) {
- 		DRW_engines_enable_from_object_mode();
- 		DRW_engines_enable_from_mode(mode);
+ 		drw_engines_enable_from_object_mode();
+ 		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)
+ static void drw_engines_disable(void)
  {
  	BLI_freelistN(&DST.enabled_engines);
  }



More information about the Bf-blender-cvs mailing list