[Bf-blender-cvs] [4adb6cac662] greasepencil-object: Fix bad range checks

[Campbell Barton]

Commit: 4adb6cac662941d92f3a6372cdced71d7ac83cbc
Author: Campbell Barton
Date:   Mon Sep 18 19:10:14 2017 +1000
Branches: greasepencil-object
https://developer.blender.org/rB4adb6cac662941d92f3a6372cdced71d7ac83cbc

Fix bad range checks

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

M	source/blender/editors/gpencil/gpencil_edit.c

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

diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c
index 58c5183ef61..b0acc174696 100644
--- a/source/blender/editors/gpencil/gpencil_edit.c
+++ b/source/blender/editors/gpencil/gpencil_edit.c
@@ -97,13 +97,13 @@ static void gpencil_verify_brush_type(bContext *C, int newmode)
 	{
 	case OB_MODE_GPENCIL_SCULPT:
 		gset->flag &= ~GP_BRUSHEDIT_FLAG_WEIGHT_MODE;
-		if ((gset->brushtype < 0) && (gset->brushtype >= GP_EDITBRUSH_TYPE_WEIGHT)) {
+		if ((gset->brushtype < 0) || (gset->brushtype >= GP_EDITBRUSH_TYPE_WEIGHT)) {
 			gset->brushtype = 0;
 		}
 		break;
 	case OB_MODE_GPENCIL_WEIGHT:
 		gset->flag |= GP_BRUSHEDIT_FLAG_WEIGHT_MODE;
-		if ((gset->weighttype < GP_EDITBRUSH_TYPE_WEIGHT) && (gset->weighttype >= TOT_GP_EDITBRUSH_TYPES)) {
+		if ((gset->weighttype < GP_EDITBRUSH_TYPE_WEIGHT) || (gset->weighttype >= TOT_GP_EDITBRUSH_TYPES)) {
 			gset->weighttype = GP_EDITBRUSH_TYPE_WEIGHT;
 		}
 		break;