[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26277] branches/nurbs25: Recommitting all changes after branch resync.
Emmanuel Stone
emmanuel.stone at gmail.com
Tue Jan 26 05:24:21 CET 2010
Revision: 26277
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26277
Author: eman
Date: 2010-01-26 05:24:20 +0100 (Tue, 26 Jan 2010)
Log Message:
-----------
Recommitting all changes after branch resync.
This was necessary because the branch was badly merged and was behaving weirdly.
Modified Paths:
--------------
branches/nurbs25/CMakeLists.txt
branches/nurbs25/intern/CMakeLists.txt
branches/nurbs25/intern/SConscript
branches/nurbs25/source/blender/blenkernel/BKE_curve.h
branches/nurbs25/source/blender/blenkernel/BKE_displist.h
branches/nurbs25/source/blender/blenkernel/CMakeLists.txt
branches/nurbs25/source/blender/blenkernel/SConscript
branches/nurbs25/source/blender/blenkernel/intern/curve.c
branches/nurbs25/source/blender/blenkernel/intern/displist.c
branches/nurbs25/source/blender/editors/CMakeLists.txt
branches/nurbs25/source/blender/editors/curve/SConscript
branches/nurbs25/source/blender/editors/curve/curve_intern.h
branches/nurbs25/source/blender/editors/curve/curve_ops.c
branches/nurbs25/source/blender/editors/curve/editcurve.c
branches/nurbs25/source/blender/editors/space_view3d/drawobject.c
branches/nurbs25/source/blender/editors/space_view3d/view3d_header.c
branches/nurbs25/source/blender/makesdna/DNA_curve_types.h
branches/nurbs25/source/blender/makesrna/intern/rna_curve.c
branches/nurbs25/source/blender/render/intern/source/convertblender.c
branches/nurbs25/source/creator/CMakeLists.txt
Added Paths:
-----------
branches/nurbs25/intern/nurbana/
branches/nurbs25/intern/nurbana/CMakeLists.txt
branches/nurbs25/intern/nurbana/SConscript
branches/nurbs25/intern/nurbana/extern/
branches/nurbs25/intern/nurbana/extern/nurbana.h
branches/nurbs25/intern/nurbana/intern/
branches/nurbs25/intern/nurbana/intern/Makefile
branches/nurbs25/intern/nurbana/intern/NGlobal.h
branches/nurbs25/intern/nurbana/intern/ON_IO.h
branches/nurbs25/intern/nurbana/intern/blenderNurbsStruct.h
branches/nurbs25/intern/nurbana/intern/libNurbana.cpp
branches/nurbs25/intern/nurbana/intern/nbConstruct.cpp
branches/nurbs25/intern/nurbana/intern/nbConstruct.h
branches/nurbs25/intern/nurbana/intern/nbDegree.cpp
branches/nurbs25/intern/nurbana/intern/nbDegree.h
branches/nurbs25/intern/nurbana/intern/nbFitting.cpp
branches/nurbs25/intern/nurbana/intern/nbFitting.h
branches/nurbs25/intern/nurbana/intern/nbGenerate.cpp
branches/nurbs25/intern/nurbana/intern/nbGenerate.h
branches/nurbs25/intern/nurbana/intern/nbGridTessellator.cpp
branches/nurbs25/intern/nurbana/intern/nbGridTessellator.h
branches/nurbs25/intern/nurbana/intern/nbKnot.cpp
branches/nurbs25/intern/nurbana/intern/nbKnot.h
branches/nurbs25/intern/nurbana/intern/nbMath.cpp
branches/nurbs25/intern/nurbana/intern/nbMath.h
branches/nurbs25/intern/nurbana/intern/nbNURBS.cpp
branches/nurbs25/intern/nurbana/intern/nbNURBS.h
branches/nurbs25/intern/nurbana/intern/nbNormals.cpp
branches/nurbs25/intern/nurbana/intern/nbNormals.h
branches/nurbs25/intern/nurbana/intern/nbPrimitives.cpp
branches/nurbs25/intern/nurbana/intern/nbPrimitives.h
branches/nurbs25/intern/nurbana/intern/nbTessellator.cpp
branches/nurbs25/intern/nurbana/intern/nbTessellator.h
branches/nurbs25/intern/nurbana/intern/nbTrimTessellator.cpp
branches/nurbs25/intern/nurbana/intern/nbTrimTessellator.h
branches/nurbs25/intern/nurbana/intern/nbUtils.h
branches/nurbs25/intern/nurbana/intern/nbVertexOps.cpp
branches/nurbs25/intern/nurbana/intern/nbVertexOps.h
branches/nurbs25/intern/nurbana/intern/trim/
branches/nurbs25/intern/nurbana/intern/trim/nbSubDiv.cpp
branches/nurbs25/intern/nurbana/intern/trim/nbSubDiv.h
branches/nurbs25/intern/nurbana/intern/trim/nbTessGrid.cpp
branches/nurbs25/intern/nurbana/intern/trim/nbTessGrid.h
branches/nurbs25/intern/nurbana/intern/trim/nbTrimPatch.cpp
branches/nurbs25/intern/nurbana/intern/trim/nbTrimPatch.h
Modified: branches/nurbs25/CMakeLists.txt
===================================================================
--- branches/nurbs25/CMakeLists.txt 2010-01-26 03:29:07 UTC (rev 26276)
+++ branches/nurbs25/CMakeLists.txt 2010-01-26 04:24:20 UTC (rev 26277)
@@ -34,11 +34,11 @@
MESSAGE(FATAL_ERROR "CMake generation for blender is not allowed within the source directory!
Remove the CMakeCache.txt file and try again from another folder, e.g.:
- rm CMakeCache.txt
- cd ..
- mkdir cmake-make
- cd cmake-make
- cmake -G \"Unix Makefiles\" ../blender
+ rm CMakeCache.txt
+ cd ..
+ mkdir cmake-make
+ cd cmake-make
+ cmake -G \"Unix Makefiles\" ../blender
")
ENDIF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
@@ -57,20 +57,20 @@
#-----------------------------------------------------------------------------
# Set default config options
-OPTION(WITH_PLAYER "Build Player" OFF)
-OPTION(WITH_GAMEENGINE "Enable Game Engine" ON)
-OPTION(WITH_BULLET "Enable Bullet (Physics Engine)" ON)
-OPTION(WITH_INTERNATIONAL "Enable I18N (International fonts and text)" ON)
-OPTION(WITH_ELBEEM "Enable Elbeem (Fluid Simulation)" ON)
-OPTION(WITH_QUICKTIME "Enable Quicktime Support" OFF)
-OPTION(WITH_OPENEXR "Enable OpenEXR Support (http://www.openexr.com)" ON)
-OPTION(WITH_DDS "Enable DDS Support" ON)
-OPTION(WITH_FFMPEG "Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu/)" OFF)
-OPTION(WITH_PYTHON "Enable Embedded Python API" ON)
-OPTION(WITH_SDL "Enable SDL for sound and joystick support" ON)
-OPTION(WITH_OPENJPEG "Enable OpenJpeg Support (http://www.openjpeg.org/)" OFF)
-OPTION(WITH_OPENAL "Enable OpenAL Support (http://www.openal.org)" ON)
-OPTION(WITH_WEBPLUGIN "Enable Web Plugin (Unix only)" OFF)
+OPTION(WITH_PLAYER "Build Player" OFF)
+OPTION(WITH_GAMEENGINE "Enable Game Engine" ON)
+OPTION(WITH_BULLET "Enable Bullet (Physics Engine)" ON)
+OPTION(WITH_INTERNATIONAL "Enable I18N (International fonts and text)" ON)
+OPTION(WITH_ELBEEM "Enable Elbeem (Fluid Simulation)" ON)
+OPTION(WITH_QUICKTIME "Enable Quicktime Support" OFF)
+OPTION(WITH_OPENEXR "Enable OpenEXR Support (http://www.openexr.com)" ON)
+OPTION(WITH_DDS "Enable DDS Support" ON)
+OPTION(WITH_FFMPEG "Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu/)" OFF)
+OPTION(WITH_PYTHON "Enable Embedded Python API" ON)
+OPTION(WITH_SDL "Enable SDL for sound and joystick support" ON)
+OPTION(WITH_OPENJPEG "Enable OpenJpeg Support (http://www.openjpeg.org/)" OFF)
+OPTION(WITH_OPENAL "Enable OpenAL Support (http://www.openal.org)" ON)
+OPTION(WITH_WEBPLUGIN "Enable Web Plugin (Unix only)" OFF)
OPTION(WITH_FFTW3 "Enable FFTW3 support" OFF)
OPTION(WITH_JACK "Enable Jack Support (http://www.jackaudio.org)" OFF)
OPTION(WITH_SNDFILE "Enable libsndfile Support (http://www.mega-nerd.com/libsndfile)" OFF)
@@ -95,7 +95,7 @@
ENDIF (APPLE)
IF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
- MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")
+ MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")
ENDIF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
# For alternate Python locations the commandline can be used to override detected/default cache settings, e.g:
@@ -116,14 +116,14 @@
IF(UNIX AND NOT APPLE)
- IF(WITH_OPENAL)
- FIND_PACKAGE(OpenAL)
- IF(OPENAL_FOUND)
- SET(WITH_OPENAL ON)
- ELSE(OPENAL_FOUND)
- SET(WITH_OPENAL OFF)
- ENDIF(OPENAL_FOUND)
- ENDIF(WITH_OPENAL)
+ IF(WITH_OPENAL)
+ FIND_PACKAGE(OpenAL)
+ IF(OPENAL_FOUND)
+ SET(WITH_OPENAL ON)
+ ELSE(OPENAL_FOUND)
+ SET(WITH_OPENAL OFF)
+ ENDIF(OPENAL_FOUND)
+ ENDIF(WITH_OPENAL)
IF(WITH_JACK)
SET(JACK /usr)
@@ -139,20 +139,20 @@
SET(SNDFILE_LIBPATH ${SNDFILE}/lib)
ENDIF(WITH_SNDFILE)
- FIND_LIBRARY(INTL_LIBRARY
- NAMES intl
- PATHS
- /sw/lib
- )
- FIND_LIBRARY(ICONV_LIBRARY
- NAMES iconv
- PATHS
- /sw/lib
- )
+ FIND_LIBRARY(INTL_LIBRARY
+ NAMES intl
+ PATHS
+ /sw/lib
+ )
+ FIND_LIBRARY(ICONV_LIBRARY
+ NAMES iconv
+ PATHS
+ /sw/lib
+ )
- IF(INTL_LIBRARY AND ICONV_LIBRARY)
- SET(GETTEXT_LIB ${INTL_LIBRARY} ${ICONV_LIBRARY})
- ENDIF(INTL_LIBRARY AND ICONV_LIBRARY)
+ IF(INTL_LIBRARY AND ICONV_LIBRARY)
+ SET(GETTEXT_LIB ${INTL_LIBRARY} ${ICONV_LIBRARY})
+ ENDIF(INTL_LIBRARY AND ICONV_LIBRARY)
FIND_PACKAGE(Freetype)
# UNSET(FREETYPE_INCLUDE_DIRS CACHE) # cant use
@@ -169,32 +169,32 @@
# FIND_PACKAGE(PythonInterp) # not used yet
# SET(PYTHON_BINARY ${PYTHON_EXECUTABLE} CACHE STRING "")
- SET(PYTHON_LINKFLAGS "-Xlinker -export-dynamic")
+ SET(PYTHON_LINKFLAGS "-Xlinker -export-dynamic")
- IF(WITH_SDL)
- FIND_PACKAGE(SDL)
+ IF(WITH_SDL)
+ FIND_PACKAGE(SDL)
# UNSET(SDLMAIN_LIBRARY CACHE)
IF(NOT SDL_FOUND)
SET(WITH_SDL OFF)
ENDIF(NOT SDL_FOUND)
- ENDIF(WITH_SDL)
+ ENDIF(WITH_SDL)
- FIND_PATH(OPENEXR_INC
- ImfXdr.h
- PATHS
- /usr/local/include/OpenEXR
- /usr/include/OpenEXR
- /sw/include/OpenEXR
- /opt/local/include/OpenEXR
- /opt/csw/include/OpenEXR
- /opt/include/OpenEXR
- )
- SET(OPENEXR_LIB Half IlmImf Iex Imath)
+ FIND_PATH(OPENEXR_INC
+ ImfXdr.h
+ PATHS
+ /usr/local/include/OpenEXR
+ /usr/include/OpenEXR
+ /sw/include/OpenEXR
+ /opt/local/include/OpenEXR
+ /opt/csw/include/OpenEXR
+ /opt/include/OpenEXR
+ )
+ SET(OPENEXR_LIB Half IlmImf Iex Imath)
- SET(FFMPEG /usr)
- SET(FFMPEG_INC ${FFMPEG}/include)
- SET(FFMPEG_LIB avformat avcodec avutil avdevice swscale)
- SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
+ SET(FFMPEG /usr)
+ SET(FFMPEG_INC ${FFMPEG}/include)
+ SET(FFMPEG_LIB avformat avcodec avutil avdevice swscale)
+ SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
IF(WITH_FFTW3)
SET(FFTW3 /usr)
@@ -208,11 +208,11 @@
SET(LIBSAMPLERATE_LIB samplerate)
SET(LIBSAMPLERATE_LIBPATH ${LIBSAMPLERATE}/lib)
- FIND_PACKAGE(JPEG REQUIRED)
+ FIND_PACKAGE(JPEG REQUIRED)
- FIND_PACKAGE(PNG REQUIRED)
+ FIND_PACKAGE(PNG REQUIRED)
- FIND_PACKAGE(ZLIB REQUIRED)
+ FIND_PACKAGE(ZLIB REQUIRED)
IF (WITH_OPENCOLLADA)
SET(OPENCOLLADA /usr/local/opencollada CACHE FILEPATH "OpenCollada Directory")
@@ -236,53 +236,53 @@
SET(LLIBS "${LLIBS} -ldl")
ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
- IF(WITH_OPENMP)
- SET(LLIBS "${LLIBS} -lgomp")
- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp")
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp")
- ENDIF(WITH_OPENMP)
+ IF(WITH_OPENMP)
+ SET(LLIBS "${LLIBS} -lgomp")
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp")
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp")
+ ENDIF(WITH_OPENMP)
SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing -Wno-char-subscripts")
- SET(PLATFORM_LINKFLAGS "-pthread")
+ SET(PLATFORM_LINKFLAGS "-pthread")
- # Better warnings
+ # Better warnings
SET(C_WARNINGS "-Wall -Wno-char-subscripts -Wpointer-arith -Wcast-align -Wdeclaration-after-statement -Wno-unknown-pragmas")
SET(CXX_WARNINGS "-Wall -Wno-invalid-offsetof -Wno-sign-compare")
- INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR} ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} )
+ INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR} ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} )
ENDIF(UNIX AND NOT APPLE)
IF(WIN32)
- # this file is included anyway when building under Windows with cl.exe
- # INCLUDE(${CMAKE_ROOT}/Modules/Platform/Windows-cl.cmake)
+ # this file is included anyway when building under Windows with cl.exe
+ # INCLUDE(${CMAKE_ROOT}/Modules/Platform/Windows-cl.cmake)
- SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/windows)
+ SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/windows)
- # Setup 64bit and 64bit windows systems
- IF(CMAKE_CL_64)
- message("64 bit compiler detected.")
- SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/win64)
- ENDIF(CMAKE_CL_64)
+ # Setup 64bit and 64bit windows systems
+ IF(CMAKE_CL_64)
+ message("64 bit compiler detected.")
+ SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/win64)
+ ENDIF(CMAKE_CL_64)
- SET(PYTHON ${LIBDIR}/python)
+ SET(PYTHON ${LIBDIR}/python)
SET(PYTHON_VERSION 3.1)
- SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}")
+ SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}")
# SET(PYTHON_BINARY python) # not used yet
SET(PYTHON_LIB python31)
- SET(PYTHON_LIBPATH ${PYTHON}/lib)
+ SET(PYTHON_LIBPATH ${PYTHON}/lib)
- IF(CMAKE_CL_64)
- SET(WITH_OPENAL OFF)
- ELSE(CMAKE_CL_64)
- #SET(WITH_OPENAL ON)
- SET(OPENAL ${LIBDIR}/openal)
+ IF(CMAKE_CL_64)
+ SET(WITH_OPENAL OFF)
+ ELSE(CMAKE_CL_64)
+ #SET(WITH_OPENAL ON)
+ SET(OPENAL ${LIBDIR}/openal)
SET(OPENAL_INCLUDE_DIR ${OPENAL}/include)
SET(OPENAL_LIBRARY wrap_oal)
- SET(OPENAL_LIBPATH ${OPENAL}/lib)
- ENDIF(CMAKE_CL_64)
+ SET(OPENAL_LIBPATH ${OPENAL}/lib)
+ ENDIF(CMAKE_CL_64)
IF(WITH_JACK)
SET(JACK ${LIBDIR}/jack)
@@ -298,31 +298,31 @@
SET(SNDFILE_LIBPATH ${SNDFILE}/lib)
ENDIF(WITH_SNDFILE)
- IF(CMAKE_CL_64)
- SET(PNG_LIBRARIES libpng)
- ELSE(CMAKE_CL_64)
- SET(PNG_LIBRARIES libpng_st)
- ENDIF(CMAKE_CL_64)
- SET(JPEG_LIBRARY libjpeg)
+ IF(CMAKE_CL_64)
+ SET(PNG_LIBRARIES libpng)
+ ELSE(CMAKE_CL_64)
+ SET(PNG_LIBRARIES libpng_st)
+ ENDIF(CMAKE_CL_64)
+ SET(JPEG_LIBRARY libjpeg)
- SET(ZLIB ${LIBDIR}/zlib)
- SET(ZLIB_INC ${ZLIB}/include)
+ SET(ZLIB ${LIBDIR}/zlib)
+ SET(ZLIB_INC ${ZLIB}/include)
IF(CMAKE_CL_64)
SET(ZLIB_LIBRARIES libz)
ELSE(CMAKE_CL_64)
- SET(ZLIB_LIBRARIES zlib)
+ SET(ZLIB_LIBRARIES zlib)
ENDIF(CMAKE_CL_64)
- SET(ZLIB_LIBPATH ${ZLIB}/lib)
+ SET(ZLIB_LIBPATH ${ZLIB}/lib)
- SET(PTHREADS ${LIBDIR}/pthreads)
- SET(PTHREADS_INC ${PTHREADS}/include)
- SET(PTHREADS_LIB pthreadVC2)
- SET(PTHREADS_LIBPATH ${PTHREADS}/lib)
+ SET(PTHREADS ${LIBDIR}/pthreads)
+ SET(PTHREADS_INC ${PTHREADS}/include)
+ SET(PTHREADS_LIB pthreadVC2)
+ SET(PTHREADS_LIBPATH ${PTHREADS}/lib)
- SET(ICONV ${LIBDIR}/iconv)
- SET(ICONV_INC ${ICONV}/include)
- SET(ICONV_LIB iconv)
- SET(ICONV_LIBPATH ${ICONV}/lib)
+ SET(ICONV ${LIBDIR}/iconv)
+ SET(ICONV_INC ${ICONV}/include)
+ SET(ICONV_LIB iconv)
+ SET(ICONV_LIBPATH ${ICONV}/lib)
IF(WITH_FFTW3)
SET(FFTW3 ${LIBDIR}/fftw3)
@@ -331,85 +331,88 @@
SET(FFTW3_LIBPATH ${FFTW3}/lib)
ENDIF(WITH_FFTW3)
- SET(GETTEXT ${LIBDIR}/gettext)
- SET(GETTEXT_INC ${GETTEXT}/include)
- IF(CMAKE_CL_64)
+ SET(GETTEXT ${LIBDIR}/gettext)
+ SET(GETTEXT_INC ${GETTEXT}/include)
+ IF(CMAKE_CL_64)
SET(GETTEXT_LIB gettext)
- ELSE(CMAKE_CL_64)
- SET(GETTEXT_LIB gnu_gettext)
- ENDIF(CMAKE_CL_64)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list