Merged changes in the trunk up to revision 34574.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 30 Jan 2011 23:41:58 +0000 (23:41 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 30 Jan 2011 23:41:58 +0000 (23:41 +0000)
16 files changed:
1  2 
release/scripts/ui/properties_render.py
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/object.c
source/blender/blenlib/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/space_outliner/outliner.c
source/blender/freestyle/CMakeLists.txt
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/RNA_types.h
source/blender/makesrna/intern/rna_scene.c
source/blender/python/intern/CMakeLists.txt
source/creator/CMakeLists.txt
source/creator/creator.c

@@@ -31,9 -31,8 +31,9 @@@ set(IN
        ../gpu
        ../../../intern/ghost
        ../../../intern/guardedalloc
-       ${ZLIB_INC}
+       ${ZLIB_INCLUDE_DIRS}
        ${FREETYPE_INCLUDE_DIRS}
 +      ${ZLIB_INC}
  )
  
  set(SRC
index 3b051f3,0000000..a4a9488
mode 100644,000000..100644
--- /dev/null
@@@ -1,42 -1,0 +1,42 @@@
-   ${PYTHON_INC}
 +# $Id: CMakeLists.txt 14444 2008-04-16 22:40:48Z hos $
 +# ***** 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 +#
 +# The Original Code is Copyright (C) 2006, Blender Foundation
 +# All rights reserved.
 +#
 +# The Original Code is: all of this file.
 +#
 +# Contributor(s): Jacques Beaurain.
 +#
 +# ***** END GPL LICENSE BLOCK *****
 +
 +file(GLOB_RECURSE SRC *.cpp *.h)
 +
 +set(INC 
 +  ../blenkernel ../blenloader ../blenlib ../imbuf ../makesdna ../makesrna
 +  ../python ../python/intern
 +  ../render/extern/include ../render/intern/include ../include ../src
 +  ../../../extern/glew/include ../../../intern/guardedalloc ../freestyle
++  ${PYTHON_INCLUDE_DIRS}
 +  ${PNG_INC}
 +)
 +
 +if(WIN32)
 +      set(INC ${INC} ${PTHREADS_INC})
 +endif(WIN32)
 +
 +blender_add_lib(bf_freestyle "${SRC}" "${INC}")
Simple merge
Simple merge
@@@ -31,10 -31,9 +31,10 @@@ set(IN
        ../../blenkernel
        ../../windowmanager
        ../../editors/include
 +      ../../freestyle/intern/python
        ../../../../intern/guardedalloc
        ../../../../intern/audaspace/intern
-       ${PYTHON_INC}
+       ${PYTHON_INCLUDE_DIRS}
  )
  
  set(SRC
Simple merge
Simple merge