synched with trunk at revision 37212
authorNick Samarin <nicks1987@bigmir.net>
Sun, 5 Jun 2011 18:51:00 +0000 (18:51 +0000)
committerNick Samarin <nicks1987@bigmir.net>
Sun, 5 Jun 2011 18:51:00 +0000 (18:51 +0000)
19 files changed:
1  2 
extern/recastnavigation/CMakeLists.txt
release/scripts/startup/bl_ui/properties_data_modifier.py
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/object/CMakeLists.txt
source/blender/editors/util/CMakeLists.txt
source/blender/makesdna/DNA_object_types.h
source/blender/makesrna/intern/rna_actuator.c
source/blender/makesrna/intern/rna_modifier.c
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_scene.c
source/blender/modifiers/CMakeLists.txt
source/creator/CMakeLists.txt
source/gameengine/Converter/BL_BlenderDataConversion.cpp
source/gameengine/Converter/CMakeLists.txt
source/gameengine/Ketsji/CMakeLists.txt
source/gameengine/Ketsji/KX_PythonInit.cpp

index d03022a,0000000..694f142
mode 100644,000000..100644
--- /dev/null
@@@ -1,63 -1,0 +1,66 @@@
- blender_add_lib(extern_recastnavigation "${SRC}" "${INC}")
 +# $Id$
 +# ***** 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): Daniel Genrich
 +#
 +# ***** END GPL LICENSE BLOCK *****
 +
 +set(INC 
 +              Recast/Include 
 +              Detour/Include
 +)
 +
++set(INC_SYS
++
++)
++
 +set(SRC 
 +              Detour/Source/DetourCommon.cpp
 +              Detour/Source/DetourNode.cpp
 +              Detour/Source/DetourStatNavMesh.cpp
 +              Detour/Source/DetourStatNavMeshBuilder.cpp
 +              Detour/Source/DetourTileNavMesh.cpp
 +              Detour/Source/DetourTileNavMeshBuilder.cpp
 +
 +              Detour/Include/DetourCommon.h
 +              Detour/Include/DetourNode.h
 +              Detour/Include/DetourStatNavMesh.h
 +              Detour/Include/DetourStatNavMeshBuilder.h
 +              Detour/Include/DetourTileNavMesh.h
 +              Detour/Include/DetourTileNavMeshBuilder.h
 +                      
 +              Recast/Source/Recast.cpp
 +              Recast/Source/RecastContour.cpp
 +              Recast/Source/RecastFilter.cpp
 +              Recast/Source/RecastLog.cpp
 +              Recast/Source/RecastMesh.cpp
 +              Recast/Source/RecastMeshDetail.cpp
 +              Recast/Source/RecastRasterization.cpp
 +              Recast/Source/RecastRegion.cpp
 +              Recast/Source/RecastTimer.cpp
 +              
 +              Recast/Include/Recast.h
 +              Recast/Include/RecastLog.h
 +              Recast/Include/RecastTimer.h    
 +)
 +
++blender_add_lib(extern_recastnavigation "${SRC}" "${INC}" "${INC_SYS}")
@@@ -33,9 -33,12 +33,13 @@@ set(IN
        ../../windowmanager
        ../../render/extern/include
        ../../../../intern/guardedalloc
 +      ../../../../extern/recastnavigation/Recast/Include
  )
  
+ set(INC_SYS
+ )
  set(SRC
        object_add.c
        object_bake.c
@@@ -32,13 -32,12 +32,16 @@@ set(IN
        ../blenkernel
        ../blenkernel/intern
        ../render/extern/include
 +      ../editors/include
 +      ../gpu
        ../../../intern/guardedalloc
        ../../../intern/elbeem/extern
 +      ../../../extern/recastnavigation/Recast/Include
+ )
+ set(INC_SYS
        ${ZLIB_INCLUDE_DIRS}
 +        ${GLEW_INCLUDE_PATH}
  )
  
  set(SRC
Simple merge
@@@ -57,9 -57,12 +57,13 @@@ set(IN
        ../../../source/blender/gpu
        ../../../source/blender/ikplugin
        ../../../extern/bullet2/src
 +      ../../../extern/recastnavigation/Detour/Include
  )
  
+ set(INC_SYS
+ )
  set(SRC
        BL_ActionActuator.cpp
        BL_ArmatureActuator.cpp
@@@ -53,10 -53,10 +53,13 @@@ set(IN
        ../../../intern/audaspace/intern
        ../../../source/blender/blenloader
        ../../../source/blender/gpu
+ )
+ set(INC_SYS
        ${GLEW_INCLUDE_PATH}
 +      ../../../extern/recastnavigation/Recast/Include
 +      ../../../extern/recastnavigation/Detour/Include
 +      ../../../source/blender/editors/include
  )
  
  set(SRC