diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-05-09 08:06:48 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-05-09 08:06:48 +0400 |
| commit | 5a2a3d7d82933be392d8a24937b230b2ab4d7af7 (patch) | |
| tree | bff60a2b1c14afb3917ff66e0e1354052a411208 /source/blender/makesrna | |
| parent | 14a2330d7b4edbb294b77072f99283cdd0fa6bae (diff) | |
more syncing with trunk, also cleared many warnings with gcc4.6
Diffstat (limited to 'source/blender/makesrna')
| -rw-r--r-- | source/blender/makesrna/intern/rna_mesh.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c index babe6d9c6b0..c152509d413 100644 --- a/source/blender/makesrna/intern/rna_mesh.c +++ b/source/blender/makesrna/intern/rna_mesh.c @@ -53,7 +53,6 @@ #include "BKE_depsgraph.h" #include "BKE_main.h" #include "BKE_mesh.h" -#include "BKE_utildefines.h" #include "BKE_tessmesh.h" #include "WM_api.h" @@ -362,7 +361,7 @@ static PointerRNA rna_Mesh_active_uv_texture_get(PointerRNA *ptr) static PointerRNA rna_Mesh_uv_texture_clone_get(PointerRNA *ptr) { - PointerRNA pnull = {0,}; + PointerRNA pnull = {{0}}; #if 0 Mesh *me= (Mesh*)ptr->data; CustomData *fdata= rna_mesh_fdata(me); @@ -376,7 +375,7 @@ static PointerRNA rna_Mesh_uv_texture_clone_get(PointerRNA *ptr) static PointerRNA rna_Mesh_uv_texture_stencil_get(PointerRNA *ptr) { - PointerRNA pnull = {0,}; + PointerRNA pnull = {{0}}; #if 0 Mesh *me= (Mesh*)ptr->data; CustomData *fdata= rna_mesh_fdata(me); @@ -897,17 +896,17 @@ static char *rna_VertexGroupElement_path(PointerRNA *ptr) static char *rna_MeshFace_path(PointerRNA *ptr) { - return BLI_sprintfN("faces[%d]", (MFace*)ptr->data - ((Mesh*)ptr->id.data)->mface); + return BLI_sprintfN("faces[%d]", (int)((MFace*)ptr->data - ((Mesh*)ptr->id.data)->mface)); } static char *rna_MeshEdge_path(PointerRNA *ptr) { - return BLI_sprintfN("edges[%d]", (MEdge*)ptr->data - ((Mesh*)ptr->id.data)->medge); + return BLI_sprintfN("edges[%d]", (int)((MEdge*)ptr->data - ((Mesh*)ptr->id.data)->medge)); } static char *rna_MeshVertex_path(PointerRNA *ptr) { - return BLI_sprintfN("verts[%d]", (MVert*)ptr->data - ((Mesh*)ptr->id.data)->mvert); + return BLI_sprintfN("verts[%d]", (int)((MVert*)ptr->data - ((Mesh*)ptr->id.data)->mvert)); } static char *rna_MeshTextureFaceLayer_path(PointerRNA *ptr) @@ -950,7 +949,7 @@ static char *rna_MeshColor_path(PointerRNA *ptr) static char *rna_MeshSticky_path(PointerRNA *ptr) { - return BLI_sprintfN("sticky[%d]", (MSticky*)ptr->data - ((Mesh*)ptr->id.data)->msticky); + return BLI_sprintfN("sticky[%d]", (int)((MSticky*)ptr->data - ((Mesh*)ptr->id.data)->msticky)); } static char *rna_MeshIntPropertyLayer_path(PointerRNA *ptr) |