svn merge -r37276:38555 https://svn.blender.org/svnroot/bf-blender/trunk/blender .
authorNathan Letwory <nathan@letworyinteractive.com>
Thu, 21 Jul 2011 09:40:59 +0000 (09:40 +0000)
committerNathan Letwory <nathan@letworyinteractive.com>
Thu, 21 Jul 2011 09:40:59 +0000 (09:40 +0000)
18 files changed:
1  2 
CMakeLists.txt
build_files/scons/config/linux2-config.py
intern/ghost/CMakeLists.txt
intern/ghost/GHOST_Types.h
intern/ghost/SConscript
intern/ghost/intern/GHOST_SystemCocoa.h
intern/ghost/intern/GHOST_SystemCocoa.mm
intern/ghost/intern/GHOST_SystemWin32.cpp
intern/ghost/intern/GHOST_SystemX11.cpp
intern/ghost/intern/GHOST_SystemX11.h
release/scripts/startup/bl_ui/space_view3d.py
source/blender/editors/object/object_bake.c
source/blender/editors/space_view3d/view3d_intern.h
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/intern/rna_userdef.c
source/blender/windowmanager/intern/wm_event_system.c
source/blender/windowmanager/intern/wm_operators.c
source/blender/windowmanager/intern/wm_window.c

diff --cc CMakeLists.txt
@@@ -411,27 -445,16 +446,25 @@@ if(UNIX AND NOT APPLE
        endif()
  
        if(WITH_MEM_JEMALLOC)
-               set(JEMALLOC /usr)
-               set(JEMALLOC_LIBRARY jemalloc CACHE STRING "JeMalloc library")
-               set(JEMALLOC_LIBPATH ${JEMALLOC}/lib  CACHE FILEPATH "JeMalloc library path")
-               # no use for this yet.
-               # set(JEMALLOC_INCLUDE_DIR ${JEMALLOC}/include  CACHE FILEPATH "JeMalloc include path")
-               unset(JEMALLOC)
+               find_package(JeMalloc)
+               if(NOT JEMALLOC_FOUND)
+                       set(WITH_MEM_JEMALLOC OFF)
+               endif()
        endif()
  
 +      if (WITH_NDOF)
 +              if(CMAKE_SYSTEM_NAME MATCHES "Linux")
 +                      set(NDOF /usr)
 +                      set(NDOF_INC ${NDOF}/include)
 +                      set(NDOF_LIB spnav)
 +                      set(NDOF_LIBPATH ${FFTW3}/lib)
 +              endif()
 +      endif()
 +
        # OpenSuse needs lutil, ArchLinux not, for now keep, can avoid by using --as-needed
-       set(LLIBS "-lutil -lc -lm -lpthread -lstdc++")
+       set(PLATFORM_LINKLIBS "-lutil -lc -lm -lpthread -lstdc++")
  
-       if(NOT WITH_HEADLESS)
+       if((NOT WITH_HEADLESS) AND (NOT WITH_GHOST_SDL))
                find_package(X11 REQUIRED)
                find_path(X11_XF86keysym_INCLUDE_PATH X11/XF86keysym.h ${X11_INC_SEARCH_PATH})
                mark_as_advanced(X11_XF86keysym_INCLUDE_PATH)
Simple merge
Simple merge
@@@ -11,10 -11,22 +11,22 @@@ if window_system == 'darwin'
      sources += env.Glob('intern/*.mm')
  
  
 -pf = ['GHOST_DisplayManager', 'GHOST_System', 'GHOST_SystemPaths', 'GHOST_Window', 'GHOST_DropTarget']
 +pf = ['GHOST_DisplayManager', 'GHOST_System', 'GHOST_SystemPaths', 'GHOST_Window', 'GHOST_DropTarget', 'GHOST_NDOFManager']
  defs=['_USE_MATH_DEFINES']
  
- if window_system in ('linux2', 'openbsd3', 'sunos5', 'freebsd7', 'freebsd8', 'freebsd9', 'irix6', 'aix4', 'aix5'):
+ incs = '. ../string #extern/glew/include #source/blender/imbuf #source/blender/makesdna ' + env['BF_OPENGL_INC']
+ if env['WITH_GHOST_SDL']:
+     for f in pf:
+         try:
+             sources.remove('intern' + os.sep + f + 'Carbon.cpp')
+             sources.remove('intern' + os.sep + f + 'Win32.cpp')
+             sources.remove('intern' + os.sep + f + 'X11.cpp')
+         except ValueError:
+             pass
+     incs += ' ' + env['BF_SDL_INC']
+     defs += ['WITH_GHOST_SDL']
+ elif window_system in ('linux2', 'openbsd3', 'sunos5', 'freebsd7', 'freebsd8', 'freebsd9', 'irix6', 'aix4', 'aix5'):
      for f in pf:
          try:
              sources.remove('intern' + os.sep + f + 'Win32.cpp')
Simple merge
@@@ -858,31 -857,9 +857,13 @@@ static void finish_images(MultiresBakeR
                if(ibuf->x<=0 || ibuf->y<=0)
                        continue;
  
-               /* Margin */
-               if(bkr->bake_filter) {
-                       char *temprect;
+               RE_bake_ibuf_filter(ibuf, (char *)ibuf->userdata, bkr->bake_filter);
  
-                       /* extend the mask +2 pixels from the image,
-                        * this is so colors dont blend in from outside */
-                       for(i=0; i<bkr->bake_filter; i++)
-                               IMB_mask_filter_extend((char *)ibuf->userdata, ibuf->x, ibuf->y);
-                       temprect = MEM_dupallocN(ibuf->userdata);
-                       /* expand twice to clear this many pixels, so they blend back in */
-                       IMB_mask_filter_extend(temprect, ibuf->x, ibuf->y);
-                       IMB_mask_filter_extend(temprect, ibuf->x, ibuf->y);
-                       /* clear all pixels in the margin */
-                       IMB_mask_clear(ibuf, temprect, FILTER_MASK_MARGIN);
-                       MEM_freeN(temprect);
+               ibuf->userflags|= IB_BITMAPDIRTY;
 +
-                       for(i= 0; i<bkr->bake_filter; i++)
-                               IMB_filter_extend(ibuf, (char *)ibuf->userdata);
-               }
++              if(ibuf->rect_float)
++                      ibuf->userflags|= IB_RECT_INVALID;
 +
-               ibuf->userflags|= IB_BITMAPDIRTY;
                if(ibuf->mipmap[0]) {
                        ibuf->userflags|= IB_MIPMAP_INVALID;
                        imb_freemipmapImBuf(ibuf);
@@@ -375,10 -375,7 +375,11 @@@ typedef struct UserDef 
        short scrcastwait;              /* milliseconds between screencast snapshots */
        
        short widget_unit;              /* defaults to 20 for 72 DPI setting */
-       short pad[1];                   
+       short anisotropic_filter;
++      /*short pad[3];                 */
 +
 +      float ndof_sensitivity; /* overall sensitivity of 3D mouse */
 +      int ndof_flag;                  /* flags for 3D mouse */
  
        char versemaster[160];
        char verseuser[160];
        short autokey_mode;             /* autokeying mode */
        short autokey_flag;             /* flags for autokeying */
        
--      short text_render, pad9;                /*options for text rendering*/
-       float pad10;
++      short text_render, pad9[3];             /*options for text rendering*/
  
        struct ColorBand coba_weight;   /* from texture.h */