[Bf-blender-cvs] [1ba5910098a] greasepencil-object: Cleanup: Create macros for duplicate code

[Antonio Vazquez]

Commit: 1ba5910098a8921356847cef63fb3298ce6e4756
Author: Antonio Vazquez
Date:   Wed Jun 13 16:04:13 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB1ba5910098a8921356847cef63fb3298ce6e4756

Cleanup: Create macros for duplicate code

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

M	source/blender/blenkernel/BKE_gpencil.h
M	source/blender/blenkernel/intern/gpencil_modifier.c

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

diff --git a/source/blender/blenkernel/BKE_gpencil.h b/source/blender/blenkernel/BKE_gpencil.h
index fa2aa4e14d0..3be6f3eaca4 100644
--- a/source/blender/blenkernel/BKE_gpencil.h
+++ b/source/blender/blenkernel/BKE_gpencil.h
@@ -114,6 +114,10 @@ struct bGPDstroke *BKE_gpencil_add_stroke(struct bGPDframe *gpf, int mat_idx, in
 #define GPENCIL_ALPHA_OPACITY_THRESH 0.001f
 #define GPENCIL_STRENGTH_MIN 0.003f
 
+#define GPENCIL_MODIFIER_ACTIVE(_md, _is_render) (((_md->mode & eModifierMode_Realtime) && (_is_render == false)) || \
+												  ((_md->mode & eModifierMode_Render) && (_is_render == true))) 
+#define GPENCIL_MODIFIER_EDIT(_md, _is_edit) (((_md->mode & eModifierMode_Editmode) == 0) && (_is_edit))
+
 bool gpencil_layer_is_editable(const struct bGPDlayer *gpl);
 
 /* How gpencil_layer_getframe() should behave when there
diff --git a/source/blender/blenkernel/intern/gpencil_modifier.c b/source/blender/blenkernel/intern/gpencil_modifier.c
index cc1f88c125d..4bc40855294 100644
--- a/source/blender/blenkernel/intern/gpencil_modifier.c
+++ b/source/blender/blenkernel/intern/gpencil_modifier.c
@@ -373,15 +373,14 @@ void BKE_gpencil_stroke_modifiers(Depsgraph *depsgraph, Object *ob, bGPDlayer *g
 {
 	ModifierData *md;
 	bGPdata *gpd = ob->data;
-	bool is_edit = GPENCIL_ANY_EDIT_MODE(gpd);
+	const bool is_edit = GPENCIL_ANY_EDIT_MODE(gpd);
 	
 	for (md = ob->modifiers.first; md; md = md->next) {
-		if (((md->mode & eModifierMode_Realtime) && (is_render == false)) ||
-		    ((md->mode & eModifierMode_Render) && (is_render == true)))
+		if (GPENCIL_MODIFIER_ACTIVE(md, is_render))
 		{
 			const ModifierTypeInfo *mti = modifierType_getInfo(md->type);
 			
-			if (((md->mode & eModifierMode_Editmode) == 0) && (is_edit)) {
+			if (GPENCIL_MODIFIER_EDIT(md, is_edit)) {
 				continue;
 			}
 			
@@ -397,15 +396,14 @@ void BKE_gpencil_geometry_modifiers(Depsgraph *depsgraph, Object *ob, bGPDlayer
 {
 	ModifierData *md;
 	bGPdata *gpd = ob->data;
-	bool is_edit = GPENCIL_ANY_EDIT_MODE(gpd);
+	const bool is_edit = GPENCIL_ANY_EDIT_MODE(gpd);
 
 	for (md = ob->modifiers.first; md; md = md->next) {
-		if (((md->mode & eModifierMode_Realtime) && (is_render == false)) ||
-		    ((md->mode & eModifierMode_Render) && (is_render == true)))
+		if (GPENCIL_MODIFIER_ACTIVE(md, is_render))
 		{
 			const ModifierTypeInfo *mti = modifierType_getInfo(md->type);
 			
-			if (((md->mode & eModifierMode_Editmode) == 0) && (is_edit)) {
+			if (GPENCIL_MODIFIER_EDIT(md, is_edit)) {
 				continue;
 			}