Merge with trunk r38225
authorMiika Hamalainen <blender@miikah.org>
Fri, 8 Jul 2011 11:16:13 +0000 (11:16 +0000)
committerMiika Hamalainen <blender@miikah.org>
Fri, 8 Jul 2011 11:16:13 +0000 (11:16 +0000)
commit242043977381fae6769a5eee264df3aa92dd52a4
tree7cccaa4516cb1a4a266f1cf74caedc3e8fccad6b
parentf8f1cbd17f2b0c624d88ee7f7502e544472b4b6e
parent936737b70fc6b44411c0f03dd5acc1eb23777b5b
Merge with trunk r38225
source/blender/blenkernel/intern/pointcache.c
source/blender/blenlib/intern/math_geom.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/space_outliner/outliner.c
source/blenderplayer/bad_level_call_stubs/stubs.c