griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix for building c++ rna api with recently added smoothgroup api call.

Browse Source
This commit is contained in:
Campbell Barton
2013-06-14 14:57:35 +00:00
parent 88b30ccb8c
commit 0fab77023d
4 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/subsurf_ccg.c
View File

@@ -29,7 +29,7 @@
* \ingroup bke
*/
#if __STDC_VERSION__ >= 199901L
#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
# define USE_DYNSIZE
#endif

6
source/blender/blenloader/intern/readfile.c
View 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;
}
}

4
source/blender/makesrna/intern/makesrna.c
View 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 = "*";

2
source/blender/makesrna/intern/rna_mesh_api.c
View 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,