Merge with trunk r38619
authorMiika Hamalainen <blender@miikah.org>
Fri, 22 Jul 2011 18:51:53 +0000 (18:51 +0000)
committerMiika Hamalainen <blender@miikah.org>
Fri, 22 Jul 2011 18:51:53 +0000 (18:51 +0000)
commit2a97e5a772d69c0963c7757033e240abef8d56b5
treea8737d358a27bbee8b996d31806a87069c094e23
parentcbe1613c0123d7705b9bba3806c03fe09151e729
parentffc490cbf1d93c7e0a9b97953f6f52e69b9bc8ec
Merge with trunk r38619
13 files changed:
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/particle.c
source/blender/blenkernel/intern/pointcache.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/space_buttons/buttons_context.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_intern.h
source/blender/makesrna/intern/CMakeLists.txt
source/blender/modifiers/CMakeLists.txt
source/blender/modifiers/intern/MOD_util.c
source/blender/render/intern/source/voxeldata.c