Merge with trunk r37849
authorMiika Hamalainen <blender@miikah.org>
Mon, 27 Jun 2011 08:11:05 +0000 (08:11 +0000)
committerMiika Hamalainen <blender@miikah.org>
Mon, 27 Jun 2011 08:11:05 +0000 (08:11 +0000)
commitc896fcae7963fb35124ef3fefe0f12679228fa39
treef4435bd39a36228a71c9142e4c26bacd482683f3
parentcb12648656fc001e8c4c6d00df73e52d452f8787
parent93bb6238e0c6b7ea008776f4e1c3958ef5382c09
Merge with trunk r37849
19 files changed:
release/scripts/startup/bl_ui/properties_data_modifier.py
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/bvhutils.c
source/blender/blenkernel/intern/particle.c
source/blender/blenlib/BLI_math_geom.h
source/blender/blenlib/intern/math_geom.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/space_outliner/outliner.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/intern/CMakeLists.txt
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_modifier.c
source/blender/makesrna/intern/rna_space.c
source/blender/render/extern/include/RE_shader_ext.h
source/blender/render/intern/source/render_texture.c