[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49334] branches/soc-2011-tomato: Merging r49300 through r49333 from trunk into soc-2011-tomato
Sergey Sharybin
sergey.vfx at gmail.com
Sat Jul 28 20:42:55 CEST 2012
Revision: 49334
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49334
Author: nazgul
Date: 2012-07-28 18:42:54 +0000 (Sat, 28 Jul 2012)
Log Message:
-----------
Merging r49300 through r49333 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49300
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49333
Modified Paths:
--------------
branches/soc-2011-tomato/build_files/scons/tools/Blender.py
branches/soc-2011-tomato/build_files/scons/tools/btools.py
branches/soc-2011-tomato/extern/libmv/third_party/ceres/include/ceres/jet.h
branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/collections_port.h
branches/soc-2011-tomato/intern/elbeem/intern/mvmcoords.cpp
branches/soc-2011-tomato/intern/iksolver/extern/IK_solver.h
branches/soc-2011-tomato/intern/iksolver/intern/IK_QJacobian.cpp
branches/soc-2011-tomato/intern/iksolver/intern/IK_QJacobianSolver.cpp
branches/soc-2011-tomato/intern/iksolver/intern/IK_QJacobianSolver.h
branches/soc-2011-tomato/intern/iksolver/intern/IK_QSegment.cpp
branches/soc-2011-tomato/intern/iksolver/intern/IK_QSegment.h
branches/soc-2011-tomato/intern/iksolver/intern/IK_QTask.cpp
branches/soc-2011-tomato/intern/iksolver/intern/IK_QTask.h
branches/soc-2011-tomato/intern/iksolver/intern/IK_Solver.cpp
branches/soc-2011-tomato/intern/iksolver/intern/MT_ExpMap.cpp
branches/soc-2011-tomato/intern/raskter/raskter.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/mask_rasterize.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/movieclip.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_opdefines.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_utils.c
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ScaleNode.cpp
branches/soc-2011-tomato/source/blender/editors/include/ED_clip.h
branches/soc-2011-tomato/source/blender/editors/include/ED_image.h
branches/soc-2011-tomato/source/blender/editors/include/ED_mask.h
branches/soc-2011-tomato/source/blender/editors/mask/mask_add.c
branches/soc-2011-tomato/source/blender/editors/mask/mask_edit.c
branches/soc-2011-tomato/source/blender/editors/mask/mask_ops.c
branches/soc-2011-tomato/source/blender/editors/mask/mask_select.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_knife.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_editor.c
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_ops.c
branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_select.c
branches/soc-2011-tomato/source/blender/editors/space_image/image_edit.c
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2011-tomato/source/blender/ikplugin/intern/iksolver_plugin.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_mask_types.h
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_mask.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_boolean.c
branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_2DFilterManager.h
branches/soc-2011-tomato/source/gameengine/VideoTexture/SConscript
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
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/vgroup_modifiers:38694-39989
/trunk/blender:36831-49299
+ /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/vgroup_modifiers:38694-39989
/trunk/blender:36831-49333
Modified: branches/soc-2011-tomato/build_files/scons/tools/Blender.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/tools/Blender.py 2012-07-28 18:14:44 UTC (rev 49333)
+++ branches/soc-2011-tomato/build_files/scons/tools/Blender.py 2012-07-28 18:42:54 UTC (rev 49334)
@@ -705,11 +705,23 @@
run("rm -r '%s/turtle.py'" % py_target)
run("rm -f '%s/lib-dynload/_tkinter.so'" % py_target)
+ if env['WITH_BF_PYTHON_INSTALL_NUMPY']:
+ numpy_src = py_src + "/site-packages/numpy"
+ numpy_target = py_target + "/site-packages/numpy"
+
+ if os.path.exists(numpy_src):
+ print 'Install numpy from:'
+ print '\t"%s" into...' % numpy_src
+ print '\t"%s"\n' % numpy_target
+
+ run("cp -R '%s' '%s'" % (numpy_src, os.path.dirname(numpy_target)))
+ else:
+ print 'Failed to find numpy at %s, skipping copying' % numpy_src
+
run("find '%s' -type d -name 'test' -prune -exec rm -rf {} ';'" % py_target)
run("find '%s' -type d -name '__pycache__' -exec rm -rf {} ';'" % py_target)
run("find '%s' -name '*.py[co]' -exec rm -rf {} ';'" % py_target)
run("find '%s' -name '*.so' -exec strip -s {} ';'" % py_target)
-
#### END ACTION STUFF #########
Modified: branches/soc-2011-tomato/build_files/scons/tools/btools.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/tools/btools.py 2012-07-28 18:14:44 UTC (rev 49333)
+++ branches/soc-2011-tomato/build_files/scons/tools/btools.py 2012-07-28 18:42:54 UTC (rev 49334)
@@ -135,7 +135,7 @@
'BF_CXX', 'WITH_BF_STATICCXX', 'BF_CXX_LIB_STATIC',
'BF_TWEAK_MODE', 'BF_SPLIT_SRC',
'WITHOUT_BF_INSTALL',
- 'WITHOUT_BF_PYTHON_INSTALL', 'WITHOUT_BF_PYTHON_UNPACK',
+ 'WITHOUT_BF_PYTHON_INSTALL', 'WITHOUT_BF_PYTHON_UNPACK', 'WITH_BF_PYTHON_INSTALL_NUMPY'
'WITHOUT_BF_OVERWRITE_INSTALL',
'WITH_BF_OPENMP', 'BF_OPENMP', 'BF_OPENMP_LIBPATH',
'WITH_GHOST_COCOA',
@@ -521,6 +521,7 @@
(BoolVariable('BF_SPLIT_SRC', 'Split src lib into several chunks if true', False)),
(BoolVariable('WITHOUT_BF_INSTALL', 'dont install if true', False)),
(BoolVariable('WITHOUT_BF_PYTHON_INSTALL', 'dont install Python modules if true', False)),
+ (BoolVariable('WITH_BF_PYTHON_INSTALL_NUMPY', 'install Python mumpy module', False)),
(BoolVariable('WITHOUT_BF_PYTHON_UNPACK', 'dont remove and unpack Python modules everytime if true', False)),
(BoolVariable('WITHOUT_BF_OVERWRITE_INSTALL', 'dont remove existing files before breating the new install directory (set to False when making packages for others)', False)),
(BoolVariable('BF_FANCY', 'Enable fancy output if true', True)),
Modified: branches/soc-2011-tomato/extern/libmv/third_party/ceres/include/ceres/jet.h
===================================================================
--- branches/soc-2011-tomato/extern/libmv/third_party/ceres/include/ceres/jet.h 2012-07-28 18:14:44 UTC (rev 49333)
+++ branches/soc-2011-tomato/extern/libmv/third_party/ceres/include/ceres/jet.h 2012-07-28 18:42:54 UTC (rev 49334)
@@ -163,8 +163,8 @@
#include "Eigen/Core"
-// Visual Studio 2010 or older version
-#if defined(_MSC_VER) && _MSC_VER <= 1600
+// Visual Studio 2012 or older version
+#if defined(_MSC_VER) && _MSC_VER <= 1700
namespace std {
inline bool isfinite(double x) { return _finite(x); }
inline bool isinf (double x) { return !_finite(x) && !_isnan(x); }
Modified: branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/collections_port.h
===================================================================
--- branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/collections_port.h 2012-07-28 18:14:44 UTC (rev 49333)
+++ branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/collections_port.h 2012-07-28 18:42:54 UTC (rev 49334)
@@ -33,7 +33,7 @@
#ifndef CERES_INTERNAL_COLLECTIONS_PORT_H_
#define CERES_INTERNAL_COLLECTIONS_PORT_H_
-#if defined(_MSC_VER) && _MSC_VER <= 1600
+#if defined(_MSC_VER) && _MSC_VER <= 1700
#include <unordered_map>
#include <unordered_set>
#else
Modified: branches/soc-2011-tomato/intern/elbeem/intern/mvmcoords.cpp
===================================================================
--- branches/soc-2011-tomato/intern/elbeem/intern/mvmcoords.cpp 2012-07-28 18:14:44 UTC (rev 49333)
+++ branches/soc-2011-tomato/intern/elbeem/intern/mvmcoords.cpp 2012-07-28 18:42:54 UTC (rev 49334)
@@ -16,6 +16,13 @@
#include "mvmcoords.h"
#include <algorithm>
+
+#if defined(_MSC_VER) && _MSC_VER > 1600
+// sdt::greater
+#include <functional>
+#endif
+
+
using std::vector;
void MeanValueMeshCoords::clear()
Modified: branches/soc-2011-tomato/intern/iksolver/extern/IK_solver.h
===================================================================
--- branches/soc-2011-tomato/intern/iksolver/extern/IK_solver.h 2012-07-28 18:14:44 UTC (rev 49333)
+++ branches/soc-2011-tomato/intern/iksolver/extern/IK_solver.h 2012-07-28 18:42:54 UTC (rev 49334)
@@ -163,6 +163,9 @@
int IK_Solve(IK_Solver *solver, float tolerance, int max_iterations);
+#define IK_STRETCH_STIFF_EPS 0.001f
+#define IK_STRETCH_STIFF_MIN 0.001f
+#define IK_STRETCH_STIFF_MAX 1e10
#ifdef __cplusplus
}
Modified: branches/soc-2011-tomato/intern/iksolver/intern/IK_QJacobian.cpp
===================================================================
--- branches/soc-2011-tomato/intern/iksolver/intern/IK_QJacobian.cpp 2012-07-28 18:14:44 UTC (rev 49333)
+++ branches/soc-2011-tomato/intern/iksolver/intern/IK_QJacobian.cpp 2012-07-28 18:42:54 UTC (rev 49334)
@@ -35,7 +35,7 @@
#include "TNT/svd.h"
IK_QJacobian::IK_QJacobian()
-: m_sdls(true), m_min_damp(1.0)
+ : m_sdls(true), m_min_damp(1.0)
{
}
@@ -106,16 +106,16 @@
void IK_QJacobian::SetBetas(int id, int, const MT_Vector3& v)
{
- m_beta[id] = v.x();
- m_beta[id+1] = v.y();
- m_beta[id+2] = v.z();
+ m_beta[id + 0] = v.x();
+ m_beta[id + 1] = v.y();
+ m_beta[id + 2] = v.z();
}
void IK_QJacobian::SetDerivatives(int id, int dof_id, const MT_Vector3& v, MT_Scalar norm_weight)
{
- m_jacobian[id][dof_id] = v.x()*m_weight_sqrt[dof_id];
- m_jacobian[id+1][dof_id] = v.y()*m_weight_sqrt[dof_id];
- m_jacobian[id+2][dof_id] = v.z()*m_weight_sqrt[dof_id];
+ m_jacobian[id + 0][dof_id] = v.x() * m_weight_sqrt[dof_id];
+ m_jacobian[id + 1][dof_id] = v.y() * m_weight_sqrt[dof_id];
+ m_jacobian[id + 2][dof_id] = v.z() * m_weight_sqrt[dof_id];
m_d_norm_weight[dof_id] = norm_weight;
}
@@ -194,7 +194,7 @@
// doesn't work well at all
int i;
for (i = 0; i < m_d_theta.size(); i++)
- m_d_theta[i] = m_d_theta[i] + /*m_min_damp**/jacobian.AngleUpdate(i);
+ m_d_theta[i] = m_d_theta[i] + /*m_min_damp * */ jacobian.AngleUpdate(i);
}
void IK_QJacobian::Restrict(TVector& d_theta, TMatrix& null)
@@ -230,7 +230,7 @@
// DLS. The SDLS damps individual singular values, instead of using a single
// damping term.
- MT_Scalar max_angle_change = MT_PI/4.0;
+ MT_Scalar max_angle_change = MT_PI / 4.0;
MT_Scalar epsilon = 1e-10;
int i, j;
@@ -239,35 +239,35 @@
for (i = 0; i < m_dof; i++) {
m_norm[i] = 0.0;
- for (j = 0; j < m_task_size; j+=3) {
+ for (j = 0; j < m_task_size; j += 3) {
MT_Scalar n = 0.0;
- n += m_jacobian[j][i]*m_jacobian[j][i];
- n += m_jacobian[j+1][i]*m_jacobian[j+1][i];
- n += m_jacobian[j+2][i]*m_jacobian[j+2][i];
+ n += m_jacobian[j][i] * m_jacobian[j][i];
+ n += m_jacobian[j + 1][i] * m_jacobian[j + 1][i];
+ n += m_jacobian[j + 2][i] * m_jacobian[j + 2][i];
m_norm[i] += sqrt(n);
}
}
- for (i = 0; i<m_svd_w.size(); i++) {
+ for (i = 0; i < m_svd_w.size(); i++) {
if (m_svd_w[i] <= epsilon)
continue;
- MT_Scalar wInv = 1.0/m_svd_w[i];
+ MT_Scalar wInv = 1.0 / m_svd_w[i];
MT_Scalar alpha = 0.0;
MT_Scalar N = 0.0;
// compute alpha and N
- for (j=0; j<m_svd_u.num_rows(); j+=3) {
- alpha += m_svd_u[j][i]*m_beta[j];
- alpha += m_svd_u[j+1][i]*m_beta[j+1];
- alpha += m_svd_u[j+2][i]*m_beta[j+2];
+ for (j = 0; j < m_svd_u.num_rows(); j += 3) {
+ alpha += m_svd_u[j][i] * m_beta[j];
+ alpha += m_svd_u[j + 1][i] * m_beta[j + 1];
+ alpha += m_svd_u[j + 2][i] * m_beta[j + 2];
// note: for 1 end effector, N will always be 1, since U is
// orthogonal, .. so could be optimized
MT_Scalar tmp;
- tmp = m_svd_u[j][i]*m_svd_u[j][i];
- tmp += m_svd_u[j+1][i]*m_svd_u[j+1][i];
- tmp += m_svd_u[j+2][i]*m_svd_u[j+2][i];
+ tmp = m_svd_u[j][i] * m_svd_u[j][i];
+ tmp += m_svd_u[j + 1][i] * m_svd_u[j + 1][i];
+ tmp += m_svd_u[j + 2][i] * m_svd_u[j + 2][i];
N += sqrt(tmp);
}
alpha *= wInv;
@@ -278,14 +278,14 @@
for (j = 0; j < m_d_theta.size(); j++) {
MT_Scalar v = m_svd_v[j][i];
- M += MT_abs(v)*m_norm[j];
+ M += MT_abs(v) * m_norm[j];
// compute tmporary dTheta's
- m_d_theta_tmp[j] = v*alpha;
+ m_d_theta_tmp[j] = v * alpha;
// find largest absolute dTheta
// multiply with weight to prevent unnecessary damping
- abs_dtheta = MT_abs(m_d_theta_tmp[j])*m_weight_sqrt[j];
+ abs_dtheta = MT_abs(m_d_theta_tmp[j]) * m_weight_sqrt[j];
if (abs_dtheta > max_dtheta)
max_dtheta = abs_dtheta;
}
@@ -295,19 +295,19 @@
// compute damping term and damp the dTheta's
MT_Scalar gamma = max_angle_change;
if (N < M)
- gamma *= N/M;
+ gamma *= N / M;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list