Merging r59136 through r59152 from trunk into soc-2013-depsgraph_mt
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 15 Aug 2013 08:23:16 +0000 (08:23 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 15 Aug 2013 08:23:16 +0000 (08:23 +0000)
commit5eac3db2787180d776503e00e7192913aa5f1849
tree8fbb0aa9ec3f1c5ec953f6475b80445f71b5ba8a
parent5ef266f932e738beef49c8d7d6b7ed2d5b4c0809
parentd34f9c7a7466c34319b172f943d2447db0f54b54
Merging r59136 through r59152 from trunk into soc-2013-depsgraph_mt
intern/guardedalloc/intern/mallocn.c
source/blender/blenkernel/BKE_curve.h
source/blender/blenkernel/intern/curve.c
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/mesh.c
source/blender/blenloader/intern/readfile.c