Merged changes in the trunk up to revision 29409.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Fri, 11 Jun 2010 17:17:02 +0000 (17:17 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Fri, 11 Jun 2010 17:17:02 +0000 (17:17 +0000)
14 files changed:
1  2 
release/scripts/ui/properties_render.py
release/scripts/ui/space_userpref.py
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/render/CMakeLists.txt
source/blender/editors/render/render_shading.c
source/blender/editors/space_outliner/outliner.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_scene.c
source/blender/python/doc/sphinx_doc_gen.py
source/blender/python/intern/bpy.c
source/creator/CMakeLists.txt
source/creator/creator.c

Simple merge
index 0000000000000000000000000000000000000000,2ecdc14a4974c414231e27ba27e445f6b22f8ff8..faf110c1eedecf13dd35310a2db93a064d7c2a5a
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,54 +1,55 @@@
+ # $Id: CMakeLists.txt 12931 2007-12-17 18:20:48Z theeth $
+ # ***** BEGIN GPL LICENSE BLOCK *****
+ #
+ # This program is free software; you can redistribute it and/or
+ # modify it under the terms of the GNU General Public License
+ # as published by the Free Software Foundation; either version 2
+ # of the License, or (at your option) any later version.
+ #
+ # This program is distributed in the hope that it will be useful,
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software Foundation,
+ # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ #
+ # Contributor(s): Jacques Beaurain.
+ #
+ # ***** END GPL LICENSE BLOCK *****
+ FILE(GLOB SRC *.c)
+ SET(INC
+       ../../blenfont
+       ../../blenkernel
+       ../../blenlib
+       ../../blenloader
+       ../../gpu
+       ../../imbuf
+       ../include
+       ../../../../intern/guardedalloc
+       ../../../../extern/glew/include
+       ../../makesdna
+       ../../makesrna
+       ../../python
+       ../../render/extern/include
+       ../../windowmanager
++      ../../freestyle
+ )
+ IF(WITH_QUICKTIME)
+       SET(INC ${INC} ../../quicktime ${QUICKTIME_INC})
+       ADD_DEFINITIONS(-DWITH_QUICKTIME)
+ ENDIF(WITH_QUICKTIME)
+ IF(WITH_OPENMP)
+       ADD_DEFINITIONS(-DPARALLEL=1)
+ ENDIF(WITH_OPENMP)
+ IF(WIN32)
+       SET(INC ${INC} ${PTHREADS_INC})
+ ENDIF(WIN32)
+ BLENDERLIB(bf_editor_render "${SRC}" "${INC}")
Simple merge
index 1b01676a2b187e25b10f878a180b68dc21dd87c2,11997550ee11db318a726edd54ee8d737c940796..af3a05adadabe12a5c15ba280db06110507bf82c
@@@ -360,8 -354,45 +355,46 @@@ ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux"
        # Sort libraries
        SET(BLENDER_SORTED_LIBS
                bf_windowmanager
-               bf_editors
+         bf_editor_space_api
+         bf_editor_space_action
+         bf_editor_space_buttons
+         bf_editor_space_console
+         bf_editor_space_file
+         bf_editor_space_graph
+         bf_editor_space_image
+         bf_editor_space_info
+         bf_editor_space_logic
+         bf_editor_space_nla
+         bf_editor_space_node
+         bf_editor_space_outliner
+         bf_editor_space_script
+         bf_editor_space_sequencer
+         bf_editor_space_sound
+         bf_editor_space_time
+         bf_editor_space_userpref
+         bf_editor_space_view3d
+         bf_editor_text
+         bf_editor_transform
+         bf_editor_util
+         bf_editor_uvedit
+         bf_editor_curve
+         bf_editor_armature
+         bf_editor_gpencil
+         bf_editor_interface
+         bf_editor_mesh
+         bf_editor_metaball
+         bf_editor_object
+         bf_editor_physics
+         bf_editor_render
+         bf_editor_screen
+         bf_editor_sculpt_paint
+         bf_editor_sound
+         bf_editor_animation
+         bf_editor_datafiles
 +              bf_freestyle
                blender_BSP 
                bf_ghost 
                bf_string 
Simple merge