Merged changes in the trunk up to revision 31987.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 18 Sep 2010 00:50:13 +0000 (00:50 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 18 Sep 2010 00:50:13 +0000 (00:50 +0000)
1  2 
release/scripts/ui/properties_render.py
release/scripts/ui/space_userpref.py
source/blender/blenlib/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/makesrna/intern/rna_internal.h
source/creator/CMakeLists.txt
source/creator/creator.c

Simple merge
index 1e0359d1847cf77cb81dc128f26a7b476b89737b,320d4ac783ff237d686e7a3d359818a884311312..0ef2346ded44743e4732d14707932f48b23303ef
@@@ -36,14 -36,14 +36,15 @@@ SET(IN
        ../../../intern/guardedalloc
        ${ZLIB_INC}
        ${FREETYPE_INCLUDE_DIRS}
 +      ${ZLIB_INC}
  )
  
+ # unused
+ LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/BLI_bfile.c")
  IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
- SET(INC
-       ${INC}
-       ${BINRELOC_INC}
- )
+       LIST(APPEND INC "${BINRELOC_INC}")
  ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
  
  IF(WIN32)
Simple merge
Simple merge