diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-02-02 04:04:47 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-02 04:04:47 +0400 |
commit | 8926cbd0a78284c24622dafbcf084c2d4b2a1cf8 (patch) | |
tree | 03332b4b83a793648d27b6d3014b71522f0f2ac1 /source/blender/editors/mesh/mesh_data.c | |
parent | 4aa82806effa9e114f14f88d7b2da23b0a2bcca6 (diff) | |
parent | ca927b5771aba924b6f13242b4483e9f861d3153 (diff) |
svn merge ^/trunk/blender -r43819:43830
Diffstat (limited to 'source/blender/editors/mesh/mesh_data.c')
-rw-r--r-- | source/blender/editors/mesh/mesh_data.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/editors/mesh/mesh_data.c b/source/blender/editors/mesh/mesh_data.c index 194759bddfe..0ced2d99839 100644 --- a/source/blender/editors/mesh/mesh_data.c +++ b/source/blender/editors/mesh/mesh_data.c @@ -310,7 +310,7 @@ int ED_mesh_uv_texture_add(bContext *C, Mesh *me, const char *name, int active_s layernum = CustomData_number_of_layers(&em->bm->pdata, CD_MTEXPOLY); if (layernum >= MAX_MTFACE) - return 0; + return -1; BM_add_data_layer(em->bm, &em->bm->pdata, CD_MTEXPOLY); CustomData_set_layer_active(&em->bm->pdata, CD_MTEXPOLY, layernum); @@ -335,7 +335,7 @@ int ED_mesh_uv_texture_add(bContext *C, Mesh *me, const char *name, int active_s else { layernum = CustomData_number_of_layers(&me->pdata, CD_MTEXPOLY); if (layernum >= MAX_MTFACE) - return 0; + return -1; if (me->mtpoly) { CustomData_add_layer_named(&me->pdata, CD_MTEXPOLY, CD_DUPLICATE, me->mtpoly, me->totpoly, name); @@ -362,7 +362,7 @@ int ED_mesh_uv_texture_add(bContext *C, Mesh *me, const char *name, int active_s DAG_id_tag_update(&me->id, 0); WM_event_add_notifier(C, NC_GEOM|ND_DATA, me); - return 1; + return layernum; } int ED_mesh_uv_texture_remove(bContext *C, Object *ob, Mesh *me) @@ -399,7 +399,7 @@ int ED_mesh_color_add(bContext *C, Scene *UNUSED(scene), Object *UNUSED(ob), Mes layernum= CustomData_number_of_layers(&em->bm->ldata, CD_MLOOPCOL); if (layernum >= MAX_MCOL) { - return 0; + return -1; } BM_add_data_layer(em->bm, &em->bm->pdata, CD_MLOOPCOL); @@ -417,7 +417,7 @@ int ED_mesh_color_add(bContext *C, Scene *UNUSED(scene), Object *UNUSED(ob), Mes else { layernum= CustomData_number_of_layers(&me->ldata, CD_MLOOPCOL); if (layernum >= CD_MLOOPCOL) { - return 0; + return -1; } if(me->mloopcol) { @@ -440,7 +440,7 @@ int ED_mesh_color_add(bContext *C, Scene *UNUSED(scene), Object *UNUSED(ob), Mes DAG_id_tag_update(&me->id, 0); WM_event_add_notifier(C, NC_GEOM|ND_DATA, me); - return 1; + return layernum; } int ED_mesh_color_remove(bContext *C, Object *ob, Mesh *me) @@ -493,7 +493,7 @@ static int uv_texture_add_exec(bContext *C, wmOperator *UNUSED(op)) Object *ob= ED_object_context(C); Mesh *me= ob->data; - if(!ED_mesh_uv_texture_add(C, me, NULL, TRUE)) + if(ED_mesh_uv_texture_add(C, me, NULL, TRUE) == -1) return OPERATOR_CANCELLED; return OPERATOR_FINISHED; @@ -631,7 +631,7 @@ static int vertex_color_add_exec(bContext *C, wmOperator *UNUSED(op)) Object *ob= ED_object_context(C); Mesh *me= ob->data; - if(!ED_mesh_color_add(C, scene, ob, me, NULL, TRUE)) + if(ED_mesh_color_add(C, scene, ob, me, NULL, TRUE) == -1) return OPERATOR_CANCELLED; return OPERATOR_FINISHED; |