svn merge ^/trunk/blender -r55594:55635
authorCampbell Barton <ideasman42@gmail.com>
Wed, 27 Mar 2013 22:24:38 +0000 (22:24 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 27 Mar 2013 22:24:38 +0000 (22:24 +0000)
13 files changed:
1  2 
CMakeLists.txt
build_files/scons/tools/Blender.py
build_files/scons/tools/btools.py
source/blender/blenloader/intern/readfile.c
source/blender/bmesh/CMakeLists.txt
source/blender/editors/render/CMakeLists.txt
source/blender/editors/render/SConscript
source/blender/editors/render/render_shading.c
source/blender/editors/space_buttons/buttons_context.c
source/blender/editors/space_nla/nla_buttons.c
source/blender/makesrna/SConscript
source/blender/makesrna/intern/rna_userdef.c
source/blender/render/intern/source/pipeline.c

diff --cc CMakeLists.txt
Simple merge
Simple merge
Simple merge
Simple merge
index b858d715cfe86a180d1687da0380a22fe6c94eab,c0b9088017ec8cecd1ca899a6756c9d565a64a21..f628b2bb210615a90416111f15f5b14ca3ef9015
@@@ -68,11 -68,8 +68,15 @@@ if(WITH_HEADLESS
        add_definitions(-DWITH_HEADLESS)
  endif()
  
 +if(WITH_FREESTYLE)
 +      list(APPEND INC
 +              ../../freestyle
 +      )
 +      add_definitions(-DWITH_FREESTYLE)
 +endif()
 +
+ if(WITH_INTERNATIONAL)
+       add_definitions(-DWITH_INTERNATIONAL)
+ endif()
  blender_add_lib(bf_editor_render "${SRC}" "${INC}" "${INC_SYS}")
Simple merge