Merge with trunk r39928
authorMiika Hamalainen <blender@miikah.org>
Mon, 5 Sep 2011 17:06:09 +0000 (17:06 +0000)
committerMiika Hamalainen <blender@miikah.org>
Mon, 5 Sep 2011 17:06:09 +0000 (17:06 +0000)
commit42faf7ae41d807c2f9a94f40b774038af0c065ec
tree8460e4d70cf287da04b656748297521d0d3ef381
parent79ef35889f850aa7173800bcf67918c14f3b1291
parent59dbd53e72ae25edf247e49ea1e291af277fecc4
Merge with trunk r39928
31 files changed:
release/datafiles/blenderbuttons
release/scripts/startup/bl_ui/__init__.py
source/blender/CMakeLists.txt
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/blenkernel/intern/pointcache.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/blenlib/intern/BLI_kdtree.c
source/blender/blenlib/intern/math_geom.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/datafiles/blenderbuttons.c
source/blender/editors/include/UI_icons.h
source/blender/editors/interface/interface_templates.c
source/blender/editors/space_buttons/buttons_context.c
source/blender/editors/space_outliner/outliner_draw.c
source/blender/editors/space_time/space_time.c
source/blender/editors/space_view3d/drawmesh.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/RNA_enum_types.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_modifier.c
source/blender/makesrna/intern/rna_space.c
source/blender/render/intern/source/shadeoutput.c
source/blenderplayer/bad_level_call_stubs/stubs.c