diff options
Diffstat (limited to 'source/blender/makesrna/intern')
18 files changed, 300 insertions, 368 deletions
diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt index 9cafca3532f..84c3941539a 100644 --- a/source/blender/makesrna/intern/CMakeLists.txt +++ b/source/blender/makesrna/intern/CMakeLists.txt @@ -211,6 +211,7 @@ blender_include_dirs( ../../blenkernel ../../blenloader ../../blenlib + ../../bmesh ../../blenfont ../../gpu ../../imbuf diff --git a/source/blender/makesrna/intern/SConscript b/source/blender/makesrna/intern/SConscript index c48b479da16..3c76fbf1edb 100644 --- a/source/blender/makesrna/intern/SConscript +++ b/source/blender/makesrna/intern/SConscript @@ -32,7 +32,7 @@ defs = [] incs = '#/intern/guardedalloc ../../blenlib ../../blenkernel ../../blenloader' incs += ' ../../imbuf ../../makesdna ../../makesrna ../../ikplugin' incs += ' ../../windowmanager ../../editors/include ../../blenfont' -incs += ' ../../render/extern/include' +incs += ' ../../render/extern/include ../../bmesh' incs += ' #/intern/audaspace/intern ' incs += ' #/extern/glew/include ' @@ -151,7 +151,6 @@ rna.Depends (generated_files, makesrna) # this seems bad, how to retrieve it from scons? build_dir = root_build_dir + os.sep +'source' + os.sep + 'blender' + os.sep + 'makesrna' + os.sep + 'intern' + os.sep - if env['OURPLATFORM'] != 'linuxcross': if env['OURPLATFORM'] in ('win32-vc', 'win64-vc', 'win32-mingw'): rna.Command (generated_files, '', "\"" + root_build_dir+os.sep+"makesrna.exe\" \"" + build_dir ) diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c index 97d0f535a5b..d4bb3957d70 100644 --- a/source/blender/makesrna/intern/makesrna.c +++ b/source/blender/makesrna/intern/makesrna.c @@ -1588,6 +1588,7 @@ static void rna_def_function_funcs(FILE *f, StructDefRNA *dsrna, FunctionDefRNA fprintf(f, "\t_retdata= _data;\n"); else { const char *data_str; + if (cptr || (flag & PROP_DYNAMIC)) { ptrstr= "**"; valstr= "*"; diff --git a/source/blender/makesrna/intern/rna_animviz.c b/source/blender/makesrna/intern/rna_animviz.c index 5e8c5692abe..5bbd71bf8bc 100644 --- a/source/blender/makesrna/intern/rna_animviz.c +++ b/source/blender/makesrna/intern/rna_animviz.c @@ -1,5 +1,5 @@ /* - * $Id$ + * $Id: rna_animviz.c 25824 2010-01-08 02:54:33Z gsrb3d $ * * ***** BEGIN GPL LICENSE BLOCK ***** * diff --git a/source/blender/makesrna/intern/rna_constraint.c b/source/blender/makesrna/intern/rna_constraint.c index 966e679f0fe..75a78091bd9 100644 --- a/source/blender/makesrna/intern/rna_constraint.c +++ b/source/blender/makesrna/intern/rna_constraint.c @@ -2031,7 +2031,7 @@ void RNA_def_constraint(BlenderRNA *brna) /* flags */ prop= RNA_def_property(srna, "mute", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_sdna(prop, NULL, "flag", CONSTRAINT_OFF); + RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", CONSTRAINT_OFF); RNA_def_property_ui_text(prop, "Disable", "Enable/Disable Constraint"); prop= RNA_def_property(srna, "show_expanded", PROP_BOOLEAN, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_fcurve.c b/source/blender/makesrna/intern/rna_fcurve.c index 1b18f88efcc..83fe53b676e 100644 --- a/source/blender/makesrna/intern/rna_fcurve.c +++ b/source/blender/makesrna/intern/rna_fcurve.c @@ -49,7 +49,7 @@ #include "ED_keyframing.h" #include "ED_keyframes_edit.h" - + EnumPropertyItem fmodifier_type_items[] = { {FMODIFIER_TYPE_NULL, "NULL", 0, "Invalid", ""}, {FMODIFIER_TYPE_GENERATOR, "GENERATOR", 0, "Generator", ""}, diff --git a/source/blender/makesrna/intern/rna_image_api.c b/source/blender/makesrna/intern/rna_image_api.c index 7327c7203b9..95616f7c1b3 100644 --- a/source/blender/makesrna/intern/rna_image_api.c +++ b/source/blender/makesrna/intern/rna_image_api.c @@ -1,5 +1,5 @@ /* - * $Id$ + * $Id: rna_image_api.c 23507 2009-09-27 09:19:29Z kazanbas $ * * ***** BEGIN GPL LICENSE BLOCK ***** * diff --git a/source/blender/makesrna/intern/rna_main_api.c b/source/blender/makesrna/intern/rna_main_api.c index f5cbc6b2e87..07c2313e50f 100644 --- a/source/blender/makesrna/intern/rna_main_api.c +++ b/source/blender/makesrna/intern/rna_main_api.c @@ -1,5 +1,5 @@ /* - * $Id$ + * $Id: rna_main_api.c 21094 2009-06-23 00:09:26Z gsrb3d $ * * ***** BEGIN GPL LICENSE BLOCK ***** * diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c index 03c79af1907..babe6d9c6b0 100644 --- a/source/blender/makesrna/intern/rna_mesh.c +++ b/source/blender/makesrna/intern/rna_mesh.c @@ -1,4 +1,4 @@ -/* +/** * $Id$ * * ***** BEGIN GPL LICENSE BLOCK ***** @@ -10,7 +10,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 @@ -22,14 +22,18 @@ * ***** 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 */ - #include <stdlib.h> #include "RNA_define.h" +#include "RNA_types.h" #include "rna_internal.h" @@ -38,8 +42,6 @@ #include "DNA_meshdata_types.h" #include "DNA_object_types.h" -#include "WM_types.h" - #ifdef RNA_RUNTIME #include "DNA_scene_types.h" @@ -51,20 +53,21 @@ #include "BKE_depsgraph.h" #include "BKE_main.h" #include "BKE_mesh.h" - - -#include "ED_mesh.h" /* XXX Bad level call */ +#include "BKE_utildefines.h" +#include "BKE_tessmesh.h" #include "WM_api.h" #include "WM_types.h" +#include "ED_mesh.h" + static void rna_Mesh_update_data(Main *bmain, Scene *scene, PointerRNA *ptr) { ID *id= ptr->id.data; /* cheating way for importers to avoid slow updates */ if(id->us > 0) { - DAG_id_tag_update(id, 0); + DAG_id_tag_update(id, OB_RECALC_DATA); WM_main_add_notifier(NC_GEOM|ND_DATA, id); } } @@ -234,55 +237,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 *bmain, Scene *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; @@ -304,15 +264,20 @@ static void rna_MeshFace_material_index_range(PointerRNA *ptr, int *min, int *ma *max= me->totcol-1; } -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; @@ -326,7 +291,7 @@ 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)); @@ -336,7 +301,7 @@ static int rna_CustomDataLayer_active_get(PointerRNA *ptr, int type, int 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)); @@ -345,7 +310,7 @@ static int rna_CustomDataLayer_clone_get(PointerRNA *ptr, int type, int render) 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) @@ -358,7 +323,7 @@ static void rna_CustomDataLayer_active_set(PointerRNA *ptr, int value, int type, 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) @@ -370,26 +335,26 @@ static void rna_CustomDataLayer_clone_set(PointerRNA *ptr, int value, int type, 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); @@ -397,34 +362,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; } @@ -433,6 +406,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; @@ -444,10 +418,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; @@ -459,146 +436,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; @@ -612,53 +528,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) @@ -668,12 +584,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) @@ -684,36 +600,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); CustomDataLayer *cdl= (CustomDataLayer*)ptr->data; BLI_strncpy(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 *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); } @@ -721,42 +637,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), *fdata; CustomDataLayer *cdl; - int a; + int a, b, c; + + 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); } @@ -764,55 +685,55 @@ 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); CustomDataLayer *cdl= (CustomDataLayer*)ptr->data; BLI_strncpy(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_pdata(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 *iter, void *data) @@ -824,7 +745,7 @@ static int rna_float_layer_check(CollectionPropertyIterator *iter, void *data) 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); } @@ -843,19 +764,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); } @@ -874,19 +795,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); } @@ -897,7 +818,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) { @@ -966,46 +887,27 @@ 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_MeshFace_path(PointerRNA *ptr) { - return BLI_sprintfN("faces[%d]", (int)((MFace*)ptr->data - ((Mesh*)ptr->id.data)->mface)); + return BLI_sprintfN("faces[%d]", (MFace*)ptr->data - ((Mesh*)ptr->id.data)->mface); } static char *rna_MeshEdge_path(PointerRNA *ptr) { - return BLI_sprintfN("edges[%d]", (int)((MEdge*)ptr->data - ((Mesh*)ptr->id.data)->medge)); + return BLI_sprintfN("edges[%d]", (MEdge*)ptr->data - ((Mesh*)ptr->id.data)->medge); } static char *rna_MeshVertex_path(PointerRNA *ptr) { - return BLI_sprintfN("vertices[%d]", (int)((MVert*)ptr->data - ((Mesh*)ptr->id.data)->mvert)); + return BLI_sprintfN("verts[%d]", (MVert*)ptr->data - ((Mesh*)ptr->id.data)->mvert); } static char *rna_MeshTextureFaceLayer_path(PointerRNA *ptr) @@ -1016,7 +918,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; @@ -1033,7 +935,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) @@ -1043,12 +945,12 @@ 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) { - return BLI_sprintfN("sticky[%d]", (int)((MSticky*)ptr->data - ((Mesh*)ptr->id.data)->msticky)); + return BLI_sprintfN("sticky[%d]", (MSticky*)ptr->data - ((Mesh*)ptr->id.data)->msticky); } static char *rna_MeshIntPropertyLayer_path(PointerRNA *ptr) @@ -1084,43 +986,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; } @@ -1325,7 +1227,7 @@ 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_mtexpoly(BlenderRNA *brna) { StructRNA *srna; PropertyRNA *prop; @@ -1335,7 +1237,7 @@ static void rna_def_mtface(BlenderRNA *brna) {TF_ALPHA, "ALPHA", 0, "Alpha", "Render polygon transparent, depending on alpha channel of the texture"}, {TF_CLIP, "CLIPALPHA", 0, "Clip Alpha", "Use the images alpha values clipped with no blending (binary alpha)"}, {0, NULL, 0, NULL, NULL}}; - const int uv_dim[]= {4, 2}; + int uv_dim[]= {4, 2}; 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"); @@ -1372,7 +1274,7 @@ static void rna_def_mtface(BlenderRNA *brna) 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", 0, 0); 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); @@ -1411,7 +1313,7 @@ static void rna_def_mtface(BlenderRNA *brna) prop= RNA_def_property(srna, "use_twoside", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", TF_TWOSIDE); - RNA_def_property_ui_text(prop, "Two-side", "Render face two-sided"); + RNA_def_property_ui_text(prop, "Twoside", "Render face twosided"); RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); prop= RNA_def_property(srna, "use_object_color", PROP_BOOLEAN, PROP_NONE); @@ -1456,36 +1358,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 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); @@ -1498,7 +1377,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) @@ -1516,7 +1395,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; @@ -1542,6 +1421,7 @@ static void rna_def_mcol(BlenderRNA *brna) RNA_def_property_boolean_sdna(prop, NULL, "active_rnd", 0); RNA_def_property_boolean_funcs(prop, "rna_MeshColorLayer_active_render_get", "rna_MeshColorLayer_active_render_set"); RNA_def_property_ui_text(prop, "Active Render", "Sets the layer as active for rendering"); + RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); prop= RNA_def_property(srna, "data", PROP_COLLECTION, PROP_NONE); @@ -1554,32 +1434,6 @@ static void rna_def_mcol(BlenderRNA *brna) 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"); } @@ -1667,6 +1521,43 @@ 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", ""); +} + + +/* scene.objects */ /* mesh.vertices */ static void rna_def_mesh_vertices(BlenderRNA *brna, PropertyRNA *cprop) { @@ -1674,7 +1565,7 @@ static void rna_def_mesh_vertices(BlenderRNA *brna, PropertyRNA *cprop) // PropertyRNA *prop; FunctionRNA *func; -// PropertyRNA *parm; + PropertyRNA *parm; RNA_def_property_srna(cprop, "MeshVertices"); srna= RNA_def_struct(brna, "MeshVertices", NULL); @@ -1683,7 +1574,7 @@ static void rna_def_mesh_vertices(BlenderRNA *brna, PropertyRNA *cprop) func= RNA_def_function(srna, "add", "ED_mesh_vertices_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.edges */ @@ -1693,7 +1584,7 @@ static void rna_def_mesh_edges(BlenderRNA *brna, PropertyRNA *cprop) // PropertyRNA *prop; FunctionRNA *func; -// PropertyRNA *parm; + PropertyRNA *parm; RNA_def_property_srna(cprop, "MeshEdges"); srna= RNA_def_struct(brna, "MeshEdges", NULL); @@ -1702,7 +1593,7 @@ static void rna_def_mesh_edges(BlenderRNA *brna, PropertyRNA *cprop) func= RNA_def_function(srna, "add", "ED_mesh_edges_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.faces */ @@ -1712,7 +1603,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); @@ -1723,15 +1614,9 @@ 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.vertex_colors */ @@ -1751,7 +1636,7 @@ static void rna_def_vertex_colors(BlenderRNA *brna, PropertyRNA *cprop) func= RNA_def_function(srna, "new", "rna_Mesh_vertex_color_new"); RNA_def_function_flag(func, FUNC_USE_CONTEXT); RNA_def_function_ui_description(func, "Add a vertex color layer to Mesh."); - RNA_def_string(func, "name", "Col", 0, "", "Vertex color name."); + parm= RNA_def_string(func, "name", "UVTex", 0, "", "UV Texture name."); parm= RNA_def_pointer(func, "layer", "MeshColorLayer", "", "The newly created layer."); RNA_def_function_return(func, parm); @@ -1792,7 +1677,7 @@ static void rna_def_uv_textures(BlenderRNA *brna, PropertyRNA *cprop) func= RNA_def_function(srna, "new", "rna_Mesh_uv_texture_new"); RNA_def_function_flag(func, FUNC_USE_CONTEXT); RNA_def_function_ui_description(func, "Add a UV texture layer to Mesh."); - RNA_def_string(func, "name", "UVTex", 0, "", "UV Texture name."); + parm= RNA_def_string(func, "name", "UVTex", 0, "", "UV Texture name."); parm= RNA_def_pointer(func, "layer", "MeshTextureFaceLayer", "", "The newly created layer."); RNA_def_function_return(func, parm); @@ -1852,11 +1737,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", 0, 0, 0, "rna_Mesh_uv_textures_length", 0, 0); RNA_def_property_struct_type(prop, "MeshTextureFaceLayer"); RNA_def_property_ui_text(prop, "UV Textures", ""); @@ -1885,26 +1770,26 @@ 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", 0, 0, 0, "rna_Mesh_vertex_colors_length", 0, 0); RNA_def_property_struct_type(prop, "MeshColorLayer"); RNA_def_property_ui_text(prop, "Vertex Colors", ""); 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", 0, 0, 0, "rna_Mesh_float_layers_length", 0, 0); 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", 0, 0, 0, "rna_Mesh_int_layers_length", 0, 0); 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", 0, 0, 0, "rna_Mesh_string_layers_length", 0, 0); RNA_def_property_struct_type(prop, "MeshStringPropertyLayer"); RNA_def_property_ui_text(prop, "String Property Layers", ""); @@ -1936,21 +1821,14 @@ static void rna_def_mesh(BlenderRNA *brna) 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", "Adjusts active object's texture space automatically when transforming object"); - RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, "rna_Mesh_texspace_set"); - 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); @@ -1958,25 +1836,17 @@ static void rna_def_mesh(BlenderRNA *brna) 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 */ /* 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", "Displays 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", "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); @@ -2012,15 +1882,15 @@ static void rna_def_mesh(BlenderRNA *brna) RNA_def_property_boolean_sdna(prop, NULL, "drawflag", ME_DRAWSHARP); 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", "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); + prop= RNA_def_property(srna, "show_extra_edge_angle", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "drawflag", ME_DRAWEXTRA_FACEANG); - RNA_def_property_ui_text(prop, "Faces Angles", "Displays the angles in the selected edges in degrees, Using global values when set in the transform panel"); + RNA_def_property_ui_text(prop, "Edge 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); @@ -2028,6 +1898,10 @@ static void rna_def_mesh(BlenderRNA *brna) 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"); + prop= RNA_def_property(srna, "draw_pins", PROP_BOOLEAN, PROP_NONE); + RNA_def_property_boolean_sdna(prop, NULL, "drawflag", ME_DRAW_PINS); + RNA_def_property_ui_text(prop, "Draw Pins", "Displays pinned mesh elements"); + RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); /* editflag */ prop= RNA_def_property(srna, "use_mirror_x", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "editflag", ME_EDIT_MIRROR_X); @@ -2072,6 +1946,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); } @@ -2083,9 +1958,9 @@ 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_mtexpoly(brna); rna_def_msticky(brna); - rna_def_mcol(brna); + rna_def_mloopcol(brna); rna_def_mproperties(brna); } diff --git a/source/blender/makesrna/intern/rna_mesh_api.c b/source/blender/makesrna/intern/rna_mesh_api.c index c1289374681..8912a576710 100644 --- a/source/blender/makesrna/intern/rna_mesh_api.c +++ b/source/blender/makesrna/intern/rna_mesh_api.c @@ -1,5 +1,5 @@ /* - * $Id$ + * $Id: rna_mesh_api.c 21283 2009-07-01 12:19:00Z blendix $ * * ***** BEGIN GPL LICENSE BLOCK ***** * @@ -42,7 +42,15 @@ #include "ED_mesh.h" #ifdef RNA_RUNTIME - +const char *rna_Mesh_unit_test_compare(struct Mesh *mesh, bContext *C, struct Mesh *mesh2) +{ + char *ret = mesh_cmp(mesh, mesh2, FLT_EPSILON*60); + + if (!ret) + ret = "Same"; + + return ret; +} #else @@ -63,6 +71,13 @@ void RNA_api_mesh(StructRNA *srna) RNA_def_boolean(func, "calc_edges", 0, "Calculate Edges", "Force recalculation of edges."); RNA_def_function_flag(func, FUNC_USE_CONTEXT); + func= RNA_def_function(srna, "unit_test_compare", "rna_Mesh_unit_test_compare"); + parm= RNA_def_pointer(func, "mesh", "Mesh", "", "Mesh to compare to"); + RNA_def_function_flag(func, FUNC_USE_CONTEXT); + /* return value */ + parm= RNA_def_string(func, "result", "nothing", 64, "Return value", "String description of result of comparison"); + RNA_def_function_return(func, parm); + func= RNA_def_function(srna, "validate", "BKE_mesh_validate"); RNA_def_function_ui_description(func, "validate geometry, return True when the mesh has had invalid geometry corrected/removed."); parm= RNA_def_boolean(func, "verbose", 0, "Verbose", "Output information about the errors found"); diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c index 18a93b9defb..4fe9dd6099a 100644 --- a/source/blender/makesrna/intern/rna_modifier.c +++ b/source/blender/makesrna/intern/rna_modifier.c @@ -91,6 +91,7 @@ EnumPropertyItem modifier_type_items[] ={ {eModifierType_Smoke, "SMOKE", ICON_MOD_SMOKE, "Smoke", ""}, {eModifierType_Softbody, "SOFT_BODY", ICON_MOD_SOFT, "Soft Body", ""}, {eModifierType_Surface, "SURFACE", ICON_MOD_PHYSICS, "Surface", ""}, + {eModifierType_NgonInterp, "NGONINTERP", ICON_MOD_LATTICE, "Precision UV Interpolation", ""}, {0, NULL, 0, NULL, NULL}}; #ifdef RNA_RUNTIME @@ -175,6 +176,8 @@ static StructRNA* rna_Modifier_refine(struct PointerRNA *ptr) return &RNA_MultiresModifier; case eModifierType_Surface: return &RNA_SurfaceModifier; + case eModifierType_NgonInterp: + return &RNA_NgonInterpModifier; case eModifierType_Smoke: return &RNA_SmokeModifier; case eModifierType_Solidify: @@ -412,7 +415,7 @@ static int rna_MultiresModifier_external_get(PointerRNA *ptr) Object *ob= (Object*)ptr->id.data; Mesh *me= ob->data; - return CustomData_external_test(&me->fdata, CD_MDISPS); + return CustomData_external_test(&me->ldata, CD_MDISPS); } static void rna_MultiresModifier_filepath_get(PointerRNA *ptr, char *value) @@ -1367,8 +1370,8 @@ static void rna_def_modifier_edgesplit(BlenderRNA *brna) // XXX, convert to radians. prop= RNA_def_property(srna, "split_angle", PROP_FLOAT, PROP_NONE); - RNA_def_property_range(prop, 0, 180); - RNA_def_property_ui_range(prop, 0, 180, 100, 2); + RNA_def_property_range(prop, 0, 90); + RNA_def_property_ui_range(prop, 0, 90, 100, 2); RNA_def_property_ui_text(prop, "Split Angle", "Angle above which to split edges"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); @@ -2365,6 +2368,25 @@ static void rna_def_modifier_screw(BlenderRNA *brna) RNA_def_property_update(prop, 0, "rna_Modifier_update");*/ } + + +static void rna_def_modifier_ngoninterp(BlenderRNA *brna) +{ + StructRNA *srna; + PropertyRNA *prop; + + srna= RNA_def_struct(brna, "NgonInterpModifier", "Modifier"); + RNA_def_struct_ui_text(srna, "Precision UV Modifier", "Precision UV interpolation"); + RNA_def_struct_sdna(srna, "NgonInterpModifierData"); + RNA_def_struct_ui_icon(srna, ICON_MOD_SCREW); + + prop= RNA_def_property(srna, "resolution", PROP_INT, PROP_UNSIGNED); + RNA_def_property_range(prop, 1, 10000); + RNA_def_property_ui_range(prop, 1, 100, 1, 0); + RNA_def_property_ui_text(prop, "Resolution", "Size of interpolation grids"); + RNA_def_property_update(prop, 0, "rna_Modifier_update"); + +} void RNA_def_modifier(BlenderRNA *brna) { StructRNA *srna; @@ -2462,6 +2484,7 @@ void RNA_def_modifier(BlenderRNA *brna) rna_def_modifier_smoke(brna); rna_def_modifier_solidify(brna); rna_def_modifier_screw(brna); + rna_def_modifier_ngoninterp(brna); } #endif diff --git a/source/blender/makesrna/intern/rna_nla.c b/source/blender/makesrna/intern/rna_nla.c index 9bf5f53f8b7..bace236c44e 100644 --- a/source/blender/makesrna/intern/rna_nla.c +++ b/source/blender/makesrna/intern/rna_nla.c @@ -1,5 +1,5 @@ /* - * $Id$ + * $Id: rna_nla.c 21537 2009-07-11 22:22:53Z gsrb3d $ * * ***** BEGIN GPL LICENSE BLOCK ***** * diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index 11e7dd81cb6..35c0022df84 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -48,6 +48,7 @@ #include "DNA_scene_types.h" #include "DNA_meta_types.h" +#include "BKE_tessmesh.h" #include "BKE_group.h" /* needed for object_in_group() */ #include "BLO_sys_types.h" /* needed for intptr_t used in ED_mesh.h */ @@ -227,8 +228,8 @@ void rna_Object_active_shape_update(Main *bmain, Scene *scene, PointerRNA *ptr) /* exit/enter editmode to get new shape */ switch(ob->type) { case OB_MESH: - load_editMesh(scene, ob); - make_editMesh(scene, ob); + EDBM_LoadEditBMesh(scene, ob); + EDBM_MakeEditBMesh(scene->toolsettings, scene, ob); break; case OB_CURVE: case OB_SURF: @@ -581,8 +582,8 @@ static void rna_Object_active_material_index_set(PointerRNA *ptr, int value) if(ob->type==OB_MESH) { Mesh *me= ob->data; - if(me->edit_mesh) - me->edit_mesh->mat_nr= value; + if(me->edit_btmesh) + me->edit_btmesh->mat_nr= value; } } @@ -1602,6 +1603,7 @@ static void rna_def_object_modifiers(BlenderRNA *brna, PropertyRNA *cprop) func= RNA_def_function(srna, "remove", "rna_Object_modifier_remove"); RNA_def_function_flag(func, FUNC_USE_CONTEXT|FUNC_USE_REPORTS); RNA_def_function_ui_description(func, "Remove an existing modifier from the object."); + /* target to remove*/ parm= RNA_def_pointer(func, "modifier", "Modifier", "", "Modifier to remove."); RNA_def_property_flag(parm, PROP_REQUIRED|PROP_NEVER_NULL); diff --git a/source/blender/makesrna/intern/rna_object_api.c b/source/blender/makesrna/intern/rna_object_api.c index d6af04f2475..4ccd4050bc1 100644 --- a/source/blender/makesrna/intern/rna_object_api.c +++ b/source/blender/makesrna/intern/rna_object_api.c @@ -160,7 +160,7 @@ static Mesh *rna_Object_to_mesh(Object *ob, ReportList *reports, Scene *sce, int dm = mesh_create_derived_view( sce, ob, mask ); tmpmesh = add_mesh( "Mesh" ); - DM_to_mesh( dm, tmpmesh ); + DM_to_mesh( dm, tmpmesh, ob ); dm->release( dm ); } diff --git a/source/blender/makesrna/intern/rna_pose_api.c b/source/blender/makesrna/intern/rna_pose_api.c index e326aee212d..258d67abb19 100644 --- a/source/blender/makesrna/intern/rna_pose_api.c +++ b/source/blender/makesrna/intern/rna_pose_api.c @@ -1,5 +1,5 @@ /* - * $Id$ + * $Id: rna_pose_api.c 23425 2009-09-22 19:09:04Z gsrb3d $ * * ***** BEGIN GPL LICENSE BLOCK ***** * diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index e06e71d6a0e..9c04000ad4a 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -40,6 +40,8 @@ #include "DNA_scene_types.h" #include "DNA_userdef_types.h" +#include "BKE_tessmesh.h" + /* Include for Bake Options */ #include "RE_pipeline.h" @@ -852,9 +854,9 @@ static void rna_Scene_editmesh_select_mode_set(PointerRNA *ptr, const int *value if(scene->basact) { Mesh *me= get_mesh(scene->basact->object); - if(me && me->edit_mesh && me->edit_mesh->selectmode != flag) { - me->edit_mesh->selectmode= flag; - EM_selectmode_set(me->edit_mesh); + if(me && me->edit_btmesh && me->edit_btmesh->selectmode != flag) { + me->edit_btmesh->selectmode= flag; + EDBM_selectmode_set(me->edit_btmesh); } } } @@ -866,7 +868,7 @@ static void rna_Scene_editmesh_select_mode_update(Main *bmain, Scene *scene, Poi if(scene->basact) { me= get_mesh(scene->basact->object); - if(me && me->edit_mesh==NULL) + if(me && me->edit_btmesh==NULL) me= NULL; } diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index a914d875490..6f728674ff5 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -978,6 +978,16 @@ static void rna_def_userdef_theme_space_view3d(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Current Frame", ""); RNA_def_property_update(prop, 0, "rna_userdef_update"); + prop= RNA_def_property(srna, "pin", PROP_INT, PROP_COLOR); + RNA_def_property_array(prop, 3); + RNA_def_property_ui_text(prop, "Pin", ""); + RNA_def_property_update(prop, NC_WINDOW, NULL); + + prop= RNA_def_property(srna, "pin_opac", PROP_INT, PROP_PERCENTAGE); + RNA_def_property_range(prop, 0, 100); + RNA_def_property_ui_text(prop, "Pin Face Opacity", ""); + RNA_def_property_update(prop, NC_WINDOW, NULL); + prop= RNA_def_property(srna, "outline_width", PROP_INT, PROP_NONE); RNA_def_property_range(prop, 1, 5); RNA_def_property_ui_text(prop, "Outline Width", ""); @@ -2675,6 +2685,10 @@ static void rna_def_userdef_input(BlenderRNA *brna) RNA_def_property_enum_bitflag_sdna(prop, NULL, "uiflag"); RNA_def_property_enum_items(prop, view_zoom_axes); RNA_def_property_ui_text(prop, "Zoom Axis", "Axis of mouse movement to zoom in or out on"); + + prop= RNA_def_property(srna, "loopcut_finish_on_release", PROP_BOOLEAN, PROP_NONE); + RNA_def_property_boolean_sdna(prop, NULL, "loopcut_finish_on_release", 1); + RNA_def_property_ui_text(prop, "End Loopcut Slide On Release", "End Loopcut Slide On Mouse Release, a 'click-drag-and-hold' workflow"); prop= RNA_def_property(srna, "invert_mouse_zoom", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_ZOOM_INVERT); diff --git a/source/blender/makesrna/intern/rna_wm_api.c b/source/blender/makesrna/intern/rna_wm_api.c index 5a0708865b6..48daabefd01 100644 --- a/source/blender/makesrna/intern/rna_wm_api.c +++ b/source/blender/makesrna/intern/rna_wm_api.c @@ -1,5 +1,5 @@ /* - * $Id$ + * $Id: rna_wm_api.c 21094 2009-06-23 00:09:26Z gsrb3d $ * * ***** BEGIN GPL LICENSE BLOCK ***** * |