[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57455] trunk/blender/source/blender: fix for building c++ rna api with recently added smoothgroup api call.

[Campbell Barton]

Revision: 57455
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57455
Author:   campbellbarton
Date:     2013-06-14 14:57:35 +0000 (Fri, 14 Jun 2013)
Log Message:
-----------
fix for building c++ rna api with recently added smoothgroup api call.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
    trunk/blender/source/blender/blenloader/intern/readfile.c
    trunk/blender/source/blender/makesrna/intern/makesrna.c
    trunk/blender/source/blender/makesrna/intern/rna_mesh_api.c

Modified: trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c	2013-06-14 14:29:00 UTC (rev 57454)
+++ trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c	2013-06-14 14:57:35 UTC (rev 57455)
@@ -29,7 +29,7 @@
  *  \ingroup bke
  */
 
-#if __STDC_VERSION__ >= 199901L
+#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
 #  define USE_DYNSIZE
 #endif
 

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2013-06-14 14:29:00 UTC (rev 57454)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2013-06-14 14:57:35 UTC (rev 57455)
@@ -9503,11 +9503,9 @@
 			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;
 						}
 					}

Modified: trunk/blender/source/blender/makesrna/intern/makesrna.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/makesrna.c	2013-06-14 14:29:00 UTC (rev 57454)
+++ trunk/blender/source/blender/makesrna/intern/makesrna.c	2013-06-14 14:57:35 UTC (rev 57455)
@@ -1823,7 +1823,9 @@
 		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 = "*";

Modified: trunk/blender/source/blender/makesrna/intern/rna_mesh_api.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_mesh_api.c	2013-06-14 14:29:00 UTC (rev 57454)
+++ trunk/blender/source/blender/makesrna/intern/rna_mesh_api.c	2013-06-14 14:57:35 UTC (rev 57455)
@@ -59,8 +59,6 @@
 
 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,