[Bf-blender-cvs] [41f06ff9b29] greasepencil-object: Fix error checking edit mode button in VFX

[Antonio Vazquez]

Commit: 41f06ff9b29338eb95e524e35c8b9dc2e9cfec90
Author: Antonio Vazquez
Date:   Thu Aug 17 19:35:55 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rB41f06ff9b29338eb95e524e35c8b9dc2e9cfec90

Fix error checking edit mode button in VFX

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

M	source/blender/draw/engines/gpencil/gpencil_vfx.c

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

diff --git a/source/blender/draw/engines/gpencil/gpencil_vfx.c b/source/blender/draw/engines/gpencil/gpencil_vfx.c
index f0a5dab1186..e8dc8cc7870 100644
--- a/source/blender/draw/engines/gpencil/gpencil_vfx.c
+++ b/source/blender/draw/engines/gpencil/gpencil_vfx.c
@@ -48,9 +48,11 @@ static ModifierData *modifier_available(Object *ob, ModifierType type)
 	}
 
 	bool is_edit = (bool)((gpd->flag & (GP_DATA_STROKE_EDITMODE | GP_DATA_STROKE_SCULPTMODE | GP_DATA_STROKE_WEIGHTMODE)));
+	if (((md->mode & eModifierMode_Editmode) == 0) && (is_edit)) {
+		return NULL;
+	}
 	if (((md->mode & eModifierMode_Realtime) && ((G.f & G_RENDER_OGL) == 0)) ||
-		((md->mode & eModifierMode_Render) && (G.f & G_RENDER_OGL)) ||
-		((md->mode & eModifierMode_Editmode) && (is_edit)))
+		((md->mode & eModifierMode_Render) && (G.f & G_RENDER_OGL)))
 	{
 		return md;
 	}
@@ -71,9 +73,12 @@ static bool modifier_is_active(Object *ob, ModifierData *md)
 	}
 
 	bool is_edit = (bool)((gpd->flag & (GP_DATA_STROKE_EDITMODE | GP_DATA_STROKE_SCULPTMODE | GP_DATA_STROKE_WEIGHTMODE)));
+	if (((md->mode & eModifierMode_Editmode) == 0) && (is_edit)) {
+		return false;
+	}
+
 	if (((md->mode & eModifierMode_Realtime) && ((G.f & G_RENDER_OGL) == 0)) ||
-		((md->mode & eModifierMode_Render) && (G.f & G_RENDER_OGL)) ||
-		((md->mode & eModifierMode_Editmode) && (is_edit)))
+		((md->mode & eModifierMode_Render) && (G.f & G_RENDER_OGL)))
 	{
 		return true;
 	}