Merge with trunk r41545
authorMiika Hamalainen <blender@miikah.org>
Sat, 5 Nov 2011 08:04:49 +0000 (08:04 +0000)
committerMiika Hamalainen <blender@miikah.org>
Sat, 5 Nov 2011 08:04:49 +0000 (08:04 +0000)
commit2ed6f077b3952123d56916980d18a379ecb3e5ac
tree1aa273e5566c95214739fb224d4c6cf115417882
parentb9c83456b27da57a14bcf8d274b460e670d49990
parent62f22185546e80b661424b45c88006f8b592d8b1
Merge with trunk r41545
20 files changed:
release/scripts/startup/bl_ui/space_time.py
source/blender/blenkernel/intern/particle.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/include/ED_mesh.h
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_intern.h
source/blender/makesdna/DNA_space_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_space.c
source/blender/modifiers/intern/MOD_uvproject.c
source/blender/nodes/shader/node_shader_util.c
source/blender/nodes/shader/nodes/node_shader_geom.c
source/blender/render/intern/include/texture.h
source/blender/render/intern/source/convertblender.c
source/blenderplayer/bad_level_call_stubs/stubs.c