[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42594] branches/ge_harmony: Merge with trunk up to r42593.
Mitchell Stokes
mogurijin at gmail.com
Tue Dec 13 03:46:09 CET 2011
Revision: 42594
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42594
Author: moguri
Date: 2011-12-13 02:45:59 +0000 (Tue, 13 Dec 2011)
Log Message:
-----------
Merge with trunk up to r42593.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42593
Modified Paths:
--------------
branches/ge_harmony/SConstruct
branches/ge_harmony/build_files/scons/config/darwin-config.py
branches/ge_harmony/build_files/scons/tools/Blender.py
branches/ge_harmony/build_files/scons/tools/btools.py
branches/ge_harmony/doc/manpage/blender.1
branches/ge_harmony/extern/libmv/CMakeLists.txt
branches/ge_harmony/extern/libmv/libmv/tracking/esm_region_tracker.cc
branches/ge_harmony/extern/libmv/libmv/tracking/esm_region_tracker.h
branches/ge_harmony/extern/libmv/libmv-capi.cpp
branches/ge_harmony/extern/libmv/libmv-capi.h
branches/ge_harmony/intern/audaspace/jack/AUD_JackDevice.h
branches/ge_harmony/intern/cycles/blender/blender_mesh.cpp
branches/ge_harmony/intern/cycles/blender/blender_object.cpp
branches/ge_harmony/intern/cycles/blender/blender_shader.cpp
branches/ge_harmony/intern/cycles/blender/blender_sync.cpp
branches/ge_harmony/intern/cycles/blender/blender_sync.h
branches/ge_harmony/intern/cycles/device/device.h
branches/ge_harmony/intern/cycles/device/device_cuda.cpp
branches/ge_harmony/intern/cycles/device/device_multi.cpp
branches/ge_harmony/intern/cycles/device/device_opencl.cpp
branches/ge_harmony/intern/cycles/kernel/CMakeLists.txt
branches/ge_harmony/intern/cycles/kernel/SConscript
branches/ge_harmony/intern/cycles/render/mesh.cpp
branches/ge_harmony/intern/cycles/render/session.cpp
branches/ge_harmony/intern/cycles/render/session.h
branches/ge_harmony/intern/cycles/render/sobol.cpp
branches/ge_harmony/intern/cycles/render/sobol.h
branches/ge_harmony/intern/cycles/util/util_transform.h
branches/ge_harmony/release/scripts/modules/bpy/path.py
branches/ge_harmony/release/scripts/modules/bpy_extras/image_utils.py
branches/ge_harmony/release/scripts/presets/tracking_settings/default.py
branches/ge_harmony/release/scripts/presets/tracking_settings/fast_motion.py
branches/ge_harmony/release/scripts/startup/bl_operators/anim.py
branches/ge_harmony/release/scripts/startup/bl_operators/clip.py
branches/ge_harmony/release/scripts/startup/bl_operators/image.py
branches/ge_harmony/release/scripts/startup/bl_operators/object_randomize_transform.py
branches/ge_harmony/release/scripts/startup/bl_operators/wm.py
branches/ge_harmony/release/scripts/startup/bl_ui/space_clip.py
branches/ge_harmony/release/scripts/startup/bl_ui/space_userpref.py
branches/ge_harmony/release/scripts/startup/bl_ui/space_view3d.py
branches/ge_harmony/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/ge_harmony/source/blender/blenkernel/BKE_DerivedMesh.h
branches/ge_harmony/source/blender/blenkernel/BKE_blender.h
branches/ge_harmony/source/blender/blenkernel/BKE_deform.h
branches/ge_harmony/source/blender/blenkernel/BKE_mesh.h
branches/ge_harmony/source/blender/blenkernel/intern/DerivedMesh.c
branches/ge_harmony/source/blender/blenkernel/intern/armature.c
branches/ge_harmony/source/blender/blenkernel/intern/brush.c
branches/ge_harmony/source/blender/blenkernel/intern/cdderivedmesh.c
branches/ge_harmony/source/blender/blenkernel/intern/deform.c
branches/ge_harmony/source/blender/blenkernel/intern/editderivedmesh.c
branches/ge_harmony/source/blender/blenkernel/intern/mesh_validate.c
branches/ge_harmony/source/blender/blenkernel/intern/particle.c
branches/ge_harmony/source/blender/blenkernel/intern/seqeffects.c
branches/ge_harmony/source/blender/blenkernel/intern/tracking.c
branches/ge_harmony/source/blender/blenkernel/intern/unit.c
branches/ge_harmony/source/blender/blenlib/BLI_fileops.h
branches/ge_harmony/source/blender/blenlib/intern/storage.c
branches/ge_harmony/source/blender/blenloader/intern/readfile.c
branches/ge_harmony/source/blender/editors/animation/anim_ipo_utils.c
branches/ge_harmony/source/blender/editors/animation/keyframing.c
branches/ge_harmony/source/blender/editors/animation/keyingsets.c
branches/ge_harmony/source/blender/editors/armature/editarmature.c
branches/ge_harmony/source/blender/editors/armature/poseobject.c
branches/ge_harmony/source/blender/editors/interface/interface_handlers.c
branches/ge_harmony/source/blender/editors/interface/interface_ops.c
branches/ge_harmony/source/blender/editors/interface/interface_regions.c
branches/ge_harmony/source/blender/editors/interface/resources.c
branches/ge_harmony/source/blender/editors/mesh/editmesh.c
branches/ge_harmony/source/blender/editors/mesh/editmesh_mods.c
branches/ge_harmony/source/blender/editors/mesh/editmesh_tools.c
branches/ge_harmony/source/blender/editors/object/object_add.c
branches/ge_harmony/source/blender/editors/object/object_hook.c
branches/ge_harmony/source/blender/editors/object/object_ops.c
branches/ge_harmony/source/blender/editors/object/object_select.c
branches/ge_harmony/source/blender/editors/object/object_vgroup.c
branches/ge_harmony/source/blender/editors/render/render_internal.c
branches/ge_harmony/source/blender/editors/sculpt_paint/paint_vertex.c
branches/ge_harmony/source/blender/editors/sculpt_paint/sculpt.c
branches/ge_harmony/source/blender/editors/space_clip/clip_graph_draw.c
branches/ge_harmony/source/blender/editors/space_clip/clip_toolbar.c
branches/ge_harmony/source/blender/editors/space_file/file_ops.c
branches/ge_harmony/source/blender/editors/space_node/node_draw.c
branches/ge_harmony/source/blender/editors/space_node/node_edit.c
branches/ge_harmony/source/blender/editors/space_outliner/outliner_select.c
branches/ge_harmony/source/blender/editors/space_outliner/outliner_tree.c
branches/ge_harmony/source/blender/editors/space_view3d/drawmesh.c
branches/ge_harmony/source/blender/editors/space_view3d/drawobject.c
branches/ge_harmony/source/blender/editors/space_view3d/view3d_snap.c
branches/ge_harmony/source/blender/editors/space_view3d/view3d_toolbar.c
branches/ge_harmony/source/blender/editors/space_view3d/view3d_view.c
branches/ge_harmony/source/blender/editors/transform/transform_conversions.c
branches/ge_harmony/source/blender/editors/util/undo.c
branches/ge_harmony/source/blender/gpu/GPU_draw.h
branches/ge_harmony/source/blender/gpu/GPU_material.h
branches/ge_harmony/source/blender/gpu/intern/gpu_codegen.c
branches/ge_harmony/source/blender/gpu/intern/gpu_draw.c
branches/ge_harmony/source/blender/gpu/intern/gpu_material.c
branches/ge_harmony/source/blender/makesdna/DNA_curve_types.h
branches/ge_harmony/source/blender/makesdna/DNA_meshdata_types.h
branches/ge_harmony/source/blender/makesdna/DNA_object_force.h
branches/ge_harmony/source/blender/makesdna/DNA_object_types.h
branches/ge_harmony/source/blender/makesdna/DNA_space_types.h
branches/ge_harmony/source/blender/makesdna/DNA_texture_types.h
branches/ge_harmony/source/blender/makesdna/DNA_userdef_types.h
branches/ge_harmony/source/blender/makesrna/intern/rna_access.c
branches/ge_harmony/source/blender/makesrna/intern/rna_actuator.c
branches/ge_harmony/source/blender/makesrna/intern/rna_curve.c
branches/ge_harmony/source/blender/makesrna/intern/rna_main_api.c
branches/ge_harmony/source/blender/makesrna/intern/rna_nodetree.c
branches/ge_harmony/source/blender/makesrna/intern/rna_object.c
branches/ge_harmony/source/blender/makesrna/intern/rna_tracking.c
branches/ge_harmony/source/blender/makesrna/intern/rna_userdef.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_hook.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_mask.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_weightvg_util.c
branches/ge_harmony/source/blender/python/intern/bpy_driver.c
branches/ge_harmony/source/blender/python/intern/gpu.c
branches/ge_harmony/source/blender/render/intern/source/pipeline.c
branches/ge_harmony/source/blender/render/intern/source/render_texture.c
branches/ge_harmony/source/blender/windowmanager/WM_api.h
branches/ge_harmony/source/blender/windowmanager/intern/wm_event_system.c
branches/ge_harmony/source/blender/windowmanager/intern/wm_gesture.c
branches/ge_harmony/source/blender/windowmanager/intern/wm_operators.c
branches/ge_harmony/source/gameengine/Converter/BL_SkinDeformer.cpp
branches/ge_harmony/source/gameengine/Ketsji/BL_BlenderShader.cpp
Added Paths:
-----------
branches/ge_harmony/release/scripts/presets/tracking_settings/blurry_footage.py
Removed Paths:
-------------
branches/ge_harmony/release/scripts/presets/tracking_settings/blurry_movie.py
Property Changed:
----------------
branches/ge_harmony/
branches/ge_harmony/source/blender/editors/space_outliner/
Property changes on: branches/ge_harmony
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber:37517
/branches/soc-2011-tomato:42376,42378-42379
/trunk/blender:42243-42453
+ /branches/soc-2011-cucumber:37517
/branches/soc-2011-tomato:42376,42378-42379,42397,42400
/trunk/blender:42243-42593
Modified: branches/ge_harmony/SConstruct
===================================================================
--- branches/ge_harmony/SConstruct 2011-12-13 00:00:26 UTC (rev 42593)
+++ branches/ge_harmony/SConstruct 2011-12-13 02:45:59 UTC (rev 42594)
@@ -119,6 +119,12 @@
if tempbitness in (32, 64): # only set if 32 or 64 has been given
bitness = int(tempbitness)
+if bitness:
+ B.bitness = bitness
+else:
+ B.bitness = tempbitness
+
+
# first check cmdline for toolset and we create env to work on
quickie = B.arguments.get('BF_QUICK', None)
quickdebug = B.arguments.get('BF_QUICKDEBUG', None)
@@ -266,7 +272,7 @@
if k not in B.arguments:
env[k] = v
-# Extended OSX_SDK and 3D_CONNEXION_CLIENT_LIBRARY detection for OSX
+# Extended OSX_SDK and 3D_CONNEXION_CLIENT_LIBRARY and JAckOSX detection for OSX
if env['OURPLATFORM']=='darwin':
print B.bc.OKGREEN + "Detected Xcode version: -- " + B.bc.ENDC + env['XCODE_CUR_VER'][:9] + " --"
print "Available " + env['MACOSX_SDK_CHECK']
@@ -285,6 +291,16 @@
else:
env.Append(LINKFLAGS=['-Xlinker','-weak_framework','-Xlinker','3DconnexionClient'])
+ # for now, Mac builders must download and install the JackOSX framework
+ # necessary header file lives here when installed:
+ # /Library/Frameworks/Jackmp.framework/Versions/A/Headers/jack.h
+ if env['WITH_BF_JACK'] == 1:
+ if not os.path.exists('/Library/Frameworks/Jackmp.framework'):
+ print "JackOSX install not found, disabling WITH_BF_JACK" # avoid build errors !
+ env['WITH_BF_JACK'] = 0
+ else:
+ env.Append(LINKFLAGS=['-Xlinker','-weak_framework','-Xlinker','Jackmp'])
+
if env['WITH_BF_OPENMP'] == 1:
if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
env['CCFLAGS'].append('/openmp')
Modified: branches/ge_harmony/build_files/scons/config/darwin-config.py
===================================================================
--- branches/ge_harmony/build_files/scons/config/darwin-config.py 2011-12-13 00:00:26 UTC (rev 42593)
+++ branches/ge_harmony/build_files/scons/config/darwin-config.py 2011-12-13 02:45:59 UTC (rev 42594)
@@ -148,12 +148,12 @@
WITH_BF_STATICCXX = False
BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
-# TODO - set proper paths here (add precompiled to lib/ ? )
-WITH_BF_JACK = False
-BF_JACK = '/usr'
-BF_JACK_INC = '${BF_JACK}/include/jack'
+# we use simply jack framework
+WITH_BF_JACK = True
+BF_JACK = '/Library/Frameworks/Jackmp.framework'
+BF_JACK_INC = '${BF_JACK}/headers'
BF_JACK_LIB = 'jack'
-BF_JACK_LIBPATH = '${BF_JACK}/lib'
+BF_JACK_LIBPATH = '${BF_JACK}'
WITH_BF_SNDFILE = True
BF_SNDFILE = LIBDIR + '/sndfile'
Modified: branches/ge_harmony/build_files/scons/tools/Blender.py
===================================================================
--- branches/ge_harmony/build_files/scons/tools/Blender.py 2011-12-13 00:00:26 UTC (rev 42593)
+++ branches/ge_harmony/build_files/scons/tools/Blender.py 2011-12-13 02:45:59 UTC (rev 42594)
@@ -50,6 +50,7 @@
arguments = None
targets = None
resources = []
+bitness = 0
#some internals
blenderdeps = [] # don't manipulate this one outside this module!
Modified: branches/ge_harmony/build_files/scons/tools/btools.py
===================================================================
--- branches/ge_harmony/build_files/scons/tools/btools.py 2011-12-13 00:00:26 UTC (rev 42593)
+++ branches/ge_harmony/build_files/scons/tools/btools.py 2011-12-13 02:45:59 UTC (rev 42594)
@@ -157,7 +157,7 @@
'WITH_BF_JEMALLOC', 'WITH_BF_STATICJEMALLOC', 'BF_JEMALLOC', 'BF_JEMALLOC_INC', 'BF_JEMALLOC_LIBPATH', 'BF_JEMALLOC_LIB', 'BF_JEMALLOC_LIB_STATIC',
'BUILDBOT_BRANCH',
'WITH_BF_3DMOUSE', 'WITH_BF_STATIC3DMOUSE', 'BF_3DMOUSE', 'BF_3DMOUSE_INC', 'BF_3DMOUSE_LIB', 'BF_3DMOUSE_LIBPATH', 'BF_3DMOUSE_LIB_STATIC',
- 'WITH_BF_CYCLES', 'WITH_BF_CYCLES_CUDA_BINARIES' 'BF_CYCLES_CUDA_NVCC', 'BF_CYCLES_CUDA_NVCC',
+ 'WITH_BF_CYCLES', 'WITH_BF_CYCLES_CUDA_BINARIES' 'BF_CYCLES_CUDA_NVCC', 'BF_CYCLES_CUDA_NVCC', 'WITH_BF_CYCLES_CUDA_THREADED_COMPILE',
'WITH_BF_OIIO', 'WITH_BF_STATICOIIO', 'BF_OIIO', 'BF_OIIO_INC', 'BF_OIIO_LIB', 'BF_OIIO_LIB_STATIC', 'BF_OIIO_LIBPATH',
'WITH_BF_BOOST', 'WITH_BF_STATICBOOST', 'BF_BOOST', 'BF_BOOST_INC', 'BF_BOOST_LIB', 'BF_BOOST_LIB_STATIC', 'BF_BOOST_LIBPATH'
]
@@ -545,6 +545,7 @@
localopts.AddVariables(
(BoolVariable('WITH_BF_CYCLES', 'Build with the Cycles engine', True)),
(BoolVariable('WITH_BF_CYCLES_CUDA_BINARIES', 'Build with precompiled CUDA binaries', False)),
+ (BoolVariable('WITH_BF_CYCLES_CUDA_THREADED_COMPILE', 'Build several render kernels at once (using BF_NUMJOBS)', False)),
('BF_CYCLES_CUDA_NVCC', 'CUDA nvcc compiler path', ''),
('BF_CYCLES_CUDA_BINARIES_ARCH', 'CUDA architectures to compile binaries for', []),
Modified: branches/ge_harmony/doc/manpage/blender.1
===================================================================
(Binary files differ)
Modified: branches/ge_harmony/extern/libmv/CMakeLists.txt
===================================================================
--- branches/ge_harmony/extern/libmv/CMakeLists.txt 2011-12-13 00:00:26 UTC (rev 42593)
+++ branches/ge_harmony/extern/libmv/CMakeLists.txt 2011-12-13 02:45:59 UTC (rev 42594)
@@ -148,23 +148,23 @@
third_party/glog/src/vlog_is_on.cc
third_party/glog/src/windows/port.cc
- third_party/glog/src/utilities.h
+ third_party/glog/src/config.h
+ third_party/glog/src/stacktrace.h
third_party/glog/src/stacktrace_generic-inl.h
- third_party/glog/src/stacktrace.h
+ third_party/glog/src/stacktrace_libunwind-inl.h
+ third_party/glog/src/stacktrace_powerpc-inl.h
+ third_party/glog/src/stacktrace_x86-inl.h
third_party/glog/src/stacktrace_x86_64-inl.h
+ third_party/glog/src/utilities.h
+ third_party/glog/src/base/commandlineflags.h
third_party/glog/src/base/googleinit.h
third_party/glog/src/base/mutex.h
- third_party/glog/src/base/commandlineflags.h
- third_party/glog/src/stacktrace_powerpc-inl.h
- third_party/glog/src/stacktrace_x86-inl.h
- third_party/glog/src/config.h
- third_party/glog/src/stacktrace_libunwind-inl.h
+ third_party/glog/src/windows/config.h
+ third_party/glog/src/windows/port.h
+ third_party/glog/src/windows/glog/log_severity.h
+ third_party/glog/src/windows/glog/logging.h
third_party/glog/src/windows/glog/raw_logging.h
third_party/glog/src/windows/glog/vlog_is_on.h
- third_party/glog/src/windows/glog/logging.h
- third_party/glog/src/windows/glog/log_severity.h
- third_party/glog/src/windows/port.h
- third_party/glog/src/windows/config.h
)
list(APPEND INC
@@ -184,7 +184,7 @@
string(REPLACE "${FLAG}" "Od" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
endforeach()
endif()
-else(WIN32)
+else()
list(APPEND SRC
third_party/glog/src/utilities.cc
third_party/glog/src/symbolize.cc
@@ -194,25 +194,26 @@
third_party/glog/src/demangle.cc
third_party/glog/src/raw_logging.cc
- third_party/glog/src/utilities.h
- third_party/glog/src/stacktrace_generic-inl.h
+ third_party/glog/src/config.h
+ third_party/glog/src/config_freebsd.h
+ third_party/glog/src/config_linux.h
third_party/glog/src/config_mac.h
+ third_party/glog/src/demangle.h
third_party/glog/src/stacktrace.h
+ third_party/glog/src/stacktrace_generic-inl.h
+ third_party/glog/src/stacktrace_libunwind-inl.h
+ third_party/glog/src/stacktrace_powerpc-inl.h
+ third_party/glog/src/stacktrace_x86-inl.h
third_party/glog/src/stacktrace_x86_64-inl.h
third_party/glog/src/symbolize.h
+ third_party/glog/src/utilities.h
+ third_party/glog/src/base/commandlineflags.h
third_party/glog/src/base/googleinit.h
third_party/glog/src/base/mutex.h
- third_party/glog/src/base/commandlineflags.h
- third_party/glog/src/stacktrace_powerpc-inl.h
- third_party/glog/src/stacktrace_x86-inl.h
- third_party/glog/src/config.h
- third_party/glog/src/demangle.h
- third_party/glog/src/stacktrace_libunwind-inl.h
+ third_party/glog/src/glog/log_severity.h
+ third_party/glog/src/glog/logging.h
third_party/glog/src/glog/raw_logging.h
third_party/glog/src/glog/vlog_is_on.h
- third_party/glog/src/glog/logging.h
- third_party/glog/src/glog/log_severity.h
- third_party/glog/src/config_linux.h
)
list(APPEND INC
@@ -220,6 +221,9 @@
)
endif()
-add_definitions(-DV3DLIB_ENABLE_SUITESPARSE -DGOOGLE_GLOG_DLL_DECL=)
+add_definitions(
+ -DV3DLIB_ENABLE_SUITESPARSE
+ -DGOOGLE_GLOG_DLL_DECL=
+)
blender_add_lib(extern_libmv "${SRC}" "${INC}" "${INC_SYS}")
Modified: branches/ge_harmony/extern/libmv/libmv/tracking/esm_region_tracker.cc
===================================================================
--- branches/ge_harmony/extern/libmv/libmv/tracking/esm_region_tracker.cc 2011-12-13 00:00:26 UTC (rev 42593)
+++ branches/ge_harmony/extern/libmv/libmv/tracking/esm_region_tracker.cc 2011-12-13 02:45:59 UTC (rev 42594)
@@ -273,11 +273,31 @@
// If the step was accepted, then check for termination.
if (d.squaredNorm() < min_update_squared_distance) {
- if (new_error > reasonable_error) {
- LG << "Update size shrank but reasonable error ("
- << reasonable_error << ") not achieved; failing.";
- return true; // XXX
+ // Compute the Pearson product-moment correlation coefficient to check
+ // for sanity.
+ // TODO(keir): Put this somewhere smarter.
+ double sX=0,sY=0,sXX=0,sYY=0,sXY=0;
+ for (int r = 0; r < width; ++r) {
+ for (int c = 0; c < width; ++c) {
+ double x = image_and_gradient1_sampled(r, c, 0);
+ double y = image_and_gradient2_sampled[new_image](r, c, 0);
+ sX += x;
+ sY += y;
+ sXX += x*x;
+ sYY += y*y;
+ sXY += x*y;
+ }
}
+ double N = width*width;
+ sX /= N, sY /= N, sXX /= N, sYY /= N, sXY /= N;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list