Merge with trunk r41625
authorMiika Hamalainen <blender@miikah.org>
Mon, 7 Nov 2011 16:36:49 +0000 (16:36 +0000)
committerMiika Hamalainen <blender@miikah.org>
Mon, 7 Nov 2011 16:36:49 +0000 (16:36 +0000)
commitedec46b0a6aac18f406991b9e16228d4bd848c61
tree1240768d737c63705fdb38c9832d926ed0bcda94
parent2ed6f077b3952123d56916980d18a379ecb3e5ac
parent4d7a9e5c055fd3903162b61fdd40fb77b2b96793
Merge with trunk r41625
38 files changed:
release/datafiles/blender_icons.png
release/scripts/startup/bl_ui/__init__.py
release/scripts/startup/bl_ui/space_time.py
source/blender/CMakeLists.txt
source/blender/blenkernel/BKE_bvhutils.h
source/blender/blenkernel/BKE_pointcache.h
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/bvhutils.c
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/particle.c
source/blender/blenkernel/intern/pointcache.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/blenlib/BLI_threads.h
source/blender/blenlib/intern/threads.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/datafiles/blender_icons.png.c
source/blender/editors/include/UI_icons.h
source/blender/editors/interface/interface_templates.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_intern.h
source/blender/makesdna/DNA_space_types.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_space.c
source/blender/nodes/shader/node_shader_util.c
source/blender/nodes/shader/nodes/node_shader_geom.c
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/pointdensity.c
source/blender/render/intern/source/render_texture.c
source/blender/render/intern/source/shadeinput.c
source/blender/render/intern/source/shadeoutput.c
source/blender/render/intern/source/voxeldata.c
source/blenderplayer/bad_level_call_stubs/stubs.c