Merge with trunk r37546
authorMiika Hamalainen <blender@miikah.org>
Thu, 16 Jun 2011 12:00:03 +0000 (12:00 +0000)
committerMiika Hamalainen <blender@miikah.org>
Thu, 16 Jun 2011 12:00:03 +0000 (12:00 +0000)
commitb937a4f5b6adc6bc0dca62cb5c87db08c873cfba
treef489aca8e10e2a686fc1d1397397f99e1e1f2077
parent3de22dec26606c2c526f7193db038fa5125f9b03
parentf227c4a064d96909243b4a60a7f6c544f521817a
Merge with trunk r37546
21 files changed:
release/scripts/startup/bl_ui/__init__.py
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/interface/interface_templates.c
source/blender/editors/space_outliner/outliner.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_modifier.c
source/blender/makesrna/intern/rna_space.c
source/blender/modifiers/CMakeLists.txt
source/blender/render/extern/include/RE_shader_ext.h
source/blender/render/intern/source/render_texture.c