Merged changes in the trunk up to revision 49986.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 18 Aug 2012 15:20:35 +0000 (15:20 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 18 Aug 2012 15:20:35 +0000 (15:20 +0000)
23 files changed:
1  2 
build_files/scons/tools/Blender.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/CMakeLists.txt
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/SConscript
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/object.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/bmesh/intern/bmesh_construct.c
source/blender/editors/animation/anim_filter.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/space_file/filelist.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_action_types.h
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/windowmanager/CMakeLists.txt
source/blender/windowmanager/SConscript
source/blender/windowmanager/WM_types.h
source/blender/windowmanager/intern/wm_files.c
source/creator/CMakeLists.txt
source/creator/creator.c

Simple merge
Simple merge
Simple merge
index 5819ae2545aa09a37553fdca169d7345ea738479,68fdbec2cfa3dc71de5b4d21c8da604923484085..de340ec4c9aa14f2888579a29536e2f58cb9c806
@@@ -10,8 -10,7 +10,8 @@@ sources = env.Glob('intern/*.c'
  incs = '. ../editors/include ../python ../makesdna ../blenlib ../blenkernel'
  incs += ' ../nodes ../imbuf ../blenloader ../render/extern/include'
  incs += ' ../radiosity/extern/include'
- incs += ' ../makesrna ../gpu ../blenfont ../bmesh'
+ incs += ' ../makesrna ../gpu ../blenfont ../bmesh ../compositor'
 +incs += ' ../freestyle'
  
  incs += ' #/intern/guardedalloc #/intern/memutil #/intern/ghost'
  incs += ' #/intern/elbeem #/extern/glew/include'
Simple merge
index 7262222447b7ac4444f169ca0449c9684895c651,3e884d1aa38f65ccd569b65e57014a2a7953e8cb..be9e8cee9d0aece663c6ddf44cc7393d5c526d9e
@@@ -1307,9 -1305,9 +1307,9 @@@ int main(int argc, const char **argv
        /* for all platforms, even windos has it! */
        if (G.background) signal(SIGINT, blender_esc);  /* ctrl c out bg render */
  #endif
 -
 +      
        /* background render uses this font too */
-       BKE_vfont_builtin_register(datatoc_Bfont, datatoc_Bfont_size);
+       BKE_vfont_builtin_register(datatoc_bfont_pfb, datatoc_bfont_pfb_size);
  
        /* Initialize ffmpeg if built in, also needed for bg mode if videos are
         * rendered via ffmpeg */