Merged changes in the trunk up to revision 30335.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Wed, 14 Jul 2010 19:01:40 +0000 (19:01 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Wed, 14 Jul 2010 19:01:40 +0000 (19:01 +0000)
15 files changed:
1  2 
release/scripts/ui/space_userpref.py
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/space_outliner/outliner.c
source/blender/makesdna/DNA_ID.h
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/SConscript
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_main_api.c
source/blender/render/intern/source/pipeline.c
source/creator/CMakeLists.txt

Simple merge
Simple merge
Simple merge
index 3af93f70572a13b06895be91dd19f037cd795e96,207e4e15a72cb39ed5317fe607f627ff7b14a964..34ddf842aaa26a7b198ea5f98f055fe66deff3d9
@@@ -52,7 -52,7 +52,8 @@@ INCLUDE_DIRECTORIES
        ../../gpu
        ../../imbuf
        ../../render/extern/include
+       ../../../../extern/glew/include
 +      ../../freestyle
        . )
  
  FILE(GLOB INC_FILES ../*.h ../../makesdna/*.h)
Simple merge