Merged changes to revision 25007.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Mon, 30 Nov 2009 00:08:30 +0000 (00:08 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Mon, 30 Nov 2009 00:08:30 +0000 (00:08 +0000)
commit837e9dcade7e0c60d61f1917fd5a2ec29e22b364
treecf6ea5d2a2a28146c2e673cae63338adc536e8c4
parent10bf807574df6c96becd743544d19e3cda10bf66
parent92b4316708bad0448f4c433ef9c6c2d3cc1f4fb5
Merged changes to revision 25007.

The following files were according to the Math Lib reorganization
(see the commit log of revision 24464 for more information):
source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h

The file release/scripts/ui/properties_render.py was also updated
according the RNA UI API renaming in revision 24795.
21 files changed:
release/scripts/ui/properties_render.py
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/SConscript
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/CMakeLists.txt
source/blender/editors/render/SConscript
source/blender/editors/render/render_shading.c
source/blender/editors/screen/screen_ops.c
source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_scene.c
source/blender/python/intern/bpy_interface.c
source/blender/render/CMakeLists.txt
source/blender/render/SConscript
source/blender/render/intern/source/pipeline.c
source/blender/windowmanager/CMakeLists.txt
source/blender/windowmanager/SConscript
source/creator/creator.c