tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Code cleanup: use struct type for mempool & style edits

This commit is contained in:
Campbell Barton 2014-04-10 06:24:33 +10:00
parent c777f691ad
commit 82628a6b0e
5 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -498,7 +498,7 @@ void DM_update_materials(DerivedMesh *dm, Object *ob)
if (dm->mat)
MEM_freeN(dm->mat);
dm->mat = MEM_callocN (totmat * sizeof(*dm->mat), "DerivedMesh.mat");
dm->mat = MEM_callocN(totmat * sizeof(*dm->mat), "DerivedMesh.mat");
for (i = 1; i < totmat; i++) {
dm->mat[i] = give_current_material(ob, i);

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

@ -1024,7 +1024,7 @@ void BKE_list_modifier_color_ramps(FreestyleLineStyle *linestyle, ListBase *list
default:
continue;
}
link = (LinkData *) MEM_callocN( sizeof(LinkData), "link to color ramp");
link = (LinkData *) MEM_callocN(sizeof(LinkData), "link to color ramp");
link->data = color_ramp;
BLI_addtail(listbase, link);
}

3
source/blender/blenlib/BLI_sys_types.h
View File

@ -197,9 +197,6 @@ typedef uint64_t u_int64_t;
#endif /* ifdef platform for types */
/* note: use of (int, TRUE / FALSE) is deprecated,
* use (bool, true / false) instead */
#ifdef HAVE_STDBOOL_H
# include <stdbool.h>
#elif !defined(__bool_true_false_are_defined) && !defined(__BOOL_DEFINED)

2
source/blender/blenlib/intern/BLI_mempool.c
View File

@ -143,7 +143,7 @@ static unsigned int power_of_2_max_u(unsigned int x)
x = x | (x >> 2);
x = x | (x >> 4);
x = x | (x >> 8);
x = x | (x >>16);
x = x | (x >> 16);
return x + 1;
}
#endif

2
source/blender/makesdna/DNA_customdata_types.h
View File

@ -69,7 +69,7 @@ typedef struct CustomData {
int pad[1];
int totlayer, maxlayer; /* number of layers, size of layers array */
int totsize; /* in editmode, total size of all data layers */
void *pool; /* Bmesh: Memory pool for allocation of blocks */
struct BLI_mempool *pool; /* (BMesh Only): Memory pool for allocation of blocks */
CustomDataExternal *external; /* external file storing customdata layers */
} CustomData;