[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57185] branches/multiview: multiview : merging from github branch
Dalai Felinto
dfelinto at gmail.com
Sun Jun 2 03:03:53 CEST 2013
Revision: 57185
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57185
Author: dfelinto
Date: 2013-06-02 01:03:51 +0000 (Sun, 02 Jun 2013)
Log Message:
-----------
multiview : merging from github branch
github: 27bcef9b015c2f60983a9ba60ac31b8178d6e6fa
note: this is trunk/svn revision: 57184
Modified Paths:
--------------
branches/multiview/build_files/buildbot/master.cfg
branches/multiview/extern/libmv/ChangeLog
branches/multiview/extern/libmv/libmv/simple_pipeline/keyframe_selection.cc
branches/multiview/intern/cycles/kernel/svm/svm_closure.h
branches/multiview/release/scripts/presets/keyconfig/3dsmax.py
branches/multiview/release/scripts/presets/keyconfig/maya.py
branches/multiview/release/scripts/startup/bl_operators/freestyle.py
branches/multiview/release/scripts/startup/bl_ui/properties_freestyle.py
branches/multiview/release/scripts/startup/bl_ui/space_image.py
branches/multiview/release/scripts/startup/bl_ui/space_node.py
branches/multiview/release/scripts/startup/bl_ui/space_userpref.py
branches/multiview/source/blender/editors/uvedit/uvedit_ops.c
branches/multiview/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/multiview/source/blender/makesdna/DNA_userdef_types.h
branches/multiview/source/blender/makesrna/intern/rna_userdef.c
branches/multiview/source/blender/modifiers/intern/MOD_array.c
branches/multiview/source/blender/nodes/composite/nodes/node_composite_common.c
branches/multiview/source/blender/nodes/intern/node_common.c
branches/multiview/source/blender/nodes/shader/nodes/node_shader_common.c
branches/multiview/source/blender/nodes/texture/nodes/node_texture_common.c
branches/multiview/source/blender/render/intern/source/render_result.c
branches/multiview/source/blender/windowmanager/intern/wm_window.c
Modified: branches/multiview/build_files/buildbot/master.cfg
===================================================================
--- branches/multiview/build_files/buildbot/master.cfg 2013-06-02 00:29:30 UTC (rev 57184)
+++ branches/multiview/build_files/buildbot/master.cfg 2013-06-02 01:03:51 UTC (rev 57185)
@@ -28,9 +28,40 @@
from buildbot.changes.svnpoller import SVNPoller
c['change_source'] = SVNPoller(
- 'https://svn.blender.org/svnroot/bf-blender/trunk/',
- pollinterval=1200)
+ 'https://svn.blender.org/svnroot/bf-blender/trunk/',
+ pollinterval=1200)
+# SCHEDULERS
+#
+# Decide how to react to incoming changes.
+
+# from buildbot.scheduler import Scheduler
+from buildbot.schedulers import timed
+
+c['schedulers'] = []
+
+def schedule_build(name, hour, minute=0):
+ c['schedulers'].append(timed.Nightly(name='nightly ' + name,
+ builderNames=[name],
+ hour=hour,
+ minute=minute))
+
+"""
+schedule_cycle = 4
+
+for i in range(0, schedule_cycle):
+ names = []
+ for j in range(0, len(buildernames)):
+ if j % schedule_cycle == i:
+ names += [buildernames[j]]
+
+ print(names)
+ c['schedulers'].append(timed.Nightly(name='nightly' + str(i),
+ builderNames=names,
+ hour=3+i,
+ minute=0))
+"""
+
# BUILDERS
#
# The 'builders' list defines the Builders, which tell Buildbot how to perform a build:
@@ -53,7 +84,7 @@
buildernames = []
-def add_builder(c, name, libdir, factory, branch='', rsync=False):
+def add_builder(c, name, libdir, factory, branch='', rsync=False, hour=3, minute=0):
slavenames = []
for slave in master_private.slaves:
@@ -65,6 +96,8 @@
c['builders'].append(BuilderConfig(name=name, slavenames=slavenames, factory=f, category='blender'))
buildernames.append(name)
+ schedule_build(name, hour, minute)
+
# common steps
@@ -74,11 +107,9 @@
else:
return SVN(baseURL='https://svn.blender.org/svnroot/bf-blender/%%BRANCH%%/blender', mode='update', defaultBranch='trunk', workdir='blender')
-
def lib_svn_step(dir):
return SVN(name='lib svn', baseURL='https://svn.blender.org/svnroot/bf-blender/%%BRANCH%%/lib/' + dir, mode='update', defaultBranch='trunk', workdir='lib/' + dir)
-
def rsync_step(id, branch, rsync_script):
return ShellCommand(name='rsync', command=['python', rsync_script, id, branch], description='uploading', descriptionDone='uploaded', workdir='install')
@@ -112,55 +143,21 @@
# builders
-add_builder(c, 'mac_x86_64_10_6_scons', 'darwin-9.x.universal', generic_builder, '', True)
-add_builder(c, 'mac_x86_64_10_5_scons', '', generic_builder, '', True)
-#add_builder(c, 'salad_mac_x86_64_scons', 'darwin-9.x.universal', generic_builder, 'soc-2011-salad')
-add_builder(c, 'mac_i386_scons', 'darwin-9.x.universal', generic_builder)
-add_builder(c, 'mac_ppc_scons', 'darwin-9.x.universal', generic_builder)
-#add_builder(c, 'linux_x86_64_cmake', '', generic_builder)
-#add_builder(c, 'linux_glibc27_i386_scons', '', generic_builder)
-add_builder(c, 'linux_glibc211_i386_scons', '', generic_builder)
-#add_builder(c, 'salad_linux_i386_scons', '', generic_builder, 'soc-2011-salad')
-#add_builder(c, 'linux_glibc27_x86_64_scons', '', generic_builder)
-add_builder(c, 'linux_glibc211_x86_64_scons', '', generic_builder)
-#add_builder(c, 'salad_linux_x86_64_scons', '', generic_builder, 'soc-2011-salad')
-add_builder(c, 'win32_scons', 'windows', generic_builder)
-#add_builder(c, 'salad_win32_scons', 'windows', generic_builder, 'soc-2011-salad')
-add_builder(c, 'win64_scons', 'win64', generic_builder)
-add_builder(c, 'mingw_win32_scons', 'mingw32', generic_builder)
-add_builder(c, 'mingw_win64_scons', 'mingw64', generic_builder)
-#add_builder(c, 'freebsd_i386_cmake', '', generic_builder)
-#add_builder(c, 'freebsd_x86_64_cmake', '', generic_builder)
+add_builder(c, 'mac_x86_64_10_6_scons', 'darwin-9.x.universal', generic_builder, hour=5)
+add_builder(c, 'mac_i386_10_6_scons', 'darwin-9.x.universal', generic_builder, hour=11)
+add_builder(c, 'linux_glibc211_i386_scons', '', generic_builder, hour=1)
+add_builder(c, 'linux_glibc211_x86_64_scons', '', generic_builder, hour=2)
+add_builder(c, 'win32_scons', 'windows', generic_builder, hour=1)
+add_builder(c, 'win64_scons', 'win64', generic_builder, hour=2)
+#add_builder(c, 'mingw_win32_scons', 'mingw32', generic_builder, hour=4)
+add_builder(c, 'mingw_win64_scons', 'mingw64', generic_builder, hour=3)
+#add_builder(c, 'freebsd_i386_cmake', '', generic_builder, hour=1)
+#add_builder(c, 'freebsd_x86_64_cmake', '', generic_builder, hour=2)
-# SCHEDULERS
-#
-# Decide how to react to incoming changes.
+# Multiview branch
+add_builder(c, 'multiview_win64_scons', 'win64', generic_builder, 'multiview', hour=4)
+add_builder(c, 'multiview_win32_scons', 'windows', generic_builder, 'multiview', hour=5)
-# from buildbot.scheduler import Scheduler
-from buildbot.schedulers import timed
-
-c['schedulers'] = []
-#c['schedulers'].append(Scheduler(name="all", branch=None,
-# treeStableTimer=None,
-# builderNames=[]))
-#c['schedulers'].append(timed.Periodic(name="nightly",
-# builderNames=buildernames,
-# periodicBuildTimer=24*60*60))
-
-schedule_cycle = 4
-
-for i in range(0, schedule_cycle):
- names = []
- for j in range(0, len(buildernames)):
- if j % schedule_cycle == i:
- names += [buildernames[j]]
-
- print(names)
- c['schedulers'].append(timed.Nightly(name='nightly' + str(i),
- builderNames=names,
- hour=3 + i,
- minute=0))
-
# STATUS TARGETS
#
# 'status' is a list of Status Targets. The results of each build will be
@@ -171,17 +168,23 @@
from buildbot.status import html
from buildbot.status.web import authz
+from buildbot.status.web import auth
+users = []
+for slave in master_private.slaves:
+ users += [(slave['name'], slave['password'])]
+
authz_cfg = authz.Authz(
+ auth=auth.BasicAuth(users),
# change any of these to True to enable; see the manual for more
# options
gracefulShutdown=False,
- forceBuild=True, # use this to test your slave once it is set up
+ forceBuild='auth', # use this to test your slave once it is set up
forceAllBuilds=False,
pingBuilder=False,
- stopBuild=True,
+ stopBuild='auth',
stopAllBuilds=False,
- cancelPendingBuild=True,
+ cancelPendingBuild='auth',
)
c['status'].append(html.WebStatus(http_port=8010, authz=authz_cfg))
Modified: branches/multiview/extern/libmv/ChangeLog
===================================================================
--- branches/multiview/extern/libmv/ChangeLog 2013-06-02 00:29:30 UTC (rev 57184)
+++ branches/multiview/extern/libmv/ChangeLog 2013-06-02 01:03:51 UTC (rev 57185)
@@ -1,3 +1,12 @@
+commit 2cd653e2952379da7daf56edcd9e71b0aa929f90
+Author: Sergey Sharybin <sergey.vfx at gmail.com>
+Date: Sat Jun 1 16:20:35 2013 +0600
+
+ Pass vectors by a reference
+
+ Saves couple of time which used to waste on copying objects,
+ also solves win32 compilation errors caused by alignment.
+
commit f61b8198b9bddd8d2fa53feae7924aa23df48cbd
Author: Sergey Sharybin <sergey.vfx at gmail.com>
Date: Thu May 30 18:00:03 2013 +0600
@@ -593,43 +602,3 @@
Fixed incorrect order of arguments passing
to EXPECT_EQ in keyframe selection tests.
-
-commit d38ebb74693fdf5b8f0fecf62a3d8c9c53b0b84a
-Author: Sergey Sharybin <sergey.vfx at gmail.com>
-Date: Fri Mar 1 17:40:38 2013 +0600
-
- Modal (aka tripod) solver rework
-
- Several major things are done in this commit:
-
- - First of all, logic of modal solver was changed.
- We do not rely on only minimizer to take care of
- guessing rotation for frame, but we're using
- analytical rotation computation for point clouds
- to obtain initial rotation.
-
- Then this rotation is being refined using Ceres
- minimizer and now instead of minimizing average
- distance between points of point of two clouds,
- minimization of reprojection error of point
- cloud onto frame happens.
-
- This gives quite a bit of precision improvement.
-
- - Second bigger improvement here is using bundle
- adjustment for a result of first step when we're
- only estimating rotation between neighbor images
- and reprojecting markers.
-
- This averages error across the image sequence
- avoiding error accumulation. Also, this will
- tweak bundles themselves a bit for better match.
-
- - And last bigger improvement here is support of
- camera intrinsics refirenment.
-
- This allowed to significantly improve solution
- for real-life footage and results after such
- refining are much more usable than it were before.
-
- Thanks to Keir for the help and code review!
Modified: branches/multiview/extern/libmv/libmv/simple_pipeline/keyframe_selection.cc
===================================================================
--- branches/multiview/extern/libmv/libmv/simple_pipeline/keyframe_selection.cc 2013-06-02 00:29:30 UTC (rev 57184)
+++ branches/multiview/extern/libmv/libmv/simple_pipeline/keyframe_selection.cc 2013-06-02 01:03:51 UTC (rev 57185)
@@ -33,7 +33,8 @@
namespace libmv {
namespace {
-Vec2 NorrmalizedToPixelSpace(Vec2 vec, const CameraIntrinsics &intrinsics) {
+Vec2 NorrmalizedToPixelSpace(const Vec2 &vec,
+ const CameraIntrinsics &intrinsics) {
Vec2 result;
double focal_length_x = intrinsics.focal_length_x();
@@ -62,7 +63,8 @@
class HomographySymmetricGeometricCostFunctor {
public:
- HomographySymmetricGeometricCostFunctor(Vec2 x, Vec2 y)
+ HomographySymmetricGeometricCostFunctor(const Vec2 &x,
+ const Vec2 &y)
: x_(x), y_(y) { }
template<typename T>
@@ -141,7 +143,8 @@
class FundamentalSymmetricEpipolarCostFunctor {
public:
- FundamentalSymmetricEpipolarCostFunctor(Vec2 x, Vec2 y)
+ FundamentalSymmetricEpipolarCostFunctor(const Vec2 &x,
+ const Vec2 &y)
: x_(x), y_(y) {}
template<typename T>
Modified: branches/multiview/intern/cycles/kernel/svm/svm_closure.h
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list