svn merge ^/trunk/blender -r43995:44024
authorCampbell Barton <ideasman42@gmail.com>
Sat, 11 Feb 2012 04:10:50 +0000 (04:10 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 11 Feb 2012 04:10:50 +0000 (04:10 +0000)
1  2 
CMakeLists.txt
source/blender/modifiers/CMakeLists.txt

diff --combined CMakeLists.txt
index 4cd52245fefe2f4613eed2a9e90f95d1ad921f9c,e0b14b7d640fe152b65c527aaab46c67157575d8..f684c81cec2450feba8ab3d1c76636e54b259ba2
@@@ -129,7 -129,7 +129,7 @@@ option(WITH_BUILDINFO     "Include extr
  option(WITH_IK_ITASC      "Enable ITASC IK solver (only disable for development & for incompatible C++ compilers)" ON)
  option(WITH_FFTW3         "Enable FFTW3 support (Used for smoke and audio effects)" OFF)
  option(WITH_BULLET        "Enable Bullet (Physics Engine)" ON)
 -option(WITH_GAMEENGINE    "Enable Game Engine" ON)
 +option(WITH_GAMEENGINE    "Enable Game Engine" OFF)  # DISABLE FOR BMESH UNTIL NAVMESH IS WORKING
  option(WITH_PLAYER        "Build Player" OFF)
  
  # GHOST Windowing Library Options
@@@ -1490,10 -1490,9 +1490,9 @@@ if(MSVC10
  endif()
  
  if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-       if(WITH_IK_ITASC OR WITH_MOD_FLUID)
+       if(WITH_IK_ITASC)
                message(WARNING "Using Clang as CXX compiler: disabling WITH_IK_ITASC and WITH_MOD_FLUID, these features will be missing.")
                set(WITH_IK_ITASC OFF)
-               set(WITH_MOD_FLUID OFF)
        endif()
  endif()
  
index 6ccd71dd6a733c7c171fb98c8a12f22fed10e145,fabaa6624d435cce3a4fc992c1748811b7ff1565..8170481cfd6560d8d594c139758d4c7bd690a990
@@@ -12,7 -12,7 +12,7 @@@
  #
  # 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.
+ # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  #
  # The Original Code is Copyright (C) 2006, Blender Foundation
  # All rights reserved.
@@@ -33,7 -33,6 +33,7 @@@ set(IN
        ../blenloader
        ../makesdna
        ../makesrna
 +      ../bmesh
        ../render/extern/include
        ../../../intern/elbeem/extern
        ../../../intern/guardedalloc
@@@ -67,7 -66,6 +67,7 @@@ set(SR
        intern/MOD_meshdeform.c
        intern/MOD_mirror.c
        intern/MOD_multires.c
 +      intern/MOD_ngoninterp.c
        intern/MOD_none.c
        intern/MOD_ocean.c
        intern/MOD_particleinstance.c