COLLADA: merge from trunk -r 24390:24522.
authorArystanbek Dyussenov <arystan.d@gmail.com>
Thu, 12 Nov 2009 14:49:54 +0000 (14:49 +0000)
committerArystanbek Dyussenov <arystan.d@gmail.com>
Thu, 12 Nov 2009 14:49:54 +0000 (14:49 +0000)
1  2 
CMakeLists.txt
source/blender/blenkernel/intern/image.c
source/blender/windowmanager/intern/wm_operators.c

diff --combined CMakeLists.txt
index 9360d930a5ab4237ebe5fab970d5000c2c65bfdc,0706d3a9b52f2a5790b7827be59e983ceb27fd9d..01f1dd69a9aef1947400cd409cf20c21acc7e3b7
@@@ -80,7 -80,7 +80,7 @@@ OPTION(WITH_LZMA          "Enable best 
  OPTION(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation" OFF)
  OPTION(WITH_BUILDINFO     "Include extra build details" ON)
  OPTION(WITH_INSTALL       "Install accompanying scripts and language files needed to run blender" ON)
 -OPTION(WITH_OPENCOLLADA               "Enable OpenCollada Support (http://www.opencollada.org/)"      OFF)
 +OPTION(WITH_OPENCOLLADA               "Enable OpenCollada Support (http://www.opencollada.org/)"      ON)
  
  IF (APPLE)
  OPTION(WITH_COCOA       "Use Cocoa framework instead of deprecated Carbon" ON)
@@@ -91,18 -91,6 +91,6 @@@ IF(NOT WITH_GAMEENGINE AND WITH_PLAYER
        MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")
  ENDIF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
  
- IF (WITH_OPENCOLLADA AND NOT APPLE)
- SET(OPENCOLLADA /usr/local/opencollada CACHE FILEPATH "OpenCollada Directory")
- SET(OPENCOLLADA_LIBPATH ${OPENCOLLADA})
- SET(OPENCOLLADA_LIB OpenCollada)
- SET(PCRE /usr CACHE FILEPATH "PCRE Directory")
- SET(PCRE_LIBPATH ${PCRE}/lib)
- SET(PCRE_LIB pcre)
- SET(EXPAT /usr CACHE FILEPATH "Expat Directory")
- SET(EXPAT_LIBPATH ${EXPAT}/lib)
- SET(EXPAT_LIB expat)
- ENDIF (WITH_OPENCOLLADA AND NOT APPLE)
  # For alternate Python locations the commandline can be used to override detected/default cache settings, e.g:
  # On Unix: 
  #   cmake -D PYTHON_LIB=/usr/local/lib/python2.3/config/libpython2.3.so -D PYTHON_INC=/usr/local/include/python2.3 -D PYTHON_BINARY=/usr/local/bin/python2.3 -G "Unix Makefiles" ../blender
@@@ -119,6 -107,8 +107,8 @@@ INCLUDE(CMake/macros.cmake
  #Platform specifics
  
  IF(UNIX AND NOT APPLE)
        IF(WITH_OPENAL)
                FIND_PACKAGE(OpenAL)
                IF(OPENAL_FOUND)
  
        FIND_PACKAGE(ZLIB REQUIRED)
  
+       IF (WITH_OPENCOLLADA)
+               SET(OPENCOLLADA /usr/local/opencollada CACHE FILEPATH "OpenCollada Directory")
+               SET(OPENCOLLADA_LIBPATH ${OPENCOLLADA})
+               SET(OPENCOLLADA_LIB OpenCollada)
+               SET(OPENCOLLADA_INC ${OPENCOLLADA})
+               SET(PCRE /usr CACHE FILEPATH "PCRE Directory")
+               SET(PCRE_LIBPATH ${PCRE}/lib)
+               SET(PCRE_LIB pcre)
+               SET(EXPAT /usr CACHE FILEPATH "Expat Directory")
+               SET(EXPAT_LIBPATH ${EXPAT}/lib)
+               SET(EXPAT_LIB expat)
+       ENDIF (WITH_OPENCOLLADA)
        # Could use ${X11_Xinput_LIB} ${X11_X11_LIB} too
        SET(LLIBS "-lXi -lutil -lc -lm -lpthread -lstdc++ -lX11")
  
@@@ -400,6 -404,16 +404,16 @@@ IF(WIN32
    
        SET(WINTAB_INC ${LIBDIR}/wintab/include) 
  
+       SET(OPENCOLLADA ${LIBDIR}/opencollada)
+       SET(OPENCOLLADA_INC ${OPENCOLLADA}/include)
+       SET(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
+       SET(OPENCOLLADA_LIB OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils OpenCOLLADAStreamWriter MathMLSolver GeneratedSaxParser UTF xml2 )
+       #pcre is bundled with openCollada
+       #SET(PCRE ${LIBDIR}/pcre)
+       #SET(PCRE_LIBPATH ${PCRE}/lib)
+       SET(PCRE_LIB pcre)
        IF(CMAKE_CL_64)
                SET(PLATFORM_LINKFLAGS "/MACHINE:X64 /NODEFAULTLIB:libc.lib;MSVCRT.lib ")
        ELSE(CMAKE_CL_64)
@@@ -532,10 -546,10 +546,10 @@@ IF(APPLE
                #SET(PCRE ${LIBDIR}/pcre)
                #SET(PCRE_LIBPATH ${PCRE}/lib)
                SET(PCRE_LIB pcre)
-               #native OSX libxml2 is used
+               #libxml2 is used
                #SET(EXPAT ${LIBDIR}/expat)
                #SET(EXPAT_LIBPATH ${EXPAT}/lib)
-               #SET(EXPAT_LIB expat)
+               SET(EXPAT_LIB)
        ENDIF (WITH_OPENCOLLADA)
  
        SET(SDL ${LIBDIR}/sdl)
index 64e8aff3830451ab9e25b328e0937cea8d46ec54,0452b38a2e517befe6106d220c65dfd897d28fa3..0c6eaffbed2e252806be1613f02adc14a269470c
@@@ -61,7 -61,7 +61,7 @@@
  #include "DNA_sequence_types.h"
  #include "DNA_userdef_types.h"
  
- #include "BLI_arithb.h"
+ #include "BLI_math.h"
  #include "BLI_blenlib.h"
  #include "BLI_threads.h"
  
@@@ -2346,3 -2346,4 +2346,3 @@@ int BKE_get_image_export_path(struct Im
  
        return 1;
  }
 -
index 674f72336907e9d72709257db9a77970904bcb77,f8febdcd8989a3b993ef81705679728d241eb3e9..1f8e2e280241c328faa6918851785553840c1b38
@@@ -656,7 -656,6 +656,7 @@@ int WM_operator_redo_popup(bContext *C
        return OPERATOR_CANCELLED;
  }
  
 +
  /* ***************** Debug menu ************************* */
  
  static uiBlock *wm_block_create_menu(bContext *C, ARegion *ar, void *arg_op)
@@@ -1811,8 -1810,11 +1811,11 @@@ static void tweak_gesture_modal(bContex
                        }
                        break;
                default:
-                       WM_gesture_end(C, gesture);
-                       window->tweak= NULL;
+                       if(!ISTIMER(event->type)) {
+                               WM_gesture_end(C, gesture);
+                               window->tweak= NULL;
+                       }
+                       break;
        }
  }
  
@@@ -2212,7 -2214,6 +2215,7 @@@ void WM_OT_radial_control_partial(wmOpe
        RNA_def_int_vector(ot->srna, "initial_mouse", 2, NULL, INT_MIN, INT_MAX, "initial_mouse", "", INT_MIN, INT_MAX);
  }
  
 +
  /* ************************** timer for testing ***************** */
  
  /* uses no type defines, fully local testing function anyway... ;) */
@@@ -2376,6 -2377,7 +2379,6 @@@ void wm_operatortype_init(void
        WM_operatortype_append(WM_OT_memory_statistics);
        WM_operatortype_append(WM_OT_debug_menu);
        WM_operatortype_append(WM_OT_search_menu);
 -      WM_operatortype_append(WM_OT_call_menu);
  
  #ifdef WITH_COLLADA
        /* XXX: move these */
        WM_operatortype_append(WM_OT_collada_import);
  #endif
  
 +      WM_operatortype_append(WM_OT_call_menu);
  }
  
  /* called in transform_ops.c, on each regeneration of keymaps  */