Merged changes in the trunk up to revision 30781.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Tue, 27 Jul 2010 00:08:15 +0000 (00:08 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Tue, 27 Jul 2010 00:08:15 +0000 (00:08 +0000)
19 files changed:
1  2 
release/scripts/ui/space_userpref.py
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/render/render_shading.c
source/blender/editors/transform/transform_orientations.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/RNA_enum_types.h
source/blender/makesrna/SConscript
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/rna_scene.c
source/blender/render/intern/include/render_types.h
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/shadeinput.c
source/creator/CMakeLists.txt

Simple merge
Simple merge
index 4eb566f6570f00066bb945f12a22314c79cb33c0,07e1437907276e0660c445143831ad089d08a667..edac0a07f07ecc07e2040b5323ff6e35621eae34
@@@ -6,10 -6,9 +6,10 @@@ objs = [
  o = SConscript('intern/SConscript')
  objs += o
  
- incs = '#/intern/guardedalloc #/intern/audaspace/intern ../blenkernel ../blenlib ../makesdna intern .'
+ incs = '#/intern/guardedalloc #/intern/memutil #/intern/audaspace/intern ../blenkernel ../blenlib ../makesdna intern .'
  incs += ' ../windowmanager ../editors/include ../gpu ../imbuf ../ikplugin'
  incs += ' ../render/extern/include'
 +incs += ' ../freestyle'
  
  defs = []
  
Simple merge