fix for building c++ rna api with recently added smoothgroup api call.
authorCampbell Barton <ideasman42@gmail.com>
Fri, 14 Jun 2013 14:57:35 +0000 (14:57 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 14 Jun 2013 14:57:35 +0000 (14:57 +0000)
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/blenloader/intern/readfile.c
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_mesh_api.c

index 6915fd59984324272d1d663680e4f1ce474030a4..d841d6c7dc7b1a1b869d3b7e047adc0c319ec2cf 100644 (file)
@@ -29,7 +29,7 @@
  *  \ingroup bke
  */
 
-#if __STDC_VERSION__ >= 199901L
+#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
 #  define USE_DYNSIZE
 #endif
 
index 44dd3926777efa66fef0d89050926d36e1d9c870..d44e3fd49489f4ad740f599a9558a52a2c9b2089 100644 (file)
@@ -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;
                                                }
                                        }
index c7cbd8d0ac61782cf955479d7865e61a377f35a3..3c2e3ddb30068cda18d9bb7bdc9b4b448c2de15c 100644 (file)
@@ -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 = "*";
index 985e8761488fd09dc4e2c24a10fe944c207bf49a..ad9977fef509506e59e26be549b35c8d1feb9718 100644 (file)
@@ -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,