svn merge ^/trunk/blender -r40395:40405
authorCampbell Barton <ideasman42@gmail.com>
Fri, 23 Sep 2011 10:58:20 +0000 (10:58 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 23 Sep 2011 10:58:20 +0000 (10:58 +0000)
1  2 
source/blender/blenkernel/BKE_blender.h
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/SConscript
source/blender/modifiers/CMakeLists.txt
source/blender/modifiers/SConscript
source/blender/windowmanager/intern/wm_init_exit.c

index 580ca885988cd003ed7782bb76411cee43c807f3,a09e475c9a3fa819cc9227595ccc57ad310861f2..8e2d9b47ec0966a9b2c8850a8936afbf3e3f8ffb
@@@ -53,7 -53,7 +53,7 @@@ extern "C" 
                /* can be left blank, otherwise a,b,c... etc with no quotes */
  #define BLENDER_VERSION_CHAR
                /* alpha/beta/rc/release, docs use this */
- #define BLENDER_VERSION_CYCLE alpha
+ #define BLENDER_VERSION_CYCLE beta
  
  struct ListBase;
  struct MemFile;
@@@ -90,7 -90,6 +90,7 @@@ extern void BKE_reset_undo(void)
  extern char *BKE_undo_menu_string(void);
  extern void BKE_undo_number(struct bContext *C, int nr);
  extern char *BKE_undo_get_name(int nr, int *active);
 +void BKE_undo_save(char *fname);
  extern void BKE_undo_save_quit(void);
  extern struct Main *BKE_undo_get_main(struct Scene **scene);
  
index b97cee8d474e71b58a5dd0a5b8dcc363230f92fa,93ab29c5f490288ec208afc1afd4412e93a9bbcf..10bc910c2799b68056ca587f71fbfa2921cc37c3
@@@ -40,7 -40,6 +40,7 @@@ set(IN
        ../imbuf
        ../makesdna
        ../makesrna
 +      ../bmesh
        ../modifiers
        ../nodes
        ../render/extern/include
@@@ -96,7 -95,6 +96,7 @@@ set(SR
        intern/depsgraph.c
        intern/displist.c
        intern/effect.c
 +      intern/editderivedbmesh.c
        intern/fcurve.c
        intern/fluidsim.c
        intern/fmodifier.c
        intern/mesh.c
        intern/mesh_validate.c
        intern/modifier.c
 +      intern/modifiers_bmesh.c
        intern/multires.c
        intern/nla.c
        intern/node.c
        BKE_speaker.h
        BKE_subsurf.h
        BKE_suggestions.h
 +      BKE_tessmesh.h
        BKE_text.h
        BKE_texture.h
        BKE_unit.h
@@@ -357,10 -353,10 +357,10 @@@ endif(
  
  if(WITH_GAMEENGINE)
        list(APPEND INC_SYS
-         ../../../extern/recastnavigation/Recast/Include
+       ../../../extern/recastnavigation
        )
        list(APPEND SRC
-               intern/navmesh_conversion.cpp
+               intern/navmesh_conversion.c
                BKE_navmesh_conversion.h
        )
  endif()
index 5281e590cd5863b6d8ad79c1d534516f513f01f3,7d7ab56ec3fa357ebeebac934555d8bd9db8d74a..4de6172251f520788005ff4776da905d0ee26a7d
@@@ -2,7 -2,7 +2,7 @@@
  Import ('env')
  import os
  
- sources = env.Glob('intern/*.c') + env.Glob('intern/*.cpp')
+ sources = env.Glob('intern/*.c')
  
  incs = '. #/intern/guardedalloc #/intern/memutil'
  incs += ' ../blenlib ../blenfont ../makesdna ../windowmanager'
@@@ -12,7 -12,6 +12,7 @@@ incs += ' #/intern/iksolver/extern ../b
  incs += ' #/extern/bullet2/src'
  incs += ' #/intern/opennl/extern #/intern/bsp/extern'
  incs += ' ../gpu #/extern/glew/include'
 +incs += ' ../bmesh'
  incs += ' #/intern/smoke/extern'
  incs += ' #/intern/mikktspace'
  incs += ' #/intern/audaspace/intern'
@@@ -93,10 -92,10 +93,10 @@@ if env['WITH_BF_LZMA']
      defs.append('WITH_LZMA')
  
  if env['WITH_BF_GAMEENGINE']:
-     incs += ' #/extern/recastnavigation/Recast/Include'
+     incs += ' #/extern/recastnavigation'
      defs.append('WITH_GAMEENGINE')
  else:
-     sources.remove('intern' + os.sep + 'navmesh_conversion.cpp')
+     sources.remove('intern' + os.sep + 'navmesh_conversion.c')
  
  if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
      incs += ' ' + env['BF_PTHREADS_INC']
index 5147698927b2d53bd2543a660eca61afc2c34ac9,fb4aa4ca4a5c758086655115a01d81b7abe4ade0..a50b769ee11d983c01c9baeb82786d059cd53635
@@@ -33,7 -33,6 +33,7 @@@ set(IN
        ../blenloader
        ../makesdna
        ../makesrna
 +      ../bmesh
        ../render/extern/include
        ../../../intern/elbeem/extern
        ../../../intern/guardedalloc
@@@ -41,7 -40,7 +41,7 @@@
  
  set(INC_SYS
        ${ZLIB_INCLUDE_DIRS}
 -        ${GLEW_INCLUDE_PATH}
 +      ${GLEW_INCLUDE_PATH}
  )
  
  set(SRC
@@@ -66,8 -65,7 +66,8 @@@
        intern/MOD_meshdeform.c
        intern/MOD_mirror.c
        intern/MOD_multires.c
-       intern/MOD_navmesh.cpp
 +      intern/MOD_ngoninterp.c
+       intern/MOD_navmesh.c
        intern/MOD_none.c
        intern/MOD_particleinstance.c
        intern/MOD_particlesystem.c
@@@ -119,11 -117,11 +119,11 @@@ if(NOT WITH_MOD_FLUID
  endif()
  
  if(WITH_GAMEENGINE)
-       # for MOD_navmesh.cpp
+       # for MOD_navmesh.c
        add_definitions(-DWITH_GAMEENGINE)
        list(APPEND INC
                ../gpu
-               ../../../extern/recastnavigation/Recast/Include
+               ../../../extern/recastnavigation
        )
  endif()
  
index 635fd2100ba3d06a8f0ce47ba21478dc52871071,77a2d577fb59251f2f1463f65f6585d44e77b2cd..c1f2ca63f6b4c163e3e260edccf4cd717aa009d9
@@@ -1,11 -1,11 +1,11 @@@
  #!/usr/bin/python
  Import ('env')
  
- sources = env.Glob('intern/*.c') + env.Glob('intern/*.cpp')
+ sources = env.Glob('intern/*.c')
  
  incs = '. ./intern'
  incs += ' #/intern/guardedalloc #/intern/decimation/extern #/intern/bsp/extern #/intern/elbeem/extern #/extern/glew/include'
 -incs += ' ../render/extern/include ../blenloader'
 +incs += ' ../render/extern/include ../blenloader ../bmesh'
  incs += ' ../include ../blenlib ../makesdna ../makesrna ../blenkernel ../blenkernel/intern'
  incs += ' ../gpu'
  
@@@ -21,7 -21,7 +21,7 @@@ if env['BF_NO_ELBEEM']
      defs.append('DISABLE_ELBEEM')
  
  if env['WITH_BF_GAMEENGINE']:
-     incs += ' #/extern/recastnavigation/Recast/Include'
+     incs += ' #/extern/recastnavigation'
      defs.append('WITH_GAMEENGINE')
  
  env.BlenderLib ( libname = 'bf_modifiers', sources = sources,
index cc36d64926ceb7486d44672d22e5cf78901f58cc,cf3f12da7674944641e9dd7508a3433d9989c89f..19ad4a1b0ed025879af94d0bc8eb07ec1f86c1c9
@@@ -64,7 -64,6 +64,7 @@@
  #include "BKE_material.h" /* clear_matcopybuf */
  
  #include "BLI_blenlib.h"
 +#include "BLI_cellalloc.h"
  #include "BLI_winstuff.h"
  
  #include "RE_pipeline.h"              /* RE_ free stuff */
@@@ -403,7 -402,10 +403,10 @@@ void WM_exit_ext(bContext *C, const sho
        free_posebuf();
  
        BLF_exit();
+ #ifdef INTERNATIONAL
        BLF_free_unifont();
+ #endif
        
        ANIM_keyingset_infos_exit();
        
        GHOST_DisposeSystemPaths();
  
        if(MEM_get_memory_blocks_in_use()!=0) {
 -              printf("Error: Not freed memory blocks: %d\n", MEM_get_memory_blocks_in_use());
 +              printf("Error: Not freed memory blocks: %d\n", MEM_get_memory_blocks_in_use()+BLI_cellalloc_get_totblock());
                MEM_printmemlist();
 +              BLI_cellalloc_printleaks();
 +              BLI_cellalloc_destroy();
        }
        wm_autosave_delete();