[Bf-blender-cvs] [55ca1d7c0ed] greasepencil-object: GPencil: Display color names only in Edit mode

[Antonioya]

Commit: 55ca1d7c0ed917900e17516d384b8662d06bb155
Author: Antonioya
Date:   Sun Mar 10 17:14:01 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rB55ca1d7c0ed917900e17516d384b8662d06bb155

GPencil: Display color names only in Edit mode

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

M       source/blender/draw/modes/object_mode.c

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

diff --git a/source/blender/draw/modes/object_mode.c 
b/source/blender/draw/modes/object_mode.c
index 07ec8f0a11a..b1c7c9e9fb3 100644
--- a/source/blender/draw/modes/object_mode.c
+++ b/source/blender/draw/modes/object_mode.c
@@ -2876,6 +2876,10 @@ static void OBJECT_cache_populate_particles(
 
 static void OBJECT_gpencil_color_names(Object *ob, struct DRWTextStore *dt, 
uchar color[4])
 {
+       if (ob->mode != OB_MODE_EDIT_GPENCIL) {
+               return;
+       }
+
        bGPdata *gpd = (bGPdata *)ob->data;
        if (gpd == NULL) {
                return;

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs