diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-06-14 18:57:35 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-06-14 18:57:35 +0400 |
| commit | 0fab77023d50abcdafc4e6be61e3c48a758bcd23 (patch) | |
| tree | 72ccdd5cc10bd1d8d76d3ea20effb6f6b274f94e /source/blender | |
| parent | 88b30ccb8cc2552ec6ca118cdcab4f75d5fb19b5 (diff) | |
fix for building c++ rna api with recently added smoothgroup api call.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenkernel/intern/subsurf_ccg.c | 2 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 6 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/makesrna.c | 4 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_mesh_api.c | 2 |
4 files changed, 6 insertions, 8 deletions
diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c index 6915fd59984..d841d6c7dc7 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.c +++ b/source/blender/blenkernel/intern/subsurf_ccg.c @@ -29,7 +29,7 @@ * \ingroup bke */ -#if __STDC_VERSION__ >= 199901L +#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L # define USE_DYNSIZE #endif diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 44dd3926777..d44e3fd4948 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -9503,11 +9503,9 @@ static void do_versions(FileData *fd, Library *lib, Main *main) for (sa = sc->areabase.first; sa; sa = sa->next) { SpaceLink *sl; for (sl = sa->spacedata.first; sl; sl = sl->next) { - if (sl->spacetype == SPACE_NODE) - { + if (sl->spacetype == SPACE_NODE) { SpaceNode *snode = (SpaceNode *)sl; - if (snode->zoom < 0.02) - { + if (snode->zoom < 0.02f) { snode->zoom = 1.0; } } diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c index c7cbd8d0ac6..3c2e3ddb300 100644 --- a/source/blender/makesrna/intern/makesrna.c +++ b/source/blender/makesrna/intern/makesrna.c @@ -1823,7 +1823,9 @@ static void rna_def_struct_function_prototype_cpp(FILE *f, StructRNA *UNUSED(srn flag = dp->prop->flag; pout = (flag & PROP_OUTPUT); - if (type == PROP_POINTER) + if (flag & PROP_DYNAMIC) + ptrstr = pout ? "**" : "*"; + else if (type == PROP_POINTER) ptrstr = pout ? "*": ""; else if (dp->prop->arraydimension) ptrstr = "*"; diff --git a/source/blender/makesrna/intern/rna_mesh_api.c b/source/blender/makesrna/intern/rna_mesh_api.c index 985e8761488..ad9977fef50 100644 --- a/source/blender/makesrna/intern/rna_mesh_api.c +++ b/source/blender/makesrna/intern/rna_mesh_api.c @@ -59,8 +59,6 @@ static const char *rna_Mesh_unit_test_compare(struct Mesh *mesh, bContext *C, st void rna_Mesh_calc_smooth_groups(struct Mesh *mesh, int *r_poly_group_len, int **r_poly_group, int *r_group_total) { - int totgroups; - *r_poly_group_len = mesh->totpoly; *r_poly_group = BKE_mesh_calc_smoothgroups( mesh->medge, mesh->totedge, |