Merged changes in the trunk up to revision 32124.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 25 Sep 2010 21:03:16 +0000 (21:03 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 25 Sep 2010 21:03:16 +0000 (21:03 +0000)
17 files changed:
1  2 
release/scripts/ui/properties_render.py
release/scripts/ui/space_userpref.py
source/blender/blenkernel/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/editors/animation/anim_filter.c
source/blender/editors/render/CMakeLists.txt
source/blender/editors/render/render_shading.c
source/blender/editors/space_outliner/outliner.c
source/blender/editors/transform/transform.c
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_scene.c
source/blender/python/doc/sphinx_doc_gen.py
source/blender/render/intern/source/shadeinput.c

Simple merge
index 9f12b419084009f8f90a7beb7dee33244998dd37,ccead684a889f92d9ebd19b9b274712002c46e4b..b4eb1d073a6a8769782e25726d5dd93b56d9ae95
@@@ -31,8 -31,6 +31,7 @@@ SET(IN
        ../avi
        ../blenlib
        ../blenloader
-       ../editors/include
 +      ../freestyle
        ../gpu
        ../ikplugin
        ../imbuf
index 5ca8162a93d9f0e0f45a9541796be2a7463aaff1,d494355a1e9e47391e1f9b2e54a8a65919b6a72c..9a03d12509d6daf9d9632a020399deefd6c7ff4c
@@@ -28,15 -29,12 +29,13 @@@ SET(IN
        ../../blenloader
        ../../gpu
        ../../imbuf
-       ../include
-       ../../../../intern/guardedalloc
-       ../../../../extern/glew/include
        ../../makesdna
        ../../makesrna
-       ../../python
        ../../render/extern/include
        ../../windowmanager
+       ../../../../intern/guardedalloc
+       ../../../../extern/glew/include
 +      ../../freestyle
  )
  
  IF(WITH_QUICKTIME)