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

Win64 fixes - I don't think that they introduced any bugs yet, but I want to be sure. Please report problems.

Browse Source
This commit is contained in:
Daniel Genrich
2009-04-29 19:13:32 +00:00
parent 11dcf7461c
commit a9aac77ccf
10 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/intern/customdata.c
View File

@@ -626,7 +626,7 @@ void CustomData_merge(const struct CustomData *source, struct CustomData *dest,
number++;
if(layer->flag & CD_FLAG_NOCOPY) continue;
else if(!(mask & (1 << type))) continue;
else if(!((int)mask & (int)(1 << (int)type))) continue;
else if(number < CustomData_number_of_layers(dest, type)) continue;
if((alloctype == CD_ASSIGN) && (layer->flag & CD_FLAG_NOFREE))
@@ -1144,7 +1144,7 @@ void CustomData_set_only_copy(const struct CustomData *data,
int i;
for(i = 0; i < data->totlayer; ++i)
if(!(mask & (1 << data->layers[i].type)))
if(!((int)mask & (int)(1 << (int)data->layers[i].type)))
data->layers[i].flag |= CD_FLAG_NOCOPY;
}