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

change customdata mask from an 'unsigned int' to an 'u_int64_t', since BMesh branch has run out of bits

Browse Source
This commit is contained in:
Campbell Barton
2011-12-23 20:30:23 +00:00
parent 5df049f390
commit ddcf56366d
15 changed files with 42 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2563,7 +2563,7 @@ void object_handle_update(Scene *scene, Object *ob)
#else /* ensure CD_MASK_BAREMESH for now */
EditMesh *em = (ob == scene->obedit)? BKE_mesh_get_editmesh(ob->data): NULL;
unsigned int data_mask= scene->customdata_mask | ob->customdata_mask | CD_MASK_BAREMESH;
u_int64_t data_mask= scene->customdata_mask | ob->customdata_mask | CD_MASK_BAREMESH;
if(em) {
makeDerivedMesh(scene, ob, em, data_mask); /* was CD_MASK_BAREMESH */
BKE_mesh_end_editmesh(ob->data, em);