diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-07-02 13:03:56 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-07-02 13:03:56 +0300 |
| commit | b076b3853c99d947806e05fe2dec29ca5fa944fa (patch) | |
| tree | 3d975903096066e33f8cfdcff60e118685deacf8 /source/blender/editors/mesh/mesh_data.c | |
| parent | ad5a20efcef8114b589ff66d09166eabdc8e67ad (diff) | |
| parent | b88e51dd55c62bdc160f33f9b2ae1727a892560a (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/mesh/mesh_data.c')
| -rw-r--r-- | source/blender/editors/mesh/mesh_data.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/mesh/mesh_data.c b/source/blender/editors/mesh/mesh_data.c index f1f8ed41ca2..d4a6267fa6b 100644 --- a/source/blender/editors/mesh/mesh_data.c +++ b/source/blender/editors/mesh/mesh_data.c @@ -497,7 +497,7 @@ bool ED_mesh_color_remove_named(Mesh *me, const char *name) /*********************** UV texture operators ************************/ -static int layers_poll(bContext *C) +static bool layers_poll(bContext *C) { Object *ob = ED_object_context(C); ID *data = (ob) ? ob->data : NULL; @@ -736,7 +736,7 @@ static int mesh_customdata_clear_exec__internal(bContext *C, } /* Clear Mask */ -static int mesh_customdata_mask_clear_poll(bContext *C) +static bool mesh_customdata_mask_clear_poll(bContext *C) { Object *ob = ED_object_context(C); if (ob && ob->type == OB_MESH) { @@ -809,7 +809,7 @@ static int mesh_customdata_skin_state(bContext *C) return -1; } -static int mesh_customdata_skin_add_poll(bContext *C) +static bool mesh_customdata_skin_add_poll(bContext *C) { return (mesh_customdata_skin_state(C) == 0); } @@ -842,7 +842,7 @@ void MESH_OT_customdata_skin_add(wmOperatorType *ot) ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; } -static int mesh_customdata_skin_clear_poll(bContext *C) +static bool mesh_customdata_skin_clear_poll(bContext *C) { return (mesh_customdata_skin_state(C) == 1); } |