Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2013-05-01 16:35:31 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2013-05-01 16:35:31 +0400
commit2c662f8be8c2efec3eac70fb347c68e3adec41dc (patch)
tree7621c21f88fb62e6dd178a98cf15039aa0ef9854 /source/blender/makesdna/DNA_customdata_types.h
parent96c2ff952364c5ecc837ed9b7c9040079116ed20 (diff)
Fix #35171: crash rendering cube with two subsurf modifier in some circumstances.
Problem was actually integer overflow in the requested data layers (1 << 31) does not fit in an integer, it only goes up to (1 << 31) - 1.
Diffstat (limited to 'source/blender/makesdna/DNA_customdata_types.h')
-rw-r--r--source/blender/makesdna/DNA_customdata_types.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_customdata_types.h b/source/blender/makesdna/DNA_customdata_types.h
index 8debadf24c3..e2863d6e465 100644
--- a/source/blender/makesdna/DNA_customdata_types.h
+++ b/source/blender/makesdna/DNA_customdata_types.h
@@ -150,7 +150,7 @@ typedef struct CustomData {
#define CD_MASK_SHAPEKEY (1 << CD_SHAPEKEY)
#define CD_MASK_BWEIGHT (1 << CD_BWEIGHT)
#define CD_MASK_CREASE (1 << CD_CREASE)
-#define CD_MASK_ORIGSPACE_MLOOP (1 << CD_ORIGSPACE_MLOOP)
+#define CD_MASK_ORIGSPACE_MLOOP (1LL << CD_ORIGSPACE_MLOOP)
#define CD_MASK_PREVIEW_MLOOPCOL (1LL << CD_PREVIEW_MLOOPCOL)
#define CD_MASK_BM_ELEM_PYPTR (1LL << CD_BM_ELEM_PYPTR)
/* BMESH ONLY END */