[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52861] branches/soc-2008-mxcurioni: Merged changes in the trunk up to revision 52858.
Tamito Kajiyama
rd6t-kjym at asahi-net.or.jp
Tue Dec 11 00:34:42 CET 2012
Revision: 52861
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52861
Author: kjym3
Date: 2012-12-10 23:34:41 +0000 (Mon, 10 Dec 2012)
Log Message:
-----------
Merged changes in the trunk up to revision 52858.
Congratulations to all trunk devs on the Blender 2.65 release!
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52858
Modified Paths:
--------------
branches/soc-2008-mxcurioni/CMakeLists.txt
branches/soc-2008-mxcurioni/build_files/cmake/cmake_static_check_cppcheck.py
branches/soc-2008-mxcurioni/extern/libmv/libmv/simple_pipeline/resect.cc
branches/soc-2008-mxcurioni/intern/audaspace/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_ButterworthFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_ButterworthFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_HighpassFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_HighpassFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_IDynamicIIRFilterCalculator.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_LowpassFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_LowpassFactory.h
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_object.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/osl_shader.cpp
branches/soc-2008-mxcurioni/release/datafiles/splash.png
branches/soc-2008-mxcurioni/release/scripts/presets/keyconfig/maya.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/image.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_console.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_info.py
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_blender.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_geom.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/string_cursor_utf8.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_operators.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_markers.c
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_view3d.h
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_widgets.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_add.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_bvh.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_knife.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_select.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/object/object_add.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_project.c
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_scene_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/node_composite_tree.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_normal.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/WM_api.h
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2008-mxcurioni/source/tools/tag_release.py
Added Paths:
-----------
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_BandpassCalculator.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_BandpassCalculator.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_ButterworthCalculator.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_ButterworthCalculator.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_HighpassCalculator.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_HighpassCalculator.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_LowpassCalculator.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_LowpassCalculator.h
Property Changed:
----------------
branches/soc-2008-mxcurioni/
Property changes on: branches/soc-2008-mxcurioni
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126
/trunk/blender:34011-39896,39898-40096,40098-44221,44223-44419,44421-47664,47667-51853,51855-52815
+ /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126
/trunk/blender:34011-39896,39898-40096,40098-44221,44223-44419,44421-47664,47667-51853,51855-52858
Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt 2012-12-10 18:04:29 UTC (rev 52860)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt 2012-12-10 23:34:41 UTC (rev 52861)
@@ -241,11 +241,6 @@
set(PYTHON_NUMPY_PATH "" CACHE PATH "Python to python site-packages or dist-packages containing 'numpy' module")
mark_as_advanced(PYTHON_NUMPY_PATH)
-if(MINGW)
- option(WITH_MINGW64 "Use the 64-bit version of MinGW" OFF)
- mark_as_advanced(WITH_MINGW64)
-endif()
-
# Cycles
option(WITH_CYCLES "Enable cycles Render Engine" ON)
option(WITH_CYCLES_TEST "Build cycles test application" OFF)
@@ -867,8 +862,16 @@
if(CMAKE_COMPILER_IS_GNUCC)
set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/mingw32)
-
+ INCLUDE (CheckCSourceCompiles)
# Setup 64bit and 64bit windows systems
+ CHECK_C_SOURCE_COMPILES("
+ #ifndef __MINGW64__
+ #error
+ #endif
+ main(){}
+ "
+ WITH_MINGW64)
+
if(WITH_MINGW64)
message("Compiling for 64 bit with MinGW-w64.")
set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/mingw64)
@@ -940,13 +943,6 @@
endif()
endif()
- if(WITH_LLVM)
- set(LLVM_DIRECTORY ${LIBDIR}/llvm CACHE PATH "Path to the LLVM installation")
- file(GLOB LLVM_LIBRARY ${LLVM_DIRECTORY}/lib/*.lib)
- set(LLVM_STATIC YES)
- endif()
-
-
if(MSVC)
set(PLATFORM_LINKLIBS ws2_32 vfw32 winmm kernel32 user32 gdi32 comdlg32 advapi32 shfolder shell32 ole32 oleaut32 uuid psapi)
@@ -1149,6 +1145,12 @@
set(OPENIMAGEIO_DEFINITIONS "-DUSE_TBB=0")
endif()
+ if(WITH_LLVM)
+ set(LLVM_DIRECTORY ${LIBDIR}/llvm CACHE PATH "Path to the LLVM installation")
+ file(GLOB LLVM_LIBRARY ${LLVM_DIRECTORY}/lib/*.lib)
+ set(LLVM_STATIC YES)
+ endif()
+
if(WITH_OPENCOLORIO)
set(OPENCOLORIO ${LIBDIR}/opencolorio)
set(OPENCOLORIO_INCLUDE_DIRS ${OPENCOLORIO}/include)
@@ -1261,6 +1263,7 @@
if(WITH_IMAGE_OPENEXR)
set(OPENEXR ${LIBDIR}/openexr)
+ set(OPENEXR_INCLUDE_DIR ${OPENEXR}/include)
set(OPENEXR_INCLUDE_DIRS ${OPENEXR}/include/OpenEXR)
set(OPENEXR_LIBRARIES Half IlmImf Imath IlmThread Iex)
set(OPENEXR_LIBPATH ${OPENEXR}/lib)
@@ -1328,6 +1331,34 @@
set(OPENIMAGEIO_DEFINITIONS)
endif()
+ if(WITH_LLVM)
+ set(LLVM_DIRECTORY ${LIBDIR}/llvm CACHE PATH "Path to the LLVM installation")
+ set(LLVM_LIB_DIR ${LLVM_DIRECTORY}/lib)
+ #Explicitly set llvm lib order.
+ #---- WARNING ON GCC ORDER OF LIBS IS IMPORTANT, DO NOT CHANGE! ---------
+ set(LLVM_LIBRARY LLVMSelectionDAG LLVMCodeGen LLVMScalarOpts LLVMAnalysis LLVMArchive
+ LLVMAsmParser LLVMAsmPrinter
+ LLVMBitReader LLVMBitWriter
+ LLVMDebugInfo LLVMExecutionEngine
+ LLVMInstCombine LLVMInstrumentation
+ LLVMInterpreter LLVMJIT
+ LLVMLinker LLVMMC
+ LLVMMCDisassembler LLVMMCJIT
+ LLVMMCParser LLVMObject
+ LLVMRuntimeDyld
+ LLVMSupport
+ LLVMTableGen LLVMTarget
+ LLVMTransformUtils LLVMVectorize
+ LLVMX86AsmParser LLVMX86AsmPrinter
+ LLVMX86CodeGen LLVMX86Desc
+ LLVMX86Disassembler LLVMX86Info
+ LLVMX86Utils LLVMipa
+ LLVMipo LLVMCore)
+ #imagehelp is needed by LLVM 3.1 on MinGW, check lib\Support\Windows\Signals.inc
+ set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} -limagehlp")
+ set(LLVM_STATIC YES)
+ endif()
+
if(WITH_OPENCOLORIO)
set(OPENCOLORIO ${LIBDIR}/opencolorio)
set(OPENCOLORIO_INCLUDE_DIRS ${OPENCOLORIO}/include)
@@ -1839,7 +1870,7 @@
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_DIV_BY_ZERO -Wno-div-by-zero)
# gcc 4.2 gives annoying warnings on every file with this
- if ("${CMAKE_C_COMPILER_VERSION}" VERSION_GREATER "4.2")
+ if (NOT "${CMAKE_C_COMPILER_VERSION}" VERSION_LESS "4.3")
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_UNINITIALIZED -Wuninitialized)
endif()
@@ -1859,7 +1890,7 @@
ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_DIV_BY_ZERO -Wno-div-by-zero)
# gcc 4.2 gives annoying warnings on every file with this
- if ("${CMAKE_C_COMPILER_VERSION}" VERSION_GREATER "4.2")
+ if (NOT "${CMAKE_C_COMPILER_VERSION}" VERSION_LESS "4.3")
ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_UNINITIALIZED -Wuninitialized)
endif()
@@ -1933,7 +1964,7 @@
if(WITH_PYTHON_INSTALL AND WITH_PYTHON_INSTALL_NUMPY)
# set but invalid
# -- disabled until we make numpy bundled with blender - campbell
- if(NOT ${PYTHON_NUMPY_PATH} STREQUAL "")
+ if((NOT ${PYTHON_NUMPY_PATH} STREQUAL "") AND (NOT ${PYTHON_NUMPY_PATH} MATCHES NOTFOUND))
# if(NOT EXISTS "${PYTHON_NUMPY_PATH}/numpy")
# message(WARNING "PYTHON_NUMPY_PATH is invalid, numpy not found in '${PYTHON_NUMPY_PATH}' "
# "WITH_PYTHON_INSTALL_NUMPY option will be ignored when installing python")
Modified: branches/soc-2008-mxcurioni/build_files/cmake/cmake_static_check_cppcheck.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/cmake/cmake_static_check_cppcheck.py 2012-12-10 18:04:29 UTC (rev 52860)
+++ branches/soc-2008-mxcurioni/build_files/cmake/cmake_static_check_cppcheck.py 2012-12-10 23:34:41 UTC (rev 52861)
@@ -46,7 +46,10 @@
# "--enable=all", # if you want sixty hundred pedantic suggestions
]
+if USE_QUIET:
+ CHECKER_ARGS.append("--quiet")
+
def main():
source_info = project_source_info.build_info(ignore_prefix_list=CHECKER_IGNORE_PREFIX)
@@ -78,6 +81,8 @@
project_source_info.queue_processes(process_functions)
+ print("Finished!")
+
if __name__ == "__main__":
main()
Modified: branches/soc-2008-mxcurioni/extern/libmv/libmv/simple_pipeline/resect.cc
===================================================================
--- branches/soc-2008-mxcurioni/extern/libmv/libmv/simple_pipeline/resect.cc 2012-12-10 18:04:29 UTC (rev 52860)
+++ branches/soc-2008-mxcurioni/extern/libmv/libmv/simple_pipeline/resect.cc 2012-12-10 23:34:41 UTC (rev 52861)
@@ -57,7 +57,7 @@
EuclideanResectCostFunction(const vector<Marker> &markers,
const EuclideanReconstruction &reconstruction,
- const Mat3 initial_R)
+ const Mat3 &initial_R)
: markers(markers),
reconstruction(reconstruction),
initial_R(initial_R) {}
Modified: branches/soc-2008-mxcurioni/intern/audaspace/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/intern/audaspace/CMakeLists.txt 2012-12-10 18:04:29 UTC (rev 52860)
+++ branches/soc-2008-mxcurioni/intern/audaspace/CMakeLists.txt 2012-12-10 23:34:41 UTC (rev 52861)
@@ -34,6 +34,7 @@
set(SRC
FX/AUD_AccumulatorFactory.cpp
FX/AUD_BaseIIRFilterReader.cpp
+ FX/AUD_ButterworthCalculator.cpp
FX/AUD_ButterworthFactory.cpp
FX/AUD_CallbackIIRFilterReader.cpp
FX/AUD_DelayFactory.cpp
@@ -47,6 +48,7 @@
FX/AUD_EnvelopeFactory.cpp
FX/AUD_FaderFactory.cpp
FX/AUD_FaderReader.cpp
+ FX/AUD_HighpassCalculator.cpp
FX/AUD_HighpassFactory.cpp
FX/AUD_IIRFilterFactory.cpp
FX/AUD_IIRFilterReader.cpp
@@ -54,6 +56,7 @@
FX/AUD_LimiterReader.cpp
FX/AUD_LoopFactory.cpp
FX/AUD_LoopReader.cpp
+ FX/AUD_LowpassCalculator.cpp
FX/AUD_LowpassFactory.cpp
FX/AUD_PingPongFactory.cpp
FX/AUD_PitchFactory.cpp
@@ -145,6 +148,7 @@
FX/AUD_AccumulatorFactory.h
FX/AUD_BaseIIRFilterReader.h
+ FX/AUD_ButterworthCalculator.h
FX/AUD_ButterworthFactory.h
FX/AUD_CallbackIIRFilterReader.h
FX/AUD_DelayFactory.h
@@ -159,6 +163,7 @@
FX/AUD_EnvelopeFactory.h
FX/AUD_FaderFactory.h
FX/AUD_FaderReader.h
+ FX/AUD_HighpassCalculator.h
FX/AUD_HighpassFactory.h
FX/AUD_IIRFilterFactory.h
FX/AUD_IIRFilterReader.h
@@ -166,6 +171,7 @@
FX/AUD_LimiterReader.h
FX/AUD_LoopFactory.h
FX/AUD_LoopReader.h
+ FX/AUD_LowpassCalculator.h
FX/AUD_LowpassFactory.h
FX/AUD_PingPongFactory.h
FX/AUD_PitchFactory.h
Copied: branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_BandpassCalculator.cpp (from rev 52858, trunk/blender/intern/audaspace/FX/AUD_BandpassCalculator.cpp)
===================================================================
--- branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_BandpassCalculator.cpp (rev 0)
+++ branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_BandpassCalculator.cpp 2012-12-10 23:34:41 UTC (rev 52861)
@@ -0,0 +1,5 @@
+#include "AUD_BandpassCalculator.h"
+
+AUD_BandpassCalculator::AUD_BandpassCalculator()
+{
+}
Copied: branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_BandpassCalculator.h (from rev 52858, trunk/blender/intern/audaspace/FX/AUD_BandpassCalculator.h)
===================================================================
--- branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_BandpassCalculator.h (rev 0)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list