[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56441] trunk/blender/source/blender/ makesdna/DNA_customdata_types.h: Fix #35171: crash rendering cube with two subsurf modifier in some circumstances.

Brecht Van Lommel brechtvanlommel at pandora.be
Wed May 1 14:35:32 CEST 2013


Revision: 56441
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56441
Author:   blendix
Date:     2013-05-01 12:35:31 +0000 (Wed, 01 May 2013)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/source/blender/makesdna/DNA_customdata_types.h

Modified: trunk/blender/source/blender/makesdna/DNA_customdata_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_customdata_types.h	2013-05-01 11:57:31 UTC (rev 56440)
+++ trunk/blender/source/blender/makesdna/DNA_customdata_types.h	2013-05-01 12:35:31 UTC (rev 56441)
@@ -150,7 +150,7 @@
 #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 */




More information about the Bf-blender-cvs mailing list