Merging r49815 through r49833 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Sun, 12 Aug 2012 10:07:55 +0000 (10:07 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sun, 12 Aug 2012 10:07:55 +0000 (10:07 +0000)
1  2 
build_files/cmake/macros.cmake
build_files/scons/config/linux-config.py
build_files/scons/config/win32-vc-config.py
build_files/scons/config/win64-vc-config.py
build_files/scons/tools/Blender.py
build_files/scons/tools/btools.py
source/blender/editors/render/render_internal.c
source/blender/editors/space_image/image_ops.c
source/blender/windowmanager/intern/wm_init_exit.c
source/blender/windowmanager/intern/wm_window.c

Simple merge
Simple merge
Simple merge
@@@ -149,11 -148,11 +149,11 @@@ void WM_init(bContext *C, int argc, con
        BLF_init(11, U.dpi); /* Please update source/gamengine/GamePlayer/GPG_ghost.cpp if you change this */
        BLF_lang_init();
  
 -      /* initialize color stuff */
 -      BLI_init_srgb_conversion();
 +      /* initialize color management stuff */
 +      IMB_colormanagement_init();
  
        /* get the default database, plus a wm */
-       WM_read_homefile(C, NULL, G.factory_startup);
+       WM_homefile_read(C, NULL, G.factory_startup);
  
        BLF_lang_set(NULL);