[Bf-blender-cvs] [a43c4be7e88] temp-greasepencil-vfx: Change parameter type for poll funcs after merge

[Antonio Vazquez]

Commit: a43c4be7e8892399b7e37620d04be7b197da251d
Author: Antonio Vazquez
Date:   Mon Jul 2 13:11:31 2018 +0200
Branches: temp-greasepencil-vfx
https://developer.blender.org/rBa43c4be7e8892399b7e37620d04be7b197da251d

Change parameter type for poll funcs after merge

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

M	source/blender/editors/object/object_shader_fx.c

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

diff --git a/source/blender/editors/object/object_shader_fx.c b/source/blender/editors/object/object_shader_fx.c
index 9d834453beb..b03cacb6ba4 100644
--- a/source/blender/editors/object/object_shader_fx.c
+++ b/source/blender/editors/object/object_shader_fx.c
@@ -284,7 +284,7 @@ void OBJECT_OT_shaderfx_add(wmOperatorType *ot)
 
 /************************ generic functions for operators using names and data context *********************/
 
-static int edit_shaderfx_poll_generic(bContext *C, StructRNA *rna_type, int obtype_flag)
+static bool edit_shaderfx_poll_generic(bContext *C, StructRNA *rna_type, int obtype_flag)
 {
 	PointerRNA ptr = CTX_data_pointer_get_type(C, "shaderfx", rna_type);
 	Object *ob = (ptr.id.data) ? ptr.id.data : ED_object_active_context(C);
@@ -306,7 +306,7 @@ static int edit_shaderfx_poll_generic(bContext *C, StructRNA *rna_type, int obty
 	return 1;
 }
 
-static int edit_shaderfx_poll(bContext *C)
+static bool edit_shaderfx_poll(bContext *C)
 {
 	return edit_shaderfx_poll_generic(C, &RNA_ShaderFx, 0);
 }