Merge branch 'master' into blender2.8

1 files changed, 11 insertions, 11 deletions

diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c
index d24cc936ec1..2889f798dd8 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -816,7 +816,7 @@ void OBJECT_OT_modifier_add(wmOperatorType *ot)
 
 /************************ generic functions for operators using mod names and data context *********************/
 
-int edit_modifier_poll_generic(bContext *C, StructRNA *rna_type, int obtype_flag)
+bool edit_modifier_poll_generic(bContext *C, StructRNA *rna_type, int obtype_flag)
 {
 	PointerRNA ptr = CTX_data_pointer_get_type(C, "modifier", rna_type);
 	Object *ob = (ptr.id.data) ? ptr.id.data : ED_object_active_context(C);
@@ -838,7 +838,7 @@ int edit_modifier_poll_generic(bContext *C, StructRNA *rna_type, int obtype_flag
 	return 1;
 }
 
-int edit_modifier_poll(bContext *C)
+bool edit_modifier_poll(bContext *C)
 {
 	return edit_modifier_poll_generic(C, &RNA_Modifier, 0);
 }
@@ -1143,7 +1143,7 @@ void OBJECT_OT_modifier_copy(wmOperatorType *ot)
 
 /************* multires delete higher levels operator ****************/
 
-static int multires_poll(bContext *C)
+static bool multires_poll(bContext *C)
 {
 	return edit_modifier_poll_generic(C, &RNA_MultiresModifier, (1 << OB_MESH));
 }
@@ -1472,13 +1472,13 @@ static void modifier_skin_customdata_delete(Object *ob)
 		CustomData_free_layer_active(&me->vdata, CD_MVERT_SKIN, me->totvert);
 }
 
-static int skin_poll(bContext *C)
+static bool skin_poll(bContext *C)
 {
 	return (!CTX_data_edit_object(C) &&
 	        edit_modifier_poll_generic(C, &RNA_SkinModifier, (1 << OB_MESH)));
 }
 
-static int skin_edit_poll(bContext *C)
+static bool skin_edit_poll(bContext *C)
 {
 	return (CTX_data_edit_object(C) &&
 	        edit_modifier_poll_generic(C, &RNA_SkinModifier, (1 << OB_MESH)));
@@ -1846,7 +1846,7 @@ void OBJECT_OT_skin_armature_create(wmOperatorType *ot)
 }
 /************************ delta mush bind operator *********************/
 
-static int correctivesmooth_poll(bContext *C)
+static bool correctivesmooth_poll(bContext *C)
 {
 	return edit_modifier_poll_generic(C, &RNA_CorrectiveSmoothModifier, 0);
 }
@@ -1914,7 +1914,7 @@ void OBJECT_OT_correctivesmooth_bind(wmOperatorType *ot)
 
 /************************ mdef bind operator *********************/
 
-static int meshdeform_poll(bContext *C)
+static bool meshdeform_poll(bContext *C)
 {
 	return edit_modifier_poll_generic(C, &RNA_MeshDeformModifier, 0);
 }
@@ -2010,7 +2010,7 @@ void OBJECT_OT_meshdeform_bind(wmOperatorType *ot)
 
 /****************** explode refresh operator *********************/
 
-static int explode_poll(bContext *C)
+static bool explode_poll(bContext *C)
 {
 	return edit_modifier_poll_generic(C, &RNA_ExplodeModifier, 0);
 }
@@ -2058,7 +2058,7 @@ void OBJECT_OT_explode_refresh(wmOperatorType *ot)
 
 /****************** ocean bake operator *********************/
 
-static int ocean_bake_poll(bContext *C)
+static bool ocean_bake_poll(bContext *C)
 {
 	return edit_modifier_poll_generic(C, &RNA_OceanModifier, 0);
 }
@@ -2276,7 +2276,7 @@ void OBJECT_OT_ocean_bake(wmOperatorType *ot)
 
 /************************ LaplacianDeform bind operator *********************/
 
-static int laplaciandeform_poll(bContext *C)
+static bool laplaciandeform_poll(bContext *C)
 {
 	return edit_modifier_poll_generic(C, &RNA_LaplacianDeformModifier, 0);
 }
@@ -2352,7 +2352,7 @@ void OBJECT_OT_laplaciandeform_bind(wmOperatorType *ot)
 
 /************************ sdef bind operator *********************/
 
-static int surfacedeform_bind_poll(bContext *C)
+static bool surfacedeform_bind_poll(bContext *C)
 {
 	return edit_modifier_poll_generic(C, &RNA_SurfaceDeformModifier, 0);
 }