[Bf-blender-cvs] [861f0370c89] greasepencil-object: Fix only_render for GP object
Antonio Vazquez
noreply at git.blender.org
Fri Jun 9 11:33:23 CEST 2017
Commit: 861f0370c89e007097a042cdeb89648354e131b5
Author: Antonio Vazquez
Date: Thu Jun 8 16:38:22 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rB861f0370c89e007097a042cdeb89648354e131b5
Fix only_render for GP object
For GP objects, the strokes must be drawn in all cases. When only render is enabled, only the pivot point is hidden, but not the strokes.
===================================================================
M source/blender/draw/intern/draw_manager.c
===================================================================
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index 5a267117dcd..97e2498c458 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -2635,6 +2635,13 @@ static void DRW_engines_enable(const Scene *scene, SceneLayer *sl, const View3D
DRW_engines_enable_from_object_mode();
DRW_engines_enable_from_mode(mode);
}
+ else {
+ /* if gpencil must draw the strokes, but not the object */
+ Object *ob = OBACT_NEW;
+ if ((ob) && (ob->type == OB_GPENCIL)) {
+ DRW_engines_enable_from_mode(mode);
+ }
+ }
}
static void DRW_engines_disable(void)
More information about the Bf-blender-cvs
mailing list