Merging r40877 through r40911 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 10 Oct 2011 15:24:31 +0000 (15:24 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 10 Oct 2011 15:24:31 +0000 (15:24 +0000)
13 files changed:
1  2 
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/blender.c
source/blender/blenkernel/intern/constraint.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/seqcache.c
source/blender/blenkernel/intern/sequencer.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_snap.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/windowmanager/intern/wm_operators.c

index 461574297424cd3c3f22cb20842260f52e775d93,bfadff064006c64ac9c7e7554df43a3308d3a52c..e8ed03b46f75c4eb8a641b9032a502af9259cdcd
@@@ -357,22 -351,18 +357,24 @@@ if(WITH_LZMA
        add_definitions(-DWITH_LZMA)
  endif()
  
 +
  if(WITH_GAMEENGINE)
        list(APPEND INC_SYS
-       ../../../extern/recastnavigation
+               ../../../extern/recastnavigation
        )
        list(APPEND SRC
                intern/navmesh_conversion.c
                BKE_navmesh_conversion.h
        )
+       add_definitions(-DWITH_GAMEENGINE)
  endif()
  
 +if(WITH_LIBMV)
 +      list(APPEND INC ../../../extern/libmv)
 +      add_definitions(-DWITH_LIBMV)
 +endif()
 +
  ## Warnings as errors, this is too strict!
  #if(MSVC)
  #     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX")