svn merge -r 12607:12653 https://svn.blender.org/svnroot/bf-blender/trunk/blender...
authorDaniel Genrich <daniel.genrich@gmx.net>
Thu, 22 Nov 2007 20:28:24 +0000 (20:28 +0000)
committerDaniel Genrich <daniel.genrich@gmx.net>
Thu, 22 Nov 2007 20:28:24 +0000 (20:28 +0000)
1  2 
CMakeLists.txt
intern/elbeem/CMakeLists.txt
intern/elbeem/intern/paraloopend.h
source/blender/blenkernel/intern/modifier.c
source/blender/blenloader/intern/readfile.c
source/blender/makesdna/DNA_modifier_types.h
source/blender/src/buttons_editing.c
source/blender/src/transform_conversions.c

diff --cc CMakeLists.txt
@@@ -65,8 -65,8 +65,9 @@@ OPTION(WITH_ELBEEM            "Enable Elbeem (Flu
  OPTION(WITH_QUICKTIME         "Enable Quicktime Support"                              OFF)
  OPTION(WITH_OPENEXR           "Enable OpenEXR Support (http://www.openexr.com)"       OFF)
  OPTION(WITH_FFMPEG            "Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu/)"   OFF)
--OPTION(WITH_OPENAL            "Enable OpenAL Support (http://www.openal.org)" ON)
--OPTION(YESIAMSTUPID           "Enable execution on 64-bit platforms"                                  OFF)
++OPTION(WITH_OPENAL            "Enable OpenAL Support (http://www.openal.org)"         ON)
++OPTION(YESIAMSTUPID           "Enable execution on 64-bit platforms"                  OFF)
++OPTION(WITH_OPENMP            "Enable OpenMP (has to be supported by the compiler)"   OFF)
  
  IF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
    MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")
@@@ -186,6 -186,6 +187,12 @@@ IF(UNIX
  
    SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing -DXP_UNIX -Wno-char-subscripts")
  
++  IF(WITH_OPENMP)
++    SET(LLIBS ${LLIBS} gomp)
++    SET(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} "-fopenmp")
++    SET(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-fopenmp")
++  ENDIF(WITH_OPENMP)
++
    SET(PLATFORM_LINKFLAGS "-pthread")
  
    INCLUDE_DIRECTORIES(/usr/include /usr/local/include)
@@@ -270,6 -270,6 +277,11 @@@ IF(WIN32
    SET(CMAKE_C_FLAGS_MINSIZEREL "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /O1 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
    SET(CMAKE_C_FLAGS_RELWITHDEBINFO "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /O2 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
  
++  IF(WITH_OPENMP)
++    SET(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} "/openmp")
++    SET(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "/openmp")
++  ENDIF(WITH_OPENMP)
++
    SET(SDL ${LIBDIR}/sdl)
    SET(SDL_INC ${SDL}/include)
    SET(SDL_LIB SDL)
@@@ -347,6 -347,6 +359,12 @@@ IF(APPLE
    SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing")
    SET(PLATFORM_LINKFLAGS "-fexceptions -framework CoreServices -framework Foundation -framework IOKit -framework AppKit -framework Carbon -framework AGL -framework AudioUnit -framework AudioToolbox -framework CoreAudio -framework QuickTime")
  
++  IF(WITH_OPENMP)
++    SET(LLIBS ${LLIBS} gomp)
++    SET(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} "-fopenmp")
++    SET(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-fopenmp")
++  ENDIF(WITH_OPENMP)
++
    SET(SDL ${LIBDIR}/sdl)
    SET(SDL_INC ${SDL}/include)
    SET(SDL_LIB SDL)
@@@ -36,5 -36,5 +36,9 @@@ IF(WINDOWS
      ADD_DEFINITIONS(-DUSE_MSVC6FIXES)
  ENDIF(WINDOWS)
  
++IF(WITH_OPENMP)
++    ADD_DEFINITIONS(-DPARALLEL)
++ENDIF(WITH_OPENMP)
++
  BLENDERLIB_NOLIST(bf_elbeem "${SRC}" "${INC}")
  #, libtype='blender', priority=0 )
index 889e293,0000000..81fc329
mode 100644,000000..100644
--- /dev/null
@@@ -1,13 -1,0 +1,13 @@@
- } /* all cell loop k,j,i */ 
 +// >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 +} /* i */ 
 +      int i=0; 
 +      ADVANCE_POINTERS(2*gridLoopBound); 
 +} /* j */ 
 +#pragma omp barrier 
 +      /* COMPRESSGRIDS!=1 */ 
 +      /* int i=0;  */ 
 +      /* ADVANCE_POINTERS(mLevel[lev].lSizex*2);  */ 
++} /* all cell loop k,j,i */
 +      if(doReduce) { } /* dummy remove warning */ 
 +} /* main_region */ 
 +
Simple merge
@@@ -2998,15 -3050,13 +3051,17 @@@ void special_aftertrans_update(TransInf
        }
        else {
                base= FIRSTBASE;
-               while(base) {                                           
 -              while (base) {  
 -                      
++
++              while (base) {                  
++
                        if(base->flag & BA_DO_IPO) redrawipo= 1;
                        
                        ob= base->object;
                        
-                       if(modifiers_isSoftbodyEnabled(ob)) ob->softflag |= OB_SB_REDO;
+                       if (modifiers_isSoftbodyEnabled(ob)) ob->softflag |= OB_SB_REDO;
 +                      else if(modifiers_isClothEnabled(ob)) {
 +                              cloth_free_modifier(modifiers_isClothEnabled(ob));
 +                      }
                        
                        /* Set autokey if necessary */
                        if ((!cancelled) && (t->mode != TFM_DUMMY) && (base->flag & SELECT)) {