archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

* Merged changes in the trunk up to revision 33492.

Browse Source 
* Fixed a bug in listing all style modules in source/blender/blenlib/intern/bpath.c.
This commit is contained in:
Tamito Kajiyama
2010-12-06 01:23:18 +00:00
parent ad608f30e0 2f366d1544
commit 8a2eb1f590
584 changed files with 16928 additions and 14704 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenloader/intern/writefile.c
View File

@@ -311,7 +311,7 @@ static int endwrite(WriteData *wd)
/* ********** WRITE FILE ****************** */
static void writestruct(WriteData *wd, int filecode, char *structname, int nr, void *adr)
static void writestruct(WriteData *wd, int filecode, const char *structname, int nr, void *adr)
{
BHead bh;
short *sp;
@@ -1476,7 +1476,7 @@ static void write_customdata(WriteData *wd, ID *id, int count, CustomData *data,
for (i=0; i<data->totlayer; i++) {
CustomDataLayer *layer= &data->layers[i];
char *structname;
const char *structname;
int structnum, datasize;
if (layer->type == CD_MDEFORMVERT) {