Commit: 348c240924a7c9f2010a7fdd52b7a7c0f2dcc4d0
Author: Antonio Vazquez
Date: Fri Jul 14 20:41:54 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rB348c240924a7c9f2010a7fdd52b7a7c0f2dcc4d0
Merge branch 'blender2.8' into greasepencil-object
===================================================================
===================================================================
diff --cc source/blender/draw/intern/draw_manager.c
index f1cd3f7b414,70e9d985e6c..41b5447a537
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@@ -2838,16 -2852,8 +2854,14 @@@ static void DRW_engines_enable(const Sc
if (DRW_state_draw_support()) {
DRW_engines_enable_from_object_mode();
- if ((obact == NULL) || (DRW_object_is_mode_shade(obact) !=
false)) {
- DRW_engines_enable_from_mode(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)
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
