Merging trunk up to r39145.
authorJoerg Mueller <nexyon@gmail.com>
Sun, 7 Aug 2011 15:25:06 +0000 (15:25 +0000)
committerJoerg Mueller <nexyon@gmail.com>
Sun, 7 Aug 2011 15:25:06 +0000 (15:25 +0000)
commitdaab78bc614fdf19d1e56558972347121e82e06e
tree39c919901b6add092817f6c87861030aab97578e
parentb057cf1bb118a070e2eeb3b2029aa80fad00a9b2
parentbf23acf3bb8ae43e6a50108a00e7572fe35edea4
Merging trunk up to r39145.
23 files changed:
CMakeLists.txt
build_files/scons/config/darwin-config.py
release/scripts/startup/bl_ui/space_userpref.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/blender.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/include/UI_resources.h
source/blender/editors/interface/interface.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/interface_style.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/resources.c
source/blender/editors/space_sequencer/sequencer_edit.c
source/blender/editors/transform/transform_generics.c
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/intern/rna_access.c
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/windowmanager/intern/wm_files.c
source/blenderplayer/bad_level_call_stubs/stubs.c
source/gameengine/Converter/KX_BlenderSceneConverter.cpp