diff options
Diffstat (limited to 'source/blender/makesrna/intern/rna_mesh.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_mesh.c | 839 |
1 files changed, 453 insertions, 386 deletions
diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c index 48a4d055520..6788fd96595 100644 --- a/source/blender/makesrna/intern/rna_mesh.c +++ b/source/blender/makesrna/intern/rna_mesh.c @@ -1,4 +1,4 @@ -/* +/** * ***** BEGIN GPL LICENSE BLOCK ***** * * This program is free software; you can redistribute it and/or @@ -8,7 +8,7 @@ * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License @@ -20,6 +20,10 @@ * ***** END GPL LICENSE BLOCK ***** */ +/*note: the original vertex color stuff is now just used for + getting info on the layers themselves, accessing the data is + done through the (not yet written) mpoly interfaces.*/ + /** \file blender/makesrna/intern/rna_mesh.c * \ingroup RNA */ @@ -28,6 +32,7 @@ #include <stdlib.h> #include "RNA_define.h" +#include "RNA_types.h" #include "rna_internal.h" @@ -52,14 +57,14 @@ #include "BKE_depsgraph.h" #include "BKE_main.h" #include "BKE_mesh.h" - +#include "BKE_tessmesh.h" #include "ED_mesh.h" /* XXX Bad level call */ #include "WM_api.h" #include "WM_types.h" -static void rna_Mesh_update_data(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr) +static void rna_Mesh_update_data(Main *bmain, Scene *scene, PointerRNA *ptr) { ID *id= ptr->id.data; @@ -70,7 +75,7 @@ static void rna_Mesh_update_data(Main *UNUSED(bmain), Scene *UNUSED(scene), Poin } } -static void rna_Mesh_update_select(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr) +static void rna_Mesh_update_select(Main *bmain, Scene *scene, PointerRNA *ptr) { ID *id= ptr->id.data; /* cheating way for importers to avoid slow updates */ @@ -79,7 +84,7 @@ static void rna_Mesh_update_select(Main *UNUSED(bmain), Scene *UNUSED(scene), Po } } -void rna_Mesh_update_draw(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr) +void rna_Mesh_update_draw(Main *bmain, Scene *scene, PointerRNA *ptr) { ID *id= ptr->id.data; /* cheating way for importers to avoid slow updates */ @@ -158,14 +163,21 @@ static void rna_MEdge_crease_set(PointerRNA *ptr, float value) medge->crease= (char)(CLAMPIS(value*255.0f, 0, 255)); } +static void rna_MeshPolygon_normal_get(PointerRNA *ptr, float *values) +{ + Mesh *me= (Mesh*)ptr->id.data; + MPoly *mp= (MPoly*)ptr->data; + + mesh_calc_poly_normal(mp, me->mloop+mp->loopstart, me->mvert, values); +} + static void rna_MeshFace_normal_get(PointerRNA *ptr, float *values) { Mesh *me= (Mesh*)ptr->id.data; MFace *mface= (MFace*)ptr->data; - + if(mface->v4) - normal_quad_v3(values,me->mvert[mface->v1].co, me->mvert[mface->v2].co, - me->mvert[mface->v3].co, me->mvert[mface->v4].co); + normal_quad_v3( values,me->mvert[mface->v1].co, me->mvert[mface->v2].co, me->mvert[mface->v3].co, me->mvert[mface->v4].co); else normal_tri_v3( values,me->mvert[mface->v1].co, me->mvert[mface->v2].co, me->mvert[mface->v3].co); } @@ -254,55 +266,12 @@ static void rna_MeshColor_color4_set(PointerRNA *ptr, const float *values) (&mcol[3].r)[0]= (char)(CLAMPIS(values[2]*255.0f, 0, 255)); } -static void rna_Mesh_texspace_set(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr) -{ - Mesh *me= (Mesh*)ptr->data; - - if (me->texflag & AUTOSPACE) - tex_space_mesh(me); -} - - static int rna_Mesh_texspace_editable(PointerRNA *ptr) { Mesh *me= (Mesh*)ptr->data; return (me->texflag & AUTOSPACE)? 0: PROP_EDITABLE; } -static void rna_Mesh_texspace_loc_get(PointerRNA *ptr, float *values) -{ - Mesh *me= (Mesh *)ptr->data; - - if (!me->bb) - tex_space_mesh(me); - - copy_v3_v3(values, me->loc); -} - -static void rna_Mesh_texspace_loc_set(PointerRNA *ptr, const float *values) -{ - Mesh *me= (Mesh *)ptr->data; - - copy_v3_v3(me->loc, values); -} - -static void rna_Mesh_texspace_size_get(PointerRNA *ptr, float *values) -{ - Mesh *me= (Mesh *)ptr->data; - - if (!me->bb) - tex_space_mesh(me); - - copy_v3_v3(values, me->size); -} - -static void rna_Mesh_texspace_size_set(PointerRNA *ptr, const float *values) -{ - Mesh *me= (Mesh *)ptr->data; - - copy_v3_v3(me->size, values); -} - static void rna_MeshVertex_groups_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) { Mesh *me= (Mesh*)ptr->id.data; @@ -325,15 +294,20 @@ static void rna_MeshFace_material_index_range(PointerRNA *ptr, int *min, int *ma *max= MAX2(0, *max); } -static CustomData *rna_mesh_fdata(Mesh *me) +static CustomData *rna_mesh_pdata(Mesh *me) +{ + return (me->edit_btmesh)? &me->edit_btmesh->bm->pdata: &me->pdata; +} + +static CustomData *rna_mesh_ldata(Mesh *me) { - return (me->edit_mesh)? &me->edit_mesh->fdata: &me->fdata; + return (me->edit_btmesh)? &me->edit_btmesh->bm->ldata: &me->ldata; } static int rna_CustomDataLayer_length(PointerRNA *ptr, int type) { Mesh *me= (Mesh*)ptr->id.data; - CustomData *fdata= rna_mesh_fdata(me); + CustomData *fdata= rna_mesh_pdata(me); CustomDataLayer *layer; int i, length= 0; @@ -347,17 +321,17 @@ static int rna_CustomDataLayer_length(PointerRNA *ptr, int type) static int rna_CustomDataLayer_active_get(PointerRNA *ptr, int type, int render) { Mesh *me= (Mesh*)ptr->id.data; - CustomData *fdata= rna_mesh_fdata(me); + CustomData *fdata= rna_mesh_pdata(me); int n= ((CustomDataLayer*)ptr->data) - fdata->layers; if(render) return (n == CustomData_get_render_layer_index(fdata, type)); else return (n == CustomData_get_active_layer_index(fdata, type)); } -static int rna_CustomDataLayer_clone_get(PointerRNA *ptr, int type, int UNUSED(render)) +static int rna_CustomDataLayer_clone_get(PointerRNA *ptr, int type, int render) { Mesh *me= (Mesh*)ptr->id.data; - CustomData *fdata= rna_mesh_fdata(me); + CustomData *fdata= rna_mesh_pdata(me); int n= ((CustomDataLayer*)ptr->data) - fdata->layers; return (n == CustomData_get_clone_layer_index(fdata, type)); @@ -366,7 +340,7 @@ static int rna_CustomDataLayer_clone_get(PointerRNA *ptr, int type, int UNUSED(r static void rna_CustomDataLayer_active_set(PointerRNA *ptr, int value, int type, int render) { Mesh *me= (Mesh*)ptr->id.data; - CustomData *fdata= rna_mesh_fdata(me); + CustomData *fdata= rna_mesh_pdata(me); int n= ((CustomDataLayer*)ptr->data) - fdata->layers; if(value == 0) @@ -376,10 +350,10 @@ static void rna_CustomDataLayer_active_set(PointerRNA *ptr, int value, int type, else CustomData_set_layer_active_index(fdata, type, n); } -static void rna_CustomDataLayer_clone_set(PointerRNA *ptr, int value, int type, int UNUSED(render)) +static void rna_CustomDataLayer_clone_set(PointerRNA *ptr, int value, int type, int render) { Mesh *me= (Mesh*)ptr->id.data; - CustomData *fdata= rna_mesh_fdata(me); + CustomData *fdata= rna_mesh_pdata(me); int n= ((CustomDataLayer*)ptr->data) - fdata->layers; if(value == 0) @@ -388,29 +362,29 @@ static void rna_CustomDataLayer_clone_set(PointerRNA *ptr, int value, int type, CustomData_set_layer_clone_index(fdata, type, n); } -static int rna_uv_texture_check(CollectionPropertyIterator *UNUSED(iter), void *data) +static int rna_uv_texture_check(CollectionPropertyIterator *iter, void *data) { CustomDataLayer *layer= (CustomDataLayer*)data; - return (layer->type != CD_MTFACE); + return (layer->type != CD_MTEXPOLY); } static void rna_Mesh_uv_textures_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) { Mesh *me= (Mesh*)ptr->data; - CustomData *fdata= rna_mesh_fdata(me); + CustomData *fdata= rna_mesh_pdata(me); rna_iterator_array_begin(iter, (void*)fdata->layers, sizeof(CustomDataLayer), fdata->totlayer, 0, rna_uv_texture_check); } static int rna_Mesh_uv_textures_length(PointerRNA *ptr) { - return rna_CustomDataLayer_length(ptr, CD_MTFACE); + return rna_CustomDataLayer_length(ptr, CD_MTEXPOLY); } static PointerRNA rna_Mesh_active_uv_texture_get(PointerRNA *ptr) { Mesh *me= (Mesh*)ptr->data; - CustomData *fdata= rna_mesh_fdata(me); - int index= CustomData_get_active_layer_index(fdata, CD_MTFACE); + CustomData *fdata= rna_mesh_pdata(me); + int index= CustomData_get_active_layer_index(fdata, CD_MTEXPOLY); CustomDataLayer *cdl= (index == -1)? NULL: &fdata->layers[index]; return rna_pointer_inherit_refine(ptr, &RNA_MeshTextureFaceLayer, cdl); @@ -418,34 +392,42 @@ static PointerRNA rna_Mesh_active_uv_texture_get(PointerRNA *ptr) static PointerRNA rna_Mesh_uv_texture_clone_get(PointerRNA *ptr) { + PointerRNA pnull = {{0}}; +#if 0 Mesh *me= (Mesh*)ptr->data; CustomData *fdata= rna_mesh_fdata(me); int index= CustomData_get_clone_layer_index(fdata, CD_MTFACE); CustomDataLayer *cdl= (index == -1)? NULL: &fdata->layers[index]; return rna_pointer_inherit_refine(ptr, &RNA_MeshTextureFaceLayer, cdl); +#endif + return pnull; } static PointerRNA rna_Mesh_uv_texture_stencil_get(PointerRNA *ptr) { + PointerRNA pnull = {{0}}; +#if 0 Mesh *me= (Mesh*)ptr->data; CustomData *fdata= rna_mesh_fdata(me); int index= CustomData_get_stencil_layer_index(fdata, CD_MTFACE); CustomDataLayer *cdl= (index == -1)? NULL: &fdata->layers[index]; return rna_pointer_inherit_refine(ptr, &RNA_MeshTextureFaceLayer, cdl); +#endif + return pnull; } static void rna_Mesh_active_uv_texture_set(PointerRNA *ptr, PointerRNA value) { Mesh *me= (Mesh*)ptr->data; - CustomData *fdata= rna_mesh_fdata(me); + CustomData *fdata= rna_mesh_pdata(me); CustomDataLayer *cdl; int a; for(cdl=fdata->layers, a=0; a<fdata->totlayer; cdl++, a++) { if(value.data == cdl) { - CustomData_set_layer_active_index(fdata, CD_MTFACE, a); + CustomData_set_layer_active_index(fdata, CD_MTEXPOLY, a); mesh_update_customdata_pointers(me); return; } @@ -454,6 +436,7 @@ static void rna_Mesh_active_uv_texture_set(PointerRNA *ptr, PointerRNA value) static void rna_Mesh_uv_texture_clone_set(PointerRNA *ptr, PointerRNA value) { +#if 0 Mesh *me= (Mesh*)ptr->data; CustomData *fdata= rna_mesh_fdata(me); CustomDataLayer *cdl; @@ -465,10 +448,13 @@ static void rna_Mesh_uv_texture_clone_set(PointerRNA *ptr, PointerRNA value) return; } } +#endif + return; } static void rna_Mesh_uv_texture_stencil_set(PointerRNA *ptr, PointerRNA value) { +#if 0 Mesh *me= (Mesh*)ptr->data; CustomData *fdata= rna_mesh_fdata(me); CustomDataLayer *cdl; @@ -480,146 +466,85 @@ static void rna_Mesh_uv_texture_stencil_set(PointerRNA *ptr, PointerRNA value) return; } } +#endif + return; } static int rna_Mesh_active_uv_texture_index_get(PointerRNA *ptr) { Mesh *me= (Mesh*)ptr->data; - CustomData *fdata= rna_mesh_fdata(me); - return CustomData_get_active_layer(fdata, CD_MTFACE); + CustomData *fdata= rna_mesh_pdata(me); + return CustomData_get_active_layer(fdata, CD_MTEXPOLY); } static int rna_Mesh_uv_texture_clone_index_get(PointerRNA *ptr) { Mesh *me= (Mesh*)ptr->data; - CustomData *fdata= rna_mesh_fdata(me); - return CustomData_get_clone_layer(fdata, CD_MTFACE); + CustomData *fdata= rna_mesh_pdata(me); + return CustomData_get_clone_layer(fdata, CD_MTEXPOLY); } static int rna_Mesh_uv_texture_stencil_index_get(PointerRNA *ptr) { Mesh *me= (Mesh*)ptr->data; - CustomData *fdata= rna_mesh_fdata(me); - return CustomData_get_stencil_layer(fdata, CD_MTFACE); + CustomData *fdata= rna_mesh_pdata(me); + return CustomData_get_stencil_layer(fdata, CD_MTEXPOLY); } static void rna_Mesh_active_uv_texture_index_set(PointerRNA *ptr, int value) { Mesh *me= (Mesh*)ptr->data; - CustomData *fdata= rna_mesh_fdata(me); + CustomData *fdata= rna_mesh_pdata(me); - CustomData_set_layer_active(fdata, CD_MTFACE, value); + CustomData_set_layer_active(fdata, CD_MTEXPOLY, value); mesh_update_customdata_pointers(me); } static void rna_Mesh_uv_texture_clone_index_set(PointerRNA *ptr, int value) { Mesh *me= (Mesh*)ptr->data; - CustomData *fdata= rna_mesh_fdata(me); + CustomData *fdata= rna_mesh_pdata(me); - CustomData_set_layer_clone(fdata, CD_MTFACE, value); + CustomData_set_layer_clone(fdata, CD_MTEXPOLY, value); } static void rna_Mesh_uv_texture_stencil_index_set(PointerRNA *ptr, int value) { Mesh *me= (Mesh*)ptr->data; - CustomData *fdata= rna_mesh_fdata(me); + CustomData *fdata= rna_mesh_pdata(me); - CustomData_set_layer_stencil(fdata, CD_MTFACE, value); + CustomData_set_layer_stencil(fdata, CD_MTEXPOLY, value); } static void rna_Mesh_active_uv_texture_index_range(PointerRNA *ptr, int *min, int *max) { Mesh *me= (Mesh*)ptr->data; - CustomData *fdata= rna_mesh_fdata(me); + CustomData *pdata= rna_mesh_pdata(me); *min= 0; - *max= CustomData_number_of_layers(fdata, CD_MTFACE)-1; + *max= CustomData_number_of_layers(pdata, CD_MTEXPOLY)-1; *max= MAX2(0, *max); } -static PointerRNA rna_Mesh_active_mtface_get(PointerRNA *ptr) -{ - Mesh *me= (Mesh*)ptr->data; - EditMesh *em= BKE_mesh_get_editmesh(me); - MTFace *tf; - - if (em && EM_texFaceCheck(em)) - { - tf = EM_get_active_mtface(em, NULL, NULL, 1); - - return rna_pointer_inherit_refine(ptr, &RNA_MeshTextureFace, tf); - } - - return rna_pointer_inherit_refine(ptr, &RNA_MeshTextureFace, NULL); -} - static void rna_MeshTextureFace_uv1_get(PointerRNA *ptr, float *values) { - MTFace *mtface= (MTFace*)ptr->data; + MLoopUV *mloopuv= (MLoopUV*)ptr->data; - values[0]= mtface->uv[0][0]; - values[1]= mtface->uv[0][1]; + values[0]= mloopuv->uv[0]; + values[1]= mloopuv->uv[1]; } static void rna_MeshTextureFace_uv1_set(PointerRNA *ptr, const float *values) { - MTFace *mtface= (MTFace*)ptr->data; - - mtface->uv[0][0]= values[0]; - mtface->uv[0][1]= values[1]; -} - -static void rna_MeshTextureFace_uv2_get(PointerRNA *ptr, float *values) -{ - MTFace *mtface= (MTFace*)ptr->data; - - values[0]= mtface->uv[1][0]; - values[1]= mtface->uv[1][1]; -} - -static void rna_MeshTextureFace_uv2_set(PointerRNA *ptr, const float *values) -{ - MTFace *mtface= (MTFace*)ptr->data; - - mtface->uv[1][0]= values[0]; - mtface->uv[1][1]= values[1]; -} - -static void rna_MeshTextureFace_uv3_get(PointerRNA *ptr, float *values) -{ - MTFace *mtface= (MTFace*)ptr->data; - - values[0]= mtface->uv[2][0]; - values[1]= mtface->uv[2][1]; -} - -static void rna_MeshTextureFace_uv3_set(PointerRNA *ptr, const float *values) -{ - MTFace *mtface= (MTFace*)ptr->data; - - mtface->uv[2][0]= values[0]; - mtface->uv[2][1]= values[1]; -} - -static void rna_MeshTextureFace_uv4_get(PointerRNA *ptr, float *values) -{ - MTFace *mtface= (MTFace*)ptr->data; - - values[0]= mtface->uv[3][0]; - values[1]= mtface->uv[3][1]; -} - -static void rna_MeshTextureFace_uv4_set(PointerRNA *ptr, const float *values) -{ - MTFace *mtface= (MTFace*)ptr->data; - - mtface->uv[3][0]= values[0]; - mtface->uv[3][1]= values[1]; + MLoopUV *mloopuv= (MLoopUV*)ptr->data; + + mloopuv->uv[0] = values[0]; + mloopuv->uv[1] = values[1]; } static int rna_CustomDataData_numverts(PointerRNA *ptr, int type) { + /*BMESH_TODO Mesh *me= (Mesh*)ptr->id.data; CustomData *fdata= rna_mesh_fdata(me); CustomDataLayer *cdl; @@ -633,53 +558,53 @@ static int rna_CustomDataData_numverts(PointerRNA *ptr, int type) } } + return 0;*/ return 0; } static int rna_MeshTextureFace_uv_get_length(PointerRNA *ptr, int length[RNA_MAX_ARRAY_DIMENSION]) { - length[0]= rna_CustomDataData_numverts(ptr, CD_MTFACE); - length[1]= 2; - return length[0]*length[1]; + //return rna_CustomDataData_numverts(ptr, CD_MTFACE) * 2; + return 0; //BMESH_TODO } static void rna_MeshTextureFace_uv_get(PointerRNA *ptr, float *values) { - MTFace *mtface= (MTFace*)ptr->data; - int totvert= rna_CustomDataData_numverts(ptr, CD_MTFACE); + //MTFace *mtface= (MTFace*)ptr->data; + //int totvert= rna_CustomDataData_numverts(ptr, CD_MTFACE); - memcpy(values, mtface->uv, totvert * 2 * sizeof(float)); + //memcpy(values, mtface->uv, totvert * 2 * sizeof(float)); } static void rna_MeshTextureFace_uv_set(PointerRNA *ptr, const float *values) { - MTFace *mtface= (MTFace*)ptr->data; - int totvert= rna_CustomDataData_numverts(ptr, CD_MTFACE); + //MTFace *mtface= (MTFace*)ptr->data; + //int totvert= rna_CustomDataData_numverts(ptr, CD_MTFACE); - memcpy(mtface->uv, values, totvert * 2 * sizeof(float)); + //memcpy(mtface->uv, values, totvert * 2 * sizeof(float)); } static void rna_MeshTextureFaceLayer_data_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) { Mesh *me= (Mesh*)ptr->id.data; CustomDataLayer *layer= (CustomDataLayer*)ptr->data; - rna_iterator_array_begin(iter, layer->data, sizeof(MTFace), (me->edit_mesh)? 0: me->totface, 0, NULL); + rna_iterator_array_begin(iter, layer->data, sizeof(MTexPoly), me->totpoly, 0, NULL); } static int rna_MeshTextureFaceLayer_data_length(PointerRNA *ptr) { Mesh *me= (Mesh*)ptr->id.data; - return (me->edit_mesh)? 0: me->totface; + return me->totpoly; } static int rna_MeshTextureFaceLayer_active_render_get(PointerRNA *ptr) { - return rna_CustomDataLayer_active_get(ptr, CD_MTFACE, 1); + return rna_CustomDataLayer_active_get(ptr, CD_MTEXPOLY, 1); } static int rna_MeshTextureFaceLayer_active_get(PointerRNA *ptr) { - return rna_CustomDataLayer_active_get(ptr, CD_MTFACE, 0); + return rna_CustomDataLayer_active_get(ptr, CD_MTEXPOLY, 0); } static int rna_MeshTextureFaceLayer_clone_get(PointerRNA *ptr) @@ -689,12 +614,12 @@ static int rna_MeshTextureFaceLayer_clone_get(PointerRNA *ptr) static void rna_MeshTextureFaceLayer_active_render_set(PointerRNA *ptr, int value) { - rna_CustomDataLayer_active_set(ptr, value, CD_MTFACE, 1); + rna_CustomDataLayer_active_set(ptr, value, CD_MTEXPOLY, 1); } static void rna_MeshTextureFaceLayer_active_set(PointerRNA *ptr, int value) { - rna_CustomDataLayer_active_set(ptr, value, CD_MTFACE, 0); + rna_CustomDataLayer_active_set(ptr, value, CD_MTEXPOLY, 0); } static void rna_MeshTextureFaceLayer_clone_set(PointerRNA *ptr, int value) @@ -705,36 +630,36 @@ static void rna_MeshTextureFaceLayer_clone_set(PointerRNA *ptr, int value) static void rna_MeshTextureFaceLayer_name_set(PointerRNA *ptr, const char *value) { Mesh *me= (Mesh*)ptr->id.data; - CustomData *fdata= rna_mesh_fdata(me); + /* CustomData *fdata= rna_mesh_pdata(me); */ /* UNUSED */ CustomDataLayer *cdl= (CustomDataLayer*)ptr->data; BLI_strncpy_utf8(cdl->name, value, sizeof(cdl->name)); - CustomData_set_layer_unique_name(fdata, cdl - fdata->layers); + CustomData_set_layer_unique_name(&me->pdata, cdl - rna_mesh_pdata(me)->layers); } -static int rna_vertex_color_check(CollectionPropertyIterator *UNUSED(iter), void *data) +static int rna_vertex_color_check(CollectionPropertyIterator *iter, void *data) { CustomDataLayer *layer= (CustomDataLayer*)data; - return (layer->type != CD_MCOL); + return (layer->type != CD_MLOOPCOL); } static void rna_Mesh_vertex_colors_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) { Mesh *me= (Mesh*)ptr->data; - CustomData *fdata= rna_mesh_fdata(me); - rna_iterator_array_begin(iter, (void*)fdata->layers, sizeof(CustomDataLayer), fdata->totlayer, 0, rna_vertex_color_check); + CustomData *ldata= rna_mesh_ldata(me); + rna_iterator_array_begin(iter, (void*)ldata->layers, sizeof(CustomDataLayer), ldata->totlayer, 0, rna_vertex_color_check); } static int rna_Mesh_vertex_colors_length(PointerRNA *ptr) { - return rna_CustomDataLayer_length(ptr, CD_MCOL); + return rna_CustomDataLayer_length(ptr, CD_MLOOPCOL); } static PointerRNA rna_Mesh_active_vertex_color_get(PointerRNA *ptr) { Mesh *me= (Mesh*)ptr->data; - CustomData *fdata= rna_mesh_fdata(me); - int index= CustomData_get_active_layer_index(fdata, CD_MCOL); - CustomDataLayer *cdl= (index == -1)? NULL: &fdata->layers[index]; + CustomData *ldata= rna_mesh_ldata(me); + int index= CustomData_get_active_layer_index(ldata, CD_MLOOPCOL); + CustomDataLayer *cdl= (index == -1)? NULL: &ldata->layers[index]; return rna_pointer_inherit_refine(ptr, &RNA_MeshColorLayer, cdl); } @@ -742,42 +667,47 @@ static PointerRNA rna_Mesh_active_vertex_color_get(PointerRNA *ptr) static void rna_Mesh_active_vertex_color_set(PointerRNA *ptr, PointerRNA value) { Mesh *me= (Mesh*)ptr->data; - CustomData *fdata= rna_mesh_fdata(me); + CustomData *ldata= rna_mesh_ldata(me); CustomDataLayer *cdl; - int a; + int a, b; + + b = 0; + for(cdl=ldata->layers, a=0; a<ldata->totlayer; cdl++, a++) { + if (cdl->type == CD_MLOOPCOL) + b++; - for(cdl=fdata->layers, a=0; a<fdata->totlayer; cdl++, a++) { if(value.data == cdl) { - CustomData_set_layer_active_index(fdata, CD_MCOL, a); - mesh_update_customdata_pointers(me); - return; + CustomData_set_layer_active_index(ldata, CD_MLOOPCOL, a); + break; } } + + mesh_update_customdata_pointers(me); } static int rna_Mesh_active_vertex_color_index_get(PointerRNA *ptr) { Mesh *me= (Mesh*)ptr->data; - CustomData *fdata= rna_mesh_fdata(me); - return CustomData_get_active_layer(fdata, CD_MCOL); + CustomData *ldata= rna_mesh_ldata(me); + return CustomData_get_active_layer(ldata, CD_MLOOPCOL); } static void rna_Mesh_active_vertex_color_index_set(PointerRNA *ptr, int value) { Mesh *me= (Mesh*)ptr->data; - CustomData *fdata= rna_mesh_fdata(me); + CustomData *ldata= rna_mesh_ldata(me); - CustomData_set_layer_active(fdata, CD_MCOL, value); + CustomData_set_layer_active(ldata, CD_MLOOPCOL, value); mesh_update_customdata_pointers(me); } static void rna_Mesh_active_vertex_color_index_range(PointerRNA *ptr, int *min, int *max) { Mesh *me= (Mesh*)ptr->data; - CustomData *fdata= rna_mesh_fdata(me); + CustomData *ldata= rna_mesh_ldata(me); *min= 0; - *max= CustomData_number_of_layers(fdata, CD_MCOL)-1; + *max= CustomData_number_of_layers(ldata, CD_MLOOPCOL)-1; *max= MAX2(0, *max); } @@ -785,58 +715,58 @@ static void rna_MeshColorLayer_data_begin(CollectionPropertyIterator *iter, Poin { Mesh *me= (Mesh*)ptr->id.data; CustomDataLayer *layer= (CustomDataLayer*)ptr->data; - rna_iterator_array_begin(iter, layer->data, sizeof(MCol)*4, (me->edit_mesh)? 0: me->totface, 0, NULL); + rna_iterator_array_begin(iter, layer->data, sizeof(CD_MLOOPCOL), me->totloop, 0, NULL); } static int rna_MeshColorLayer_data_length(PointerRNA *ptr) { Mesh *me= (Mesh*)ptr->id.data; - return (me->edit_mesh)? 0: me->totface; + return me->totloop; } static int rna_MeshColorLayer_active_render_get(PointerRNA *ptr) { - return rna_CustomDataLayer_active_get(ptr, CD_MCOL, 1); + return rna_CustomDataLayer_active_get(ptr, CD_MLOOPCOL, 1); } static int rna_MeshColorLayer_active_get(PointerRNA *ptr) { - return rna_CustomDataLayer_active_get(ptr, CD_MCOL, 0); + return rna_CustomDataLayer_active_get(ptr, CD_MLOOPCOL, 0); } static void rna_MeshColorLayer_active_render_set(PointerRNA *ptr, int value) { - rna_CustomDataLayer_active_set(ptr, value, CD_MCOL, 1); + rna_CustomDataLayer_active_set(ptr, value, CD_MLOOPCOL, 1); } static void rna_MeshColorLayer_active_set(PointerRNA *ptr, int value) { - rna_CustomDataLayer_active_set(ptr, value, CD_MCOL, 0); + rna_CustomDataLayer_active_set(ptr, value, CD_MLOOPCOL, 0); } static void rna_MeshColorLayer_name_set(PointerRNA *ptr, const char *value) { Mesh *me= (Mesh*)ptr->id.data; - CustomData *fdata= rna_mesh_fdata(me); + /* CustomData *fdata= rna_mesh_pdata(me); */ /* UNUSED */ CustomDataLayer *cdl= (CustomDataLayer*)ptr->data; BLI_strncpy_utf8(cdl->name, value, sizeof(cdl->name)); - CustomData_set_layer_unique_name(fdata, cdl - fdata->layers); + CustomData_set_layer_unique_name(&me->ldata, cdl - rna_mesh_ldata(me)->layers); } static void rna_MeshFloatPropertyLayer_data_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) { Mesh *me= (Mesh*)ptr->id.data; CustomDataLayer *layer= (CustomDataLayer*)ptr->data; - rna_iterator_array_begin(iter, layer->data, sizeof(MFloatProperty), (me->edit_mesh)? 0: me->totface, 0, NULL); + rna_iterator_array_begin(iter, layer->data, sizeof(MFloatProperty), me->totface, 0, NULL); } static int rna_MeshFloatPropertyLayer_data_length(PointerRNA *ptr) { Mesh *me= (Mesh*)ptr->id.data; - return (me->edit_mesh)? 0: me->totface; + return me->totface; } -static int rna_float_layer_check(CollectionPropertyIterator *UNUSED(iter), void *data) +static int rna_float_layer_check(CollectionPropertyIterator *iter, void *data) { CustomDataLayer *layer= (CustomDataLayer*)data; return (layer->type != CD_PROP_FLT); @@ -845,7 +775,7 @@ static int rna_float_layer_check(CollectionPropertyIterator *UNUSED(iter), void static void rna_Mesh_float_layers_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) { Mesh *me= (Mesh*)ptr->data; - CustomData *fdata= rna_mesh_fdata(me); + CustomData *fdata= rna_mesh_pdata(me); rna_iterator_array_begin(iter, (void*)fdata->layers, sizeof(CustomDataLayer), fdata->totlayer, 0, rna_float_layer_check); } @@ -854,7 +784,7 @@ static int rna_Mesh_float_layers_length(PointerRNA *ptr) return rna_CustomDataLayer_length(ptr, CD_PROP_FLT); } -static int rna_int_layer_check(CollectionPropertyIterator *UNUSED(iter), void *data) +static int rna_int_layer_check(CollectionPropertyIterator *iter, void *data) { CustomDataLayer *layer= (CustomDataLayer*)data; return (layer->type != CD_PROP_INT); @@ -864,19 +794,19 @@ static void rna_MeshIntPropertyLayer_data_begin(CollectionPropertyIterator *iter { Mesh *me= (Mesh*)ptr->id.data; CustomDataLayer *layer= (CustomDataLayer*)ptr->data; - rna_iterator_array_begin(iter, layer->data, sizeof(MIntProperty), (me->edit_mesh)? 0: me->totface, 0, NULL); + rna_iterator_array_begin(iter, layer->data, sizeof(MIntProperty), me->totface, 0, NULL); } static int rna_MeshIntPropertyLayer_data_length(PointerRNA *ptr) { Mesh *me= (Mesh*)ptr->id.data; - return (me->edit_mesh)? 0: me->totface; + return me->totface; } static void rna_Mesh_int_layers_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) { Mesh *me= (Mesh*)ptr->data; - CustomData *fdata= rna_mesh_fdata(me); + CustomData *fdata= rna_mesh_pdata(me); rna_iterator_array_begin(iter, (void*)fdata->layers, sizeof(CustomDataLayer), fdata->totlayer, 0, rna_int_layer_check); } @@ -885,7 +815,7 @@ static int rna_Mesh_int_layers_length(PointerRNA *ptr) return rna_CustomDataLayer_length(ptr, CD_PROP_INT); } -static int rna_string_layer_check(CollectionPropertyIterator *UNUSED(iter), void *data) +static int rna_string_layer_check(CollectionPropertyIterator *iter, void *data) { CustomDataLayer *layer= (CustomDataLayer*)data; return (layer->type != CD_PROP_STR); @@ -895,19 +825,19 @@ static void rna_MeshStringPropertyLayer_data_begin(CollectionPropertyIterator *i { Mesh *me= (Mesh*)ptr->id.data; CustomDataLayer *layer= (CustomDataLayer*)ptr->data; - rna_iterator_array_begin(iter, layer->data, sizeof(MStringProperty), (me->edit_mesh)? 0: me->totface, 0, NULL); + rna_iterator_array_begin(iter, layer->data, sizeof(MStringProperty), me->totface, 0, NULL); } static int rna_MeshStringPropertyLayer_data_length(PointerRNA *ptr) { Mesh *me= (Mesh*)ptr->id.data; - return (me->edit_mesh)? 0: me->totface; + return me->totface; } static void rna_Mesh_string_layers_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) { Mesh *me= (Mesh*)ptr->data; - CustomData *fdata= rna_mesh_fdata(me); + CustomData *fdata= rna_mesh_pdata(me); rna_iterator_array_begin(iter, (void*)fdata->layers, sizeof(CustomDataLayer), fdata->totlayer, 0, rna_string_layer_check); } @@ -918,7 +848,7 @@ static int rna_Mesh_string_layers_length(PointerRNA *ptr) static void rna_TextureFace_image_set(PointerRNA *ptr, PointerRNA value) { - MTFace *tf= (MTFace*)ptr->data; + MTexPoly *tf= (MTexPoly*)ptr->data; ID *id= value.data; if(id) { @@ -971,6 +901,37 @@ static void rna_MeshFace_verts_set(PointerRNA *ptr, const int *values) memcpy(&face->v1, values, (face->v4 ? 4 : 3) * sizeof(int)); } +/* poly.vertices - this is faked loop access for convenience */ +static int rna_MeshPoly_vertices_get_length(PointerRNA *ptr, int length[RNA_MAX_ARRAY_DIMENSION]) +{ + MPoly *mp= (MPoly*)ptr->data; + /* note, raw access uses dummy item, this _could_ crash, watch out for this, mface uses it but it cant work here */ + return (length[0]= mp->totloop); +} + +static void rna_MeshPoly_vertices_get(PointerRNA *ptr, int *values) +{ + Mesh *me= (Mesh*)ptr->id.data; + MPoly *mp= (MPoly*)ptr->data; + MLoop *ml= &me->mloop[mp->loopstart]; + unsigned int i; + for(i= mp->totloop; i > 0; i--, values++, ml++) { + *values = ml->v; + } +} + +static void rna_MeshPoly_vertices_set(PointerRNA *ptr, const int *values) +{ + Mesh *me= (Mesh*)ptr->id.data; + MPoly *mp= (MPoly*)ptr->data; + MLoop *ml= &me->mloop[mp->loopstart]; + unsigned int i; + for(i= mp->totloop; i > 0; i--, values++, ml++) { + ml->v = *values; + } +} + + static int rna_MeshVertex_index_get(PointerRNA *ptr) { Mesh *me= (Mesh*)ptr->id.data; @@ -992,6 +953,13 @@ static int rna_MeshFace_index_get(PointerRNA *ptr) return (int)(face - me->mface); } +static int rna_MeshPolygon_index_get(PointerRNA *ptr) +{ + Mesh *me= (Mesh*)ptr->id.data; + MPoly *mpoly= (MPoly*)ptr->data; + return (int)(mpoly - me->mpoly); +} + /* path construction */ static char *rna_VertexGroupElement_path(PointerRNA *ptr) @@ -1001,33 +969,19 @@ static char *rna_VertexGroupElement_path(PointerRNA *ptr) MDeformVert *dvert; int a, b; - /* sanity check: make sure that mesh pointer is valid */ - if (me == NULL) - return NULL; - else if (GS(me->id.name) != ID_ME) { - /* if object pointer, try to resolve the object's data to mesh pointer */ - if (GS(me->id.name) == ID_OB) { - Object *ob = (Object *)me; - - if (ob->type == OB_MESH) - me = (Mesh *)ob->data; - else - return NULL; /* nothing can be done */ - } - else - return NULL; /* nothing can be done */ - } - - for(a=0, dvert=me->dvert; a<me->totvert; a++, dvert++) { - for(b=0; b<dvert->totweight; b++) { + for(a=0, dvert=me->dvert; a<me->totvert; a++, dvert++) + for(b=0; b<dvert->totweight; b++) if(dw == &dvert->dw[b]) - return BLI_sprintfN("vertices[%d].groups[%d]", a, b); - } - } + return BLI_sprintfN("verts[%d].groups[%d]", a, b); return NULL; } +static char *rna_MeshPolygon_path(PointerRNA *ptr) +{ + return BLI_sprintfN("polygons[%d]", (int)((MPoly*)ptr->data - ((Mesh*)ptr->id.data)->mpoly)); +} + static char *rna_MeshFace_path(PointerRNA *ptr) { return BLI_sprintfN("faces[%d]", (int)((MFace*)ptr->data - ((Mesh*)ptr->id.data)->mface)); @@ -1038,6 +992,12 @@ static char *rna_MeshEdge_path(PointerRNA *ptr) return BLI_sprintfN("edges[%d]", (int)((MEdge*)ptr->data - ((Mesh*)ptr->id.data)->medge)); } +static char *rna_MeshLoop_path(PointerRNA *ptr) +{ + return BLI_sprintfN("loops[%d]", (int)((MLoop*)ptr->data - ((Mesh*)ptr->id.data)->mloop)); +} + + static char *rna_MeshVertex_path(PointerRNA *ptr) { return BLI_sprintfN("vertices[%d]", (int)((MVert*)ptr->data - ((Mesh*)ptr->id.data)->mvert)); @@ -1051,7 +1011,7 @@ static char *rna_MeshTextureFaceLayer_path(PointerRNA *ptr) static char *rna_CustomDataData_path(PointerRNA *ptr, char *collection, int type) { Mesh *me= (Mesh*)ptr->id.data; - CustomData *fdata= rna_mesh_fdata(me); + CustomData *fdata= rna_mesh_pdata(me); CustomDataLayer *cdl; int a, b; @@ -1068,7 +1028,7 @@ static char *rna_CustomDataData_path(PointerRNA *ptr, char *collection, int type static char *rna_MeshTextureFace_path(PointerRNA *ptr) { - return rna_CustomDataData_path(ptr, "uv_textures", CD_MTFACE); + return rna_CustomDataData_path(ptr, "uv_textures", CD_MTEXPOLY); } static char *rna_MeshColorLayer_path(PointerRNA *ptr) @@ -1078,7 +1038,7 @@ static char *rna_MeshColorLayer_path(PointerRNA *ptr) static char *rna_MeshColor_path(PointerRNA *ptr) { - return rna_CustomDataData_path(ptr, "vertex_colors", CD_MCOL); + return rna_CustomDataData_path(ptr, "vertex_colors", CD_MLOOPCOL); } static char *rna_MeshSticky_path(PointerRNA *ptr) @@ -1119,43 +1079,43 @@ static char *rna_MeshStringProperty_path(PointerRNA *ptr) static int rna_Mesh_tot_vert_get(PointerRNA *ptr) { Mesh *me= (Mesh*)ptr->id.data; - return me->edit_mesh ? me->edit_mesh->totvertsel : 0; + return me->edit_btmesh ? me->edit_btmesh->bm->totvertsel : 0; } static int rna_Mesh_tot_edge_get(PointerRNA *ptr) { Mesh *me= (Mesh*)ptr->id.data; - return me->edit_mesh ? me->edit_mesh->totedgesel: 0; + return me->edit_btmesh ? me->edit_btmesh->bm->totedgesel: 0; } static int rna_Mesh_tot_face_get(PointerRNA *ptr) { Mesh *me= (Mesh*)ptr->id.data; - return me->edit_mesh ? me->edit_mesh->totfacesel : 0; + return me->edit_btmesh ? me->edit_btmesh->bm->totfacesel : 0; } static CustomDataLayer *rna_Mesh_vertex_color_new(struct Mesh *me, struct bContext *C, const char *name) { - CustomData *fdata; + CustomData *ldata; CustomDataLayer *cdl= NULL; int index; if(ED_mesh_color_add(C, NULL, NULL, me, name, FALSE)) { - fdata= rna_mesh_fdata(me); - index= CustomData_get_named_layer_index(fdata, CD_MCOL, name); - cdl= (index == -1)? NULL: &fdata->layers[index]; + ldata= rna_mesh_ldata(me); + index= CustomData_get_named_layer_index(ldata, CD_MLOOPCOL, name); + cdl= (index == -1)? NULL: &ldata->layers[index]; } return cdl; } static CustomDataLayer *rna_Mesh_uv_texture_new(struct Mesh *me, struct bContext *C, const char *name) { - CustomData *fdata; + CustomData *pdata; CustomDataLayer *cdl= NULL; int index; if(ED_mesh_uv_texture_add(C, me, name, FALSE)) { - fdata= rna_mesh_fdata(me); - index= CustomData_get_named_layer_index(fdata, CD_MTFACE, name); - cdl= (index == -1)? NULL: &fdata->layers[index]; + pdata= rna_mesh_pdata(me); + index= CustomData_get_named_layer_index(pdata, CD_MTEXPOLY, name); + cdl= (index == -1)? NULL: &pdata->layers[index]; } return cdl; } @@ -1225,8 +1185,7 @@ static void rna_def_mvert(BlenderRNA *brna) RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); prop= RNA_def_property(srna, "groups", PROP_COLLECTION, PROP_NONE); - RNA_def_property_collection_funcs(prop, "rna_MeshVertex_groups_begin", "rna_iterator_array_next", - "rna_iterator_array_end", "rna_iterator_array_get", NULL, NULL, NULL, NULL); + RNA_def_property_collection_funcs(prop, "rna_MeshVertex_groups_begin", "rna_iterator_array_next", "rna_iterator_array_end", "rna_iterator_array_get", NULL, NULL, NULL, NULL); RNA_def_property_struct_type(prop, "VertexGroupElement"); RNA_def_property_ui_text(prop, "Groups", "Weights for the vertex groups this vertex is member of"); @@ -1348,12 +1307,12 @@ static void rna_def_mface(BlenderRNA *brna) RNA_def_property_range(prop, -1.0f, 1.0f); RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_float_funcs(prop, "rna_MeshFace_normal_get", NULL, NULL); - RNA_def_property_ui_text(prop, "Face normal", "Local space unit length normal vector for this face"); + RNA_def_property_ui_text(prop, "face normal", "local space unit length normal vector for this face"); prop= RNA_def_property(srna, "area", PROP_FLOAT, PROP_UNSIGNED); RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_float_funcs(prop, "rna_MeshFace_area_get", NULL, NULL); - RNA_def_property_ui_text(prop, "Face area", "Read only area of the face"); + RNA_def_property_ui_text(prop, "face area", "read only area of the face"); prop= RNA_def_property(srna, "index", PROP_INT, PROP_UNSIGNED); RNA_def_property_clear_flag(prop, PROP_EDITABLE); @@ -1361,11 +1320,104 @@ static void rna_def_mface(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Index", "Index number of the vertex"); } -static void rna_def_mtface(BlenderRNA *brna) + +static void rna_def_mloop(BlenderRNA *brna) +{ + StructRNA *srna; + PropertyRNA *prop; + + srna= RNA_def_struct(brna, "MeshLoop", NULL); + RNA_def_struct_sdna(srna, "MLoop"); + RNA_def_struct_ui_text(srna, "Mesh Loop", "Loop in a Mesh datablock"); + RNA_def_struct_path_func(srna, "rna_MeshLoop_path"); + RNA_def_struct_ui_icon(srna, ICON_EDGESEL); + + prop= RNA_def_property(srna, "vertex_index", PROP_INT, PROP_UNSIGNED); + RNA_def_property_int_sdna(prop, NULL, "v"); + RNA_def_property_ui_text(prop, "Vertex", "Vertex index"); + + prop= RNA_def_property(srna, "edge_index", PROP_INT, PROP_UNSIGNED); + RNA_def_property_int_sdna(prop, NULL, "e"); + RNA_def_property_ui_text(prop, "Edge", "Edge index"); +} + +static void rna_def_mpolygon(BlenderRNA *brna) +{ + StructRNA *srna; + PropertyRNA *prop; + + srna= RNA_def_struct(brna, "MeshPolygon", NULL); + RNA_def_struct_sdna(srna, "MPoly"); + RNA_def_struct_ui_text(srna, "Mesh Polygon", "Polygon in a Mesh datablock"); + RNA_def_struct_path_func(srna, "rna_MeshPolygon_path"); + RNA_def_struct_ui_icon(srna, ICON_FACESEL); + + /* faked, actually access to loop vertex values, dont this way because manually setting up vertex/edge per loop is very low level + * instead we setup poly sizes, assign indicies, then calc edges automatic when creating meshes from rna/py */ + prop= RNA_def_property(srna, "vertices", PROP_INT, PROP_UNSIGNED); + RNA_def_property_array(prop, 3); // eek, this is still used in some cases but infact we dont want to use it at all here. + RNA_def_property_flag(prop, PROP_DYNAMIC); + RNA_def_property_dynamic_array_funcs(prop, "rna_MeshPoly_vertices_get_length"); + RNA_def_property_int_funcs(prop, "rna_MeshPoly_vertices_get", "rna_MeshPoly_vertices_set", NULL); + RNA_def_property_ui_text(prop, "Vertices", "Vertex indices"); + + /* these are both very low level access */ + prop= RNA_def_property(srna, "loop_start", PROP_INT, PROP_UNSIGNED); + RNA_def_property_int_sdna(prop, NULL, "loopstart"); + RNA_def_property_ui_text(prop, "Loop Start", ""); + /* also low level */ + prop= RNA_def_property(srna, "loop_total", PROP_INT, PROP_UNSIGNED); + RNA_def_property_int_sdna(prop, NULL, "totloop"); + RNA_def_property_ui_text(prop, "Loop Total", ""); + + prop= RNA_def_property(srna, "material_index", PROP_INT, PROP_UNSIGNED); + RNA_def_property_int_sdna(prop, NULL, "mat_nr"); + RNA_def_property_ui_text(prop, "Material Index", ""); + RNA_def_property_int_funcs(prop, NULL, NULL, "rna_MeshFace_material_index_range"); + RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); + + prop= RNA_def_property(srna, "select", PROP_BOOLEAN, PROP_NONE); + RNA_def_property_boolean_sdna(prop, NULL, "flag", ME_FACE_SEL); + RNA_def_property_ui_text(prop, "Select", ""); + RNA_def_property_update(prop, 0, "rna_Mesh_update_select"); + + prop= RNA_def_property(srna, "hide", PROP_BOOLEAN, PROP_NONE); + RNA_def_property_boolean_sdna(prop, NULL, "flag", ME_HIDE); + RNA_def_property_ui_text(prop, "Hide", ""); + RNA_def_property_update(prop, 0, "rna_Mesh_update_select"); + + prop= RNA_def_property(srna, "use_smooth", PROP_BOOLEAN, PROP_NONE); + RNA_def_property_boolean_sdna(prop, NULL, "flag", ME_SMOOTH); + RNA_def_property_ui_text(prop, "Smooth", ""); + RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); + + prop= RNA_def_property(srna, "normal", PROP_FLOAT, PROP_DIRECTION); + RNA_def_property_array(prop, 3); + RNA_def_property_range(prop, -1.0f, 1.0f); + RNA_def_property_clear_flag(prop, PROP_EDITABLE); + RNA_def_property_float_funcs(prop, "rna_MeshPolygon_normal_get", NULL, NULL); + RNA_def_property_ui_text(prop, "face normal", "local space unit length normal vector for this polygon"); + +#if 0 /* BMESH_TODO */ + prop= RNA_def_property(srna, "area", PROP_FLOAT, PROP_UNSIGNED); + RNA_def_property_clear_flag(prop, PROP_EDITABLE); + RNA_def_property_float_funcs(prop, "rna_MeshPolygon_area_get", NULL, NULL); + RNA_def_property_ui_text(prop, "face area", "read only area of the face"); +#endif + + prop= RNA_def_property(srna, "index", PROP_INT, PROP_UNSIGNED); + RNA_def_property_clear_flag(prop, PROP_EDITABLE); + RNA_def_property_int_funcs(prop, "rna_MeshPolygon_index_get", NULL, NULL); + RNA_def_property_ui_text(prop, "Index", "Index number of the vertex"); +} + +static void rna_def_mtexpoly(BlenderRNA *brna) { StructRNA *srna; PropertyRNA *prop; - const int uv_dim[]= {4, 2}; +#if 0 /* BMESH_TODO: needed later when do another todo */ + int uv_dim[]= {4, 2}; +#endif srna= RNA_def_struct(brna, "MeshTextureFaceLayer", NULL); RNA_def_struct_ui_text(srna, "Mesh Texture Face Layer", "Layer of texture faces in a Mesh datablock"); @@ -1386,8 +1438,7 @@ static void rna_def_mtface(BlenderRNA *brna) prop= RNA_def_property(srna, "active_render", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "active_rnd", 0); - RNA_def_property_boolean_funcs(prop, "rna_MeshTextureFaceLayer_active_render_get", - "rna_MeshTextureFaceLayer_active_render_set"); + RNA_def_property_boolean_funcs(prop, "rna_MeshTextureFaceLayer_active_render_get", "rna_MeshTextureFaceLayer_active_render_set"); RNA_def_property_ui_text(prop, "Active Render", "Set the layer as active for rendering"); RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); @@ -1400,12 +1451,10 @@ static void rna_def_mtface(BlenderRNA *brna) prop= RNA_def_property(srna, "data", PROP_COLLECTION, PROP_NONE); RNA_def_property_struct_type(prop, "MeshTextureFace"); RNA_def_property_ui_text(prop, "Data", ""); - RNA_def_property_collection_funcs(prop, "rna_MeshTextureFaceLayer_data_begin", "rna_iterator_array_next", - "rna_iterator_array_end", "rna_iterator_array_get", - "rna_MeshTextureFaceLayer_data_length", NULL, NULL, NULL); + RNA_def_property_collection_funcs(prop, "rna_MeshTextureFaceLayer_data_begin", "rna_iterator_array_next", "rna_iterator_array_end", "rna_iterator_array_get", "rna_MeshTextureFaceLayer_data_length", NULL, NULL, NULL); srna= RNA_def_struct(brna, "MeshTextureFace", NULL); - RNA_def_struct_sdna(srna, "MTFace"); + RNA_def_struct_sdna(srna, "MTexPoly"); RNA_def_struct_ui_text(srna, "Mesh Texture Face", "UV mapping, texturing and game engine data for a face"); RNA_def_struct_path_func(srna, "rna_MeshTextureFace_path"); RNA_def_struct_ui_icon(srna, ICON_FACESEL_HLT); @@ -1423,36 +1472,13 @@ static void rna_def_mtface(BlenderRNA *brna) RNA_def_property_ui_text(prop, "UV Selected", ""); RNA_def_property_update(prop, 0, "rna_Mesh_update_select"); +#if 0 /*BMESH_TODO*/ prop= RNA_def_property(srna, "pin_uv", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "unwrap", TF_PIN1); RNA_def_property_array(prop, 4); RNA_def_property_ui_text(prop, "UV Pinned", ""); RNA_def_property_update(prop, 0, "rna_Mesh_update_select"); - prop= RNA_def_property(srna, "uv1", PROP_FLOAT, PROP_XYZ); - RNA_def_property_array(prop, 2); - RNA_def_property_float_funcs(prop, "rna_MeshTextureFace_uv1_get", "rna_MeshTextureFace_uv1_set", NULL); - RNA_def_property_ui_text(prop, "UV 1", ""); - RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); - - prop= RNA_def_property(srna, "uv2", PROP_FLOAT, PROP_XYZ); - RNA_def_property_array(prop, 2); - RNA_def_property_float_funcs(prop, "rna_MeshTextureFace_uv2_get", "rna_MeshTextureFace_uv2_set", NULL); - RNA_def_property_ui_text(prop, "UV 2", ""); - RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); - - prop= RNA_def_property(srna, "uv3", PROP_FLOAT, PROP_XYZ); - RNA_def_property_array(prop, 2); - RNA_def_property_float_funcs(prop, "rna_MeshTextureFace_uv3_get", "rna_MeshTextureFace_uv3_set", NULL); - RNA_def_property_ui_text(prop, "UV 3", ""); - RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); - - prop= RNA_def_property(srna, "uv4", PROP_FLOAT, PROP_XYZ); - RNA_def_property_array(prop, 2); - RNA_def_property_float_funcs(prop, "rna_MeshTextureFace_uv4_get", "rna_MeshTextureFace_uv4_set", NULL); - RNA_def_property_ui_text(prop, "UV 4", ""); - RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); - prop= RNA_def_property(srna, "uv", PROP_FLOAT, PROP_NONE); RNA_def_property_multi_array(prop, 2, uv_dim); RNA_def_property_flag(prop, PROP_DYNAMIC); @@ -1465,7 +1491,7 @@ static void rna_def_mtface(BlenderRNA *brna) RNA_def_property_multi_array(prop, 2, uv_dim); RNA_def_property_float_sdna(prop, NULL, "uv"); RNA_def_property_ui_text(prop, "UV", "Fixed size UV coordinates array"); - +#endif } static void rna_def_msticky(BlenderRNA *brna) @@ -1483,7 +1509,7 @@ static void rna_def_msticky(BlenderRNA *brna) RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); } -static void rna_def_mcol(BlenderRNA *brna) +static void rna_def_mloopcol(BlenderRNA *brna) { StructRNA *srna; PropertyRNA *prop; @@ -1514,41 +1540,13 @@ static void rna_def_mcol(BlenderRNA *brna) prop= RNA_def_property(srna, "data", PROP_COLLECTION, PROP_NONE); RNA_def_property_struct_type(prop, "MeshColor"); RNA_def_property_ui_text(prop, "Data", ""); - RNA_def_property_collection_funcs(prop, "rna_MeshColorLayer_data_begin", "rna_iterator_array_next", - "rna_iterator_array_end", "rna_iterator_array_get", - "rna_MeshColorLayer_data_length", NULL, NULL, NULL); + RNA_def_property_collection_funcs(prop, "rna_MeshColorLayer_data_begin", "rna_iterator_array_next", "rna_iterator_array_end", "rna_iterator_array_get", "rna_MeshColorLayer_data_length", NULL, NULL, NULL); srna= RNA_def_struct(brna, "MeshColor", NULL); RNA_def_struct_sdna(srna, "MCol"); RNA_def_struct_ui_text(srna, "Mesh Vertex Color", "Vertex colors for a face in a Mesh"); RNA_def_struct_path_func(srna, "rna_MeshColor_path"); - prop= RNA_def_property(srna, "color1", PROP_FLOAT, PROP_COLOR); - RNA_def_property_array(prop, 3); - RNA_def_property_range(prop, 0.0f, 1.0f); - RNA_def_property_float_funcs(prop, "rna_MeshColor_color1_get", "rna_MeshColor_color1_set", NULL); - RNA_def_property_ui_text(prop, "Color 1", ""); - RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); - - prop= RNA_def_property(srna, "color2", PROP_FLOAT, PROP_COLOR); - RNA_def_property_array(prop, 3); - RNA_def_property_range(prop, 0.0f, 1.0f); - RNA_def_property_float_funcs(prop, "rna_MeshColor_color2_get", "rna_MeshColor_color2_set", NULL); - RNA_def_property_ui_text(prop, "Color 2", ""); - RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); - - prop= RNA_def_property(srna, "color3", PROP_FLOAT, PROP_COLOR); - RNA_def_property_array(prop, 3); - RNA_def_property_range(prop, 0.0f, 1.0f); - RNA_def_property_float_funcs(prop, "rna_MeshColor_color3_get", "rna_MeshColor_color3_set", NULL); - RNA_def_property_ui_text(prop, "Color 3", ""); - RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); - - prop= RNA_def_property(srna, "color4", PROP_FLOAT, PROP_COLOR); - RNA_def_property_array(prop, 3); - RNA_def_property_range(prop, 0.0f, 1.0f); - RNA_def_property_float_funcs(prop, "rna_MeshColor_color4_get", "rna_MeshColor_color4_set", NULL); - RNA_def_property_ui_text(prop, "Color 4", ""); RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); } @@ -1571,9 +1569,7 @@ static void rna_def_mproperties(BlenderRNA *brna) prop= RNA_def_property(srna, "data", PROP_COLLECTION, PROP_NONE); RNA_def_property_struct_type(prop, "MeshFloatProperty"); RNA_def_property_ui_text(prop, "Data", ""); - RNA_def_property_collection_funcs(prop, "rna_MeshFloatPropertyLayer_data_begin", "rna_iterator_array_next", - "rna_iterator_array_end", "rna_iterator_array_get", - "rna_MeshFloatPropertyLayer_data_length", NULL, NULL, NULL); + RNA_def_property_collection_funcs(prop, "rna_MeshFloatPropertyLayer_data_begin", "rna_iterator_array_next", "rna_iterator_array_end", "rna_iterator_array_get", "rna_MeshFloatPropertyLayer_data_length", NULL, NULL, NULL); srna= RNA_def_struct(brna, "MeshFloatProperty", NULL); RNA_def_struct_sdna(srna, "MFloatProperty"); @@ -1599,9 +1595,7 @@ static void rna_def_mproperties(BlenderRNA *brna) prop= RNA_def_property(srna, "data", PROP_COLLECTION, PROP_NONE); RNA_def_property_struct_type(prop, "MeshIntProperty"); RNA_def_property_ui_text(prop, "Data", ""); - RNA_def_property_collection_funcs(prop, "rna_MeshIntPropertyLayer_data_begin", "rna_iterator_array_next", - "rna_iterator_array_end", "rna_iterator_array_get", - "rna_MeshIntPropertyLayer_data_length", NULL, NULL, NULL); + RNA_def_property_collection_funcs(prop, "rna_MeshIntPropertyLayer_data_begin", "rna_iterator_array_next", "rna_iterator_array_end", "rna_iterator_array_get", "rna_MeshIntPropertyLayer_data_length", NULL, NULL, NULL); srna= RNA_def_struct(brna, "MeshIntProperty", NULL); RNA_def_struct_sdna(srna, "MIntProperty"); @@ -1627,9 +1621,7 @@ static void rna_def_mproperties(BlenderRNA *brna) prop= RNA_def_property(srna, "data", PROP_COLLECTION, PROP_NONE); RNA_def_property_struct_type(prop, "MeshStringProperty"); RNA_def_property_ui_text(prop, "Data", ""); - RNA_def_property_collection_funcs(prop, "rna_MeshStringPropertyLayer_data_begin", "rna_iterator_array_next", - "rna_iterator_array_end", "rna_iterator_array_get", - "rna_MeshStringPropertyLayer_data_length", NULL, NULL, NULL); + RNA_def_property_collection_funcs(prop, "rna_MeshStringPropertyLayer_data_begin", "rna_iterator_array_next", "rna_iterator_array_end", "rna_iterator_array_get", "rna_MeshStringPropertyLayer_data_length", NULL, NULL, NULL); srna= RNA_def_struct(brna, "MeshStringProperty", NULL); RNA_def_struct_sdna(srna, "MStringProperty"); @@ -1642,6 +1634,45 @@ static void rna_def_mproperties(BlenderRNA *brna) RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); } +void rna_def_texmat_common(StructRNA *srna, const char *texspace_editable) +{ + PropertyRNA *prop; + + /* texture space */ + prop= RNA_def_property(srna, "auto_texspace", PROP_BOOLEAN, PROP_NONE); + RNA_def_property_boolean_sdna(prop, NULL, "texflag", AUTOSPACE); + RNA_def_property_ui_text(prop, "Auto Texture Space", "Adjusts active object's texture space automatically when transforming object"); + + prop= RNA_def_property(srna, "texspace_loc", PROP_FLOAT, PROP_TRANSLATION); + RNA_def_property_float_sdna(prop, NULL, "loc"); + RNA_def_property_ui_text(prop, "Texure Space Location", "Texture space location"); + RNA_def_property_editable_func(prop, texspace_editable); + RNA_def_property_update(prop, 0, "rna_Mesh_update_draw"); + + prop= RNA_def_property(srna, "texspace_size", PROP_FLOAT, PROP_XYZ); + RNA_def_property_float_sdna(prop, NULL, "size"); + RNA_def_property_ui_text(prop, "Texture Space Size", "Texture space size"); + RNA_def_property_editable_func(prop, texspace_editable); + RNA_def_property_update(prop, 0, "rna_Mesh_update_draw"); + + /* not supported yet + prop= RNA_def_property(srna, "texspace_rot", PROP_FLOAT, PROP_EULER); + RNA_def_property_float(prop, NULL, "rot"); + RNA_def_property_ui_text(prop, "Texture Space Rotation", "Texture space rotation"); + RNA_def_property_editable_func(prop, texspace_editable); + RNA_def_property_update(prop, 0, "rna_Mesh_update_draw");*/ + + /* materials */ + prop= RNA_def_property(srna, "materials", PROP_COLLECTION, PROP_NONE); + RNA_def_property_collection_sdna(prop, NULL, "mat", "totcol"); + RNA_def_property_struct_type(prop, "Material"); + RNA_def_property_ui_text(prop, "Materials", ""); + RNA_def_property_srna(prop, "IDMaterials"); /* see rna_ID.c */ + RNA_def_property_collection_funcs(prop, 0, NULL, NULL, NULL, NULL, NULL, NULL, "rna_IDMaterials_assign_int"); +} + + +/* scene.objects */ /* mesh.vertices */ static void rna_def_mesh_vertices(BlenderRNA *brna, PropertyRNA *cprop) { @@ -1687,7 +1718,7 @@ static void rna_def_mesh_faces(BlenderRNA *brna, PropertyRNA *cprop) PropertyRNA *prop; FunctionRNA *func; - /*PropertyRNA *parm;*/ + PropertyRNA *parm; RNA_def_property_srna(cprop, "MeshFaces"); srna= RNA_def_struct(brna, "MeshFaces", NULL); @@ -1698,17 +1729,64 @@ static void rna_def_mesh_faces(BlenderRNA *brna, PropertyRNA *cprop) RNA_def_property_int_sdna(prop, NULL, "act_face"); RNA_def_property_ui_text(prop, "Active Face", "The active face for this mesh"); - prop= RNA_def_property(srna, "active_tface", PROP_POINTER, PROP_UNSIGNED); - RNA_def_property_struct_type(prop, "MeshTextureFace"); - RNA_def_property_pointer_funcs(prop, "rna_Mesh_active_mtface_get", NULL, NULL, NULL); - RNA_def_property_ui_text(prop, "Active Texture Face", "Active Texture Face"); - RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); - func= RNA_def_function(srna, "add", "ED_mesh_faces_add"); RNA_def_function_flag(func, FUNC_USE_REPORTS); - RNA_def_int(func, "count", 0, 0, INT_MAX, "Count", "Number of vertices to add", 0, INT_MAX); + parm= RNA_def_int(func, "count", 0, 0, INT_MAX, "Count", "Number of vertices to add", 0, INT_MAX); +} + +/* mesh.loops */ +static void rna_def_mesh_loops(BlenderRNA *brna, PropertyRNA *cprop) +{ + StructRNA *srna; + + /*PropertyRNA *prop;*/ + + FunctionRNA *func; + /*PropertyRNA *parm;*/ + + RNA_def_property_srna(cprop, "MeshLoops"); + srna= RNA_def_struct(brna, "MeshLoops", NULL); + RNA_def_struct_sdna(srna, "Mesh"); + RNA_def_struct_ui_text(srna, "Mesh Loops", "Collection of mesh loops"); + +#if 0 // BMESH_TODO + prop= RNA_def_property(srna, "active", PROP_INT, PROP_NONE); + RNA_def_property_int_sdna(prop, NULL, "act_face"); + RNA_def_property_ui_text(prop, "Active Polygon", "The active polygon for this mesh"); +#endif + + func= RNA_def_function(srna, "add", "ED_mesh_loops_add"); + RNA_def_function_flag(func, FUNC_USE_REPORTS); + RNA_def_int(func, "count", 0, 0, INT_MAX, "Count", "Number of loops to add", 0, INT_MAX); } +/* mesh.polygons */ +static void rna_def_mesh_polygons(BlenderRNA *brna, PropertyRNA *cprop) +{ + StructRNA *srna; + +// PropertyRNA *prop; + + FunctionRNA *func; + PropertyRNA *parm; + + RNA_def_property_srna(cprop, "MeshPolygons"); + srna= RNA_def_struct(brna, "MeshPolygons", NULL); + RNA_def_struct_sdna(srna, "Mesh"); + RNA_def_struct_ui_text(srna, "Mesh Polygons", "Collection of mesh polygons"); + +#if 0 // BMESH_TODO + prop= RNA_def_property(srna, "active", PROP_INT, PROP_NONE); + RNA_def_property_int_sdna(prop, NULL, "act_face"); + RNA_def_property_ui_text(prop, "Active Polygon", "The active polygon for this mesh"); +#endif + + func= RNA_def_function(srna, "add", "ED_mesh_polys_add"); + RNA_def_function_flag(func, FUNC_USE_REPORTS); + parm= RNA_def_int(func, "count", 0, 0, INT_MAX, "Count", "Number of polygons to add", 0, INT_MAX); +} + + /* mesh.vertex_colors */ static void rna_def_vertex_colors(BlenderRNA *brna, PropertyRNA *cprop) { @@ -1786,8 +1864,7 @@ static void rna_def_uv_textures(BlenderRNA *brna, PropertyRNA *cprop) RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); prop= RNA_def_property(srna, "active_index", PROP_INT, PROP_UNSIGNED); - RNA_def_property_int_funcs(prop, "rna_Mesh_active_uv_texture_index_get", - "rna_Mesh_active_uv_texture_index_set", "rna_Mesh_active_uv_texture_index_range"); + RNA_def_property_int_funcs(prop, "rna_Mesh_active_uv_texture_index_get", "rna_Mesh_active_uv_texture_index_set", "rna_Mesh_active_uv_texture_index_range"); RNA_def_property_ui_text(prop, "Active UV Texture Index", "Active UV texture index"); RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); } @@ -1819,6 +1896,18 @@ static void rna_def_mesh(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Faces", "Faces of the mesh"); rna_def_mesh_faces(brna, prop); + prop= RNA_def_property(srna, "loops", PROP_COLLECTION, PROP_NONE); + RNA_def_property_collection_sdna(prop, NULL, "mloop", "totloop"); + RNA_def_property_struct_type(prop, "MeshLoop"); + RNA_def_property_ui_text(prop, "Loops", "Loops of the mesh"); + rna_def_mesh_loops(brna, prop); + + prop= RNA_def_property(srna, "polygons", PROP_COLLECTION, PROP_NONE); + RNA_def_property_collection_sdna(prop, NULL, "mpoly", "totpoly"); + RNA_def_property_struct_type(prop, "MeshPolygon"); + RNA_def_property_ui_text(prop, "Polygons", "Polygons of the mesh"); + rna_def_mesh_polygons(brna, prop); + prop= RNA_def_property(srna, "sticky", PROP_COLLECTION, PROP_NONE); RNA_def_property_collection_sdna(prop, NULL, "msticky", "totvert"); RNA_def_property_struct_type(prop, "MeshSticky"); @@ -1828,11 +1917,11 @@ static void rna_def_mesh(BlenderRNA *brna) prop= RNA_def_property(srna, "texture_mesh", PROP_POINTER, PROP_NONE); RNA_def_property_pointer_sdna(prop, NULL, "texcomesh"); RNA_def_property_flag(prop, PROP_EDITABLE|PROP_ID_SELF_CHECK); - RNA_def_property_ui_text(prop, "Texture Mesh", "Use another mesh for texture indices (vertex indices must be aligned)"); + RNA_def_property_ui_text(prop, "Texture Mesh", "Use another mesh for texture indicies (vertex indicies must be aligned)"); /* UV textures */ prop= RNA_def_property(srna, "uv_textures", PROP_COLLECTION, PROP_NONE); - RNA_def_property_collection_sdna(prop, NULL, "fdata.layers", "fdata.totlayer"); + RNA_def_property_collection_sdna(prop, NULL, "pdata.layers", "pdata.totlayer"); RNA_def_property_collection_funcs(prop, "rna_Mesh_uv_textures_begin", NULL, NULL, NULL, "rna_Mesh_uv_textures_length", NULL, NULL, NULL); RNA_def_property_struct_type(prop, "MeshTextureFaceLayer"); @@ -1846,8 +1935,7 @@ static void rna_def_mesh(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Clone UV Texture", "UV texture to be used as cloning source"); prop= RNA_def_property(srna, "uv_texture_clone_index", PROP_INT, PROP_UNSIGNED); - RNA_def_property_int_funcs(prop, "rna_Mesh_uv_texture_clone_index_get", - "rna_Mesh_uv_texture_clone_index_set", "rna_Mesh_active_uv_texture_index_range"); + RNA_def_property_int_funcs(prop, "rna_Mesh_uv_texture_clone_index_get", "rna_Mesh_uv_texture_clone_index_set", "rna_Mesh_active_uv_texture_index_range"); RNA_def_property_ui_text(prop, "Clone UV Texture Index", "Clone UV texture index"); prop= RNA_def_property(srna, "uv_texture_stencil", PROP_POINTER, PROP_UNSIGNED); @@ -1863,7 +1951,7 @@ static void rna_def_mesh(BlenderRNA *brna) /* Vertex colors */ prop= RNA_def_property(srna, "vertex_colors", PROP_COLLECTION, PROP_NONE); - RNA_def_property_collection_sdna(prop, NULL, "fdata.layers", "fdata.totlayer"); + RNA_def_property_collection_sdna(prop, NULL, "ldata.layers", "ldata.totlayer"); RNA_def_property_collection_funcs(prop, "rna_Mesh_vertex_colors_begin", NULL, NULL, NULL, "rna_Mesh_vertex_colors_length", NULL, NULL, NULL); RNA_def_property_struct_type(prop, "MeshColorLayer"); @@ -1871,21 +1959,21 @@ static void rna_def_mesh(BlenderRNA *brna) rna_def_vertex_colors(brna, prop); prop= RNA_def_property(srna, "layers_float", PROP_COLLECTION, PROP_NONE); - RNA_def_property_collection_sdna(prop, NULL, "fdata.layers", "fdata.totlayer"); + RNA_def_property_collection_sdna(prop, NULL, "pdata.layers", "pdata.totlayer"); RNA_def_property_collection_funcs(prop, "rna_Mesh_float_layers_begin", NULL, NULL, NULL, "rna_Mesh_float_layers_length", NULL, NULL, NULL); RNA_def_property_struct_type(prop, "MeshFloatPropertyLayer"); RNA_def_property_ui_text(prop, "Float Property Layers", ""); prop= RNA_def_property(srna, "layers_int", PROP_COLLECTION, PROP_NONE); - RNA_def_property_collection_sdna(prop, NULL, "fdata.layers", "fdata.totlayer"); + RNA_def_property_collection_sdna(prop, NULL, "pdata.layers", "pdata.totlayer"); RNA_def_property_collection_funcs(prop, "rna_Mesh_int_layers_begin", NULL, NULL, NULL, "rna_Mesh_int_layers_length", NULL, NULL, NULL); RNA_def_property_struct_type(prop, "MeshIntPropertyLayer"); RNA_def_property_ui_text(prop, "Int Property Layers", ""); prop= RNA_def_property(srna, "layers_string", PROP_COLLECTION, PROP_NONE); - RNA_def_property_collection_sdna(prop, NULL, "fdata.layers", "fdata.totlayer"); + RNA_def_property_collection_sdna(prop, NULL, "pdata.layers", "pdata.totlayer"); RNA_def_property_collection_funcs(prop, "rna_Mesh_string_layers_begin", NULL, NULL, NULL, "rna_Mesh_string_layers_length", NULL, NULL, NULL); RNA_def_property_struct_type(prop, "MeshStringPropertyLayer"); @@ -1893,9 +1981,7 @@ static void rna_def_mesh(BlenderRNA *brna) prop= RNA_def_property(srna, "use_auto_smooth", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", ME_AUTOSMOOTH); - RNA_def_property_ui_text(prop, "Auto Smooth", - "Treat all set-smoothed faces with angles less than the " - "specified angle as 'smooth' during render"); + RNA_def_property_ui_text(prop, "Auto Smooth", "Treats all set-smoothed faces with angles less than the specified angle as 'smooth' during render"); #if 1 /* expose as radians */ prop= RNA_def_property(srna, "auto_smooth_angle", PROP_FLOAT, PROP_ANGLE); @@ -1906,8 +1992,7 @@ static void rna_def_mesh(BlenderRNA *brna) RNA_def_property_int_sdna(prop, NULL, "smoothresh"); RNA_def_property_range(prop, 1, 80); #endif - RNA_def_property_ui_text(prop, "Auto Smooth Angle", - "Maximum angle between face normals that 'Auto Smooth' will operate on"); + RNA_def_property_ui_text(prop, "Auto Smooth Angle", "Defines maximum angle between face normals that 'Auto Smooth' will operate on"); prop= RNA_def_property(srna, "show_double_sided", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", ME_TWOSIDED); @@ -1926,23 +2011,15 @@ static void rna_def_mesh(BlenderRNA *brna) /* texture space */ prop= RNA_def_property(srna, "use_auto_texspace", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "texflag", AUTOSPACE); - RNA_def_property_ui_text(prop, "Auto Texture Space", - "Adjust active object's texture space automatically when transforming object"); - RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, "rna_Mesh_texspace_set"); + RNA_def_property_ui_text(prop, "Auto Texture Space", "Adjusts active object's texture space automatically when transforming object"); - prop= RNA_def_property(srna, "texspace_location", PROP_FLOAT, PROP_TRANSLATION); + /*prop= RNA_def_property(srna, "texspace_location", PROP_FLOAT, PROP_TRANSLATION); RNA_def_property_array(prop, 3); RNA_def_property_ui_text(prop, "Texture Space Location", "Texture space location"); RNA_def_property_editable_func(prop, "rna_Mesh_texspace_editable"); RNA_def_property_float_funcs(prop, "rna_Mesh_texspace_loc_get", "rna_Mesh_texspace_loc_set", NULL); RNA_def_property_update(prop, 0, "rna_Mesh_update_draw"); - - prop= RNA_def_property(srna, "texspace_size", PROP_FLOAT, PROP_XYZ); - RNA_def_property_array(prop, 3); - RNA_def_property_ui_text(prop, "Texture Space Size", "Texture space size"); - RNA_def_property_editable_func(prop, "rna_Mesh_texspace_editable"); - RNA_def_property_float_funcs(prop, "rna_Mesh_texspace_size_get", "rna_Mesh_texspace_size_set", NULL); - RNA_def_property_update(prop, 0, "rna_Mesh_update_draw"); + */ /* not supported yet prop= RNA_def_property(srna, "texspace_rot", PROP_FLOAT, PROP_EULER); @@ -1951,79 +2028,67 @@ static void rna_def_mesh(BlenderRNA *brna) RNA_def_property_editable_func(prop, texspace_editable); RNA_def_property_update(prop, 0, "rna_Mesh_update_draw"); */ - - /* materials */ - prop= RNA_def_property(srna, "materials", PROP_COLLECTION, PROP_NONE); - RNA_def_property_collection_sdna(prop, NULL, "mat", "totcol"); - RNA_def_property_struct_type(prop, "Material"); - RNA_def_property_ui_text(prop, "Materials", ""); - RNA_def_property_srna(prop, "IDMaterials"); /* see rna_ID.c */ - RNA_def_property_collection_funcs(prop, 0, NULL, NULL, NULL, NULL, NULL, NULL, "rna_IDMaterials_assign_int"); /* Mesh Draw Options for Edit Mode*/ prop= RNA_def_property(srna, "show_edges", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "drawflag", ME_DRAWEDGES); - RNA_def_property_ui_text(prop, "Draw Edges", "Display selected edges using highlights in the 3D view and UV editor"); + RNA_def_property_ui_text(prop, "Draw Edges", "Displays selected edges using hilights in the 3D view and UV editor"); RNA_def_property_update(prop, 0, "rna_Mesh_update_draw"); prop= RNA_def_property(srna, "show_all_edges", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "drawflag", ME_ALLEDGES); - RNA_def_property_ui_text(prop, "All Edges", "Display all edges for wireframe in all view modes in the 3D view"); + RNA_def_property_ui_text(prop, "All Edges", "Displays all edges for wireframe in all view modes in the 3D view"); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, NULL); prop= RNA_def_property(srna, "show_faces", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "drawflag", ME_DRAWFACES); - RNA_def_property_ui_text(prop, "Draw Faces", "Display all faces as shades in the 3D view and UV editor"); + RNA_def_property_ui_text(prop, "Draw Faces", "Displays all faces as shades in the 3D view and UV editor"); RNA_def_property_update(prop, 0, "rna_Mesh_update_draw"); prop= RNA_def_property(srna, "show_normal_face", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "drawflag", ME_DRAWNORMALS); - RNA_def_property_ui_text(prop, "Draw Normals", "Display face normals as lines"); + RNA_def_property_ui_text(prop, "Draw Normals", "Displays face normals as lines"); RNA_def_property_update(prop, 0, "rna_Mesh_update_draw"); prop= RNA_def_property(srna, "show_normal_vertex", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "drawflag", ME_DRAW_VNORMALS); - RNA_def_property_ui_text(prop, "Draw Vertex Normals", "Display vertex normals as lines"); + RNA_def_property_ui_text(prop, "Draw Vertex Normals", "Displays vertex normals as lines"); RNA_def_property_update(prop, 0, "rna_Mesh_update_draw"); prop= RNA_def_property(srna, "show_edge_crease", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "drawflag", ME_DRAWCREASES); - RNA_def_property_ui_text(prop, "Draw Creases", "Display creases created for subsurf weighting"); + RNA_def_property_ui_text(prop, "Draw Creases", "Displays creases created for subsurf weighting"); RNA_def_property_update(prop, 0, "rna_Mesh_update_draw"); prop= RNA_def_property(srna, "show_edge_bevel_weight", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "drawflag", ME_DRAWBWEIGHTS); - RNA_def_property_ui_text(prop, "Draw Bevel Weights", "Display weights created for the Bevel modifier"); + RNA_def_property_ui_text(prop, "Draw Bevel Weights", "Displays weights created for the Bevel modifier"); RNA_def_property_update(prop, 0, "rna_Mesh_update_draw"); prop= RNA_def_property(srna, "show_edge_seams", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "drawflag", ME_DRAWSEAMS); - RNA_def_property_ui_text(prop, "Draw Seams", "Display UV unwrapping seams"); + RNA_def_property_ui_text(prop, "Draw Seams", "Displays UV unwrapping seams"); RNA_def_property_update(prop, 0, "rna_Mesh_update_draw"); prop= RNA_def_property(srna, "show_edge_sharp", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "drawflag", ME_DRAWSHARP); - RNA_def_property_ui_text(prop, "Draw Sharp", "Display sharp edges, used with the EdgeSplit modifier"); + RNA_def_property_ui_text(prop, "Draw Sharp", "Displays sharp edges, used with the EdgeSplit modifier"); RNA_def_property_update(prop, 0, "rna_Mesh_update_draw"); prop= RNA_def_property(srna, "show_extra_edge_length", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "drawflag", ME_DRAWEXTRA_EDGELEN); - RNA_def_property_ui_text(prop, "Edge Length", - "Display selected edge lengths, using global values when set in the transform panel"); + RNA_def_property_ui_text(prop, "Edge Length", "Displays selected edge lengths, Using global values when set in the transform panel"); RNA_def_property_update(prop, 0, "rna_Mesh_update_draw"); prop= RNA_def_property(srna, "show_extra_face_angle", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "drawflag", ME_DRAWEXTRA_FACEANG); - RNA_def_property_ui_text(prop, "Faces Angles", - "Display the angles between the selected edges in degrees, using " - "global values when set in the transform panel"); + RNA_def_property_ui_text(prop, "Face Angles", "Displays the angles in the selected edges in degrees, Using global values when set in the transform panel"); RNA_def_property_update(prop, 0, "rna_Mesh_update_draw"); prop= RNA_def_property(srna, "show_extra_face_area", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "drawflag", ME_DRAWEXTRA_FACEAREA); - RNA_def_property_ui_text(prop, "Face Area", - "Display the area of selected faces, using global values when set in the transform panel"); + RNA_def_property_ui_text(prop, "Face Area", "Displays the area of selected faces, Using global values when set in the transform panel"); RNA_def_property_update(prop, 0, "rna_Mesh_update_draw"); /* editflag */ @@ -2043,8 +2108,7 @@ static void rna_def_mesh(BlenderRNA *brna) prop= RNA_def_property(srna, "use_mirror_topology", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "editflag", ME_EDIT_MIRROR_TOPO); - RNA_def_property_ui_text(prop, "Topology Mirror", - "Use topology based mirroring (for when both sides of mesh have matching, unique topology)"); + RNA_def_property_ui_text(prop, "Topology Mirror", "Use topology based mirroring. For when both sides of mesh have matching, unique topology"); prop= RNA_def_property(srna, "use_paint_mask", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "editflag", ME_EDIT_PAINT_MASK); @@ -2077,6 +2141,7 @@ static void rna_def_mesh(BlenderRNA *brna) /* pointers */ rna_def_animdata_common(srna); + rna_def_texmat_common(srna, "rna_Mesh_texspace_editable"); RNA_api_mesh(srna); } @@ -2088,9 +2153,11 @@ void RNA_def_mesh(BlenderRNA *brna) rna_def_mvert_group(brna); rna_def_medge(brna); rna_def_mface(brna); - rna_def_mtface(brna); + rna_def_mloop(brna); + rna_def_mpolygon(brna); + rna_def_mtexpoly(brna); rna_def_msticky(brna); - rna_def_mcol(brna); + rna_def_mloopcol(brna); rna_def_mproperties(brna); } |