diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-12-26 01:31:19 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-26 01:31:19 +0400 |
| commit | 2cd5436a81da5c15ac70bd2b80c2f062cce5d02e (patch) | |
| tree | 2cc12476fb3fa653042eef99fa6b5d4d8cb290ec /source/blender/blenkernel/intern/object.c | |
| parent | 4ced91da47ec1e95d71beef07b218fd0290ff68a (diff) | |
| parent | 02d72b5c076f4ae1b47da74fe7a60a916edad9f2 (diff) | |
svn merge ^/trunk/blender -r42839:42871
Diffstat (limited to 'source/blender/blenkernel/intern/object.c')
| -rw-r--r-- | source/blender/blenkernel/intern/object.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index fb949ad149f..e95be394076 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -2579,7 +2579,7 @@ void object_handle_update(Scene *scene, Object *ob) #else /* ensure CD_MASK_BAREMESH for now */ BMEditMesh *em = (ob == scene->obedit)? ((Mesh*)ob->data)->edit_btmesh : NULL; - unsigned int data_mask= scene->customdata_mask | ob->customdata_mask | CD_MASK_BAREMESH; + uint64_t data_mask= scene->customdata_mask | ob->customdata_mask | CD_MASK_BAREMESH; if(em) { makeDerivedMesh(scene, ob, em, data_mask, 0); /* was CD_MASK_BAREMESH */ } |