[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46495] branches/soc-2011-tomato: Merging r46469 through r46494 from trunk into soc-2011-tomato
Sergey Sharybin
sergey.vfx at gmail.com
Thu May 10 13:20:16 CEST 2012
Revision: 46495
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46495
Author: nazgul
Date: 2012-05-10 11:20:15 +0000 (Thu, 10 May 2012)
Log Message:
-----------
Merging r46469 through r46494 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46469
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46494
Modified Paths:
--------------
branches/soc-2011-tomato/extern/carve/CMakeLists.txt
branches/soc-2011-tomato/extern/carve/bundle.sh
branches/soc-2011-tomato/extern/carve/lib/intersect.cpp
branches/soc-2011-tomato/extern/libmv/bundle.sh
branches/soc-2011-tomato/intern/dualcon/intern/Projections.cpp
branches/soc-2011-tomato/intern/dualcon/intern/Projections.h
branches/soc-2011-tomato/intern/dualcon/intern/octree.cpp
branches/soc-2011-tomato/intern/dualcon/intern/octree.h
branches/soc-2011-tomato/release/scripts/modules/bpy_types.py
branches/soc-2011-tomato/source/blender/blenkernel/intern/sound.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
branches/soc-2011-tomato/source/blender/collada/MaterialExporter.cpp
branches/soc-2011-tomato/source/blender/editors/interface/interface_handlers.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_ops.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_loopcut.c
branches/soc-2011-tomato/source/blender/editors/render/render_shading.c
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_editor.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2011-tomato/source/blender/editors/util/numinput.c
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-46468
+ /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-46494
Modified: branches/soc-2011-tomato/extern/carve/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/extern/carve/CMakeLists.txt 2012-05-10 11:17:15 UTC (rev 46494)
+++ branches/soc-2011-tomato/extern/carve/CMakeLists.txt 2012-05-10 11:20:15 UTC (rev 46495)
@@ -35,115 +35,115 @@
)
set(SRC
- lib/intersection.cpp
- lib/intersect.cpp
- lib/triangulator.cpp
+ lib/aabb.cpp
+ lib/carve.cpp
lib/convex_hull.cpp
- lib/polyhedron.cpp
- lib/polyline.cpp
- lib/pointset.cpp
+ lib/csg_collector.cpp
+ lib/csg.cpp
+ lib/edge.cpp
+ lib/face.cpp
lib/geom2d.cpp
- lib/math.cpp
- lib/intersect_half_classify_group.cpp
- lib/intersect_face_division.cpp
- lib/tag.cpp
- lib/aabb.cpp
- lib/intersect_classify_group.cpp
- lib/mesh.cpp
- lib/timing.cpp
lib/geom3d.cpp
- lib/intersect_group.cpp
- lib/carve.cpp
lib/intersect_classify_edge.cpp
- lib/csg.cpp
- lib/face.cpp
- lib/csg_collector.cpp
+ lib/intersect_classify_group.cpp
+ lib/intersect.cpp
lib/intersect_debug.cpp
- lib/edge.cpp
+ lib/intersect_face_division.cpp
+ lib/intersect_group.cpp
+ lib/intersect_half_classify_group.cpp
+ lib/intersection.cpp
+ lib/math.cpp
+ lib/mesh.cpp
lib/octree.cpp
+ lib/pointset.cpp
+ lib/polyhedron.cpp
+ lib/polyline.cpp
+ lib/tag.cpp
+ lib/timing.cpp
+ lib/triangulator.cpp
- lib/intersect_debug.hpp
lib/csg_collector.hpp
lib/csg_data.hpp
+ lib/csg_detail.hpp
lib/intersect_classify_common.hpp
+ lib/intersect_classify_common_impl.hpp
lib/intersect_common.hpp
- lib/csg_detail.hpp
- lib/intersect_classify_common_impl.hpp
+ lib/intersect_debug.hpp
- include/carve/vertex_impl.hpp
+ include/carve/aabb.hpp
include/carve/aabb_impl.hpp
- include/carve/csg.hpp
- include/carve/pointset_iter.hpp
- include/carve/debug_hooks.hpp
- include/carve/mesh.hpp
- include/carve/triangulator_impl.hpp
- include/carve/edge_decl.hpp
+ include/carve/carve.hpp
+ include/carve/cbrt.h
+ include/carve/classification.hpp
+ include/carve/collection.hpp
+ include/carve/collection_types.hpp
+ include/carve/collection/unordered/boost_impl.hpp
+ include/carve/collection/unordered/fallback_impl.hpp
include/carve/collection/unordered.hpp
+ include/carve/collection/unordered/libstdcpp_impl.hpp
+ include/carve/collection/unordered/std_impl.hpp
include/carve/collection/unordered/tr1_impl.hpp
- include/carve/collection/unordered/fallback_impl.hpp
- include/carve/collection/unordered/std_impl.hpp
include/carve/collection/unordered/vcpp_impl.hpp
- include/carve/collection/unordered/libstdcpp_impl.hpp
- include/carve/collection/unordered/boost_impl.hpp
+ include/carve/colour.hpp
include/carve/convex_hull.hpp
- include/carve/geom.hpp
- include/carve/collection_types.hpp
- include/carve/cbrt.h
- include/carve/util.hpp
- include/carve/iobj.hpp
- include/carve/polyline_decl.hpp
- include/carve/polyline_impl.hpp
- include/carve/win32.h
+ include/carve/csg.hpp
+ include/carve/csg_triangulator.hpp
+ include/carve/debug_hooks.hpp
+ include/carve/djset.hpp
+ include/carve/edge_decl.hpp
include/carve/edge_impl.hpp
- include/carve/carve.hpp
- include/carve/polyline.hpp
+ include/carve/exact.hpp
include/carve/face_decl.hpp
- include/carve/matrix.hpp
- include/carve/classification.hpp
- include/carve/geom_impl.hpp
+ include/carve/face_impl.hpp
include/carve/faceloop.hpp
- include/carve/mesh_ops.hpp
- include/carve/tree.hpp
include/carve/geom2d.hpp
- include/carve/face_impl.hpp
- include/carve/polyhedron_decl.hpp
+ include/carve/geom3d.hpp
+ include/carve/geom.hpp
+ include/carve/geom_impl.hpp
+ include/carve/gnu_cxx.h
+ include/carve/heap.hpp
+ include/carve/input.hpp
include/carve/interpolator.hpp
- include/carve/poly_decl.hpp
+ include/carve/intersection.hpp
+ include/carve/iobj.hpp
+ include/carve/kd_node.hpp
+ include/carve/math_constants.hpp
+ include/carve/math.hpp
+ include/carve/matrix.hpp
+ include/carve/mesh.hpp
include/carve/mesh_impl.hpp
- include/carve/gnu_cxx.h
+ include/carve/mesh_ops.hpp
include/carve/mesh_simplify.hpp
- include/carve/triangulator.hpp
- include/carve/pointset_impl.hpp
- include/carve/rtree.hpp
- include/carve/math_constants.hpp
- include/carve/vector.hpp
+ include/carve/octree_decl.hpp
include/carve/octree_impl.hpp
+ include/carve/pointset_decl.hpp
include/carve/pointset.hpp
- include/carve/math.hpp
- include/carve/intersection.hpp
- include/carve/colour.hpp
- include/carve/kd_node.hpp
- include/carve/input.hpp
- include/carve/geom3d.hpp
- include/carve/exact.hpp
+ include/carve/pointset_impl.hpp
+ include/carve/pointset_iter.hpp
+ include/carve/poly_decl.hpp
+ include/carve/polyhedron_base.hpp
+ include/carve/polyhedron_decl.hpp
+ include/carve/polyhedron_impl.hpp
+ include/carve/poly.hpp
+ include/carve/poly_impl.hpp
+ include/carve/polyline_decl.hpp
+ include/carve/polyline.hpp
+ include/carve/polyline_impl.hpp
+ include/carve/polyline_iter.hpp
include/carve/rescale.hpp
- include/carve/polyhedron_base.hpp
- include/carve/heap.hpp
+ include/carve/rtree.hpp
include/carve/spacetree.hpp
- include/carve/polyhedron_impl.hpp
+ include/carve/tag.hpp
+ include/carve/timing.hpp
+ include/carve/tree.hpp
+ include/carve/triangulator.hpp
+ include/carve/triangulator_impl.hpp
+ include/carve/util.hpp
include/carve/vcpp_config.h
- include/carve/aabb.hpp
- include/carve/polyline_iter.hpp
- include/carve/djset.hpp
+ include/carve/vector.hpp
include/carve/vertex_decl.hpp
- include/carve/csg_triangulator.hpp
- include/carve/poly.hpp
- include/carve/timing.hpp
- include/carve/octree_decl.hpp
- include/carve/pointset_decl.hpp
- include/carve/tag.hpp
- include/carve/collection.hpp
- include/carve/poly_impl.hpp
+ include/carve/vertex_impl.hpp
+ include/carve/win32.h
)
if(WITH_BOOST)
Modified: branches/soc-2011-tomato/extern/carve/bundle.sh
===================================================================
--- branches/soc-2011-tomato/extern/carve/bundle.sh 2012-05-10 11:17:15 UTC (rev 46494)
+++ branches/soc-2011-tomato/extern/carve/bundle.sh 2012-05-10 11:20:15 UTC (rev 46495)
@@ -1,7 +1,9 @@
#!/bin/sh
-if [ -d ./.svn ]; then
- echo "This script is supposed to work only when using git-svn"
+if [ "x$1" = "x--i-really-know-what-im-doing" ] ; then
+ echo Proceeding as requested by command line ...
+else
+ echo "*** Please run again with --i-really-know-what-im-doing ..."
exit 1
fi
@@ -14,8 +16,8 @@
cat ./patches/$p | patch -d $tmp/carve -p1
done
-rm -rf include
-rm -rf lib
+find include -type f -not -iwholename '*.svn*' -exec rm -rf {} \;
+find lib -type f -not -iwholename '*.svn*' -exec rm -rf {} \;
cat "files.txt" | while read f; do
mkdir -p `dirname $f`
@@ -24,9 +26,9 @@
rm -rf $tmp
-sources=`find ./lib -type f -iname '*.cc' -or -iname '*.cpp' -or -iname '*.c' | sed -r 's/^\.\//\t/'`
-headers=`find ./lib -type f -iname '*.h' -or -iname '*.hpp' | sed -r 's/^\.\//\t/'`
-includes=`find ./include -type f -iname '*.h' -or -iname '*.hpp' | sed -r 's/^\.\//\t/'`
+sources=`find ./lib -type f -iname '*.cc' -or -iname '*.cpp' -or -iname '*.c' | sed -r 's/^\.\//\t/' | sort -d`
+headers=`find ./lib -type f -iname '*.h' -or -iname '*.hpp' | sed -r 's/^\.\//\t/' | sort -d`
+includes=`find ./include -type f -iname '*.h' -or -iname '*.hpp' | sed -r 's/^\.\//\t/' | sort -d`
mkdir -p include/carve/external/boost
cp patches/files/random.hpp include/carve/external/boost/random.hpp
Modified: branches/soc-2011-tomato/extern/carve/lib/intersect.cpp
===================================================================
--- branches/soc-2011-tomato/extern/carve/lib/intersect.cpp 2012-05-10 11:17:15 UTC (rev 46494)
+++ branches/soc-2011-tomato/extern/carve/lib/intersect.cpp 2012-05-10 11:20:15 UTC (rev 46495)
@@ -647,12 +647,9 @@
return;
}
- if (std::min(eb->v1()->v.x, eb->v2()->v.x) - carve::EPSILON > va->v.x ||
- std::max(eb->v1()->v.x, eb->v2()->v.x) + carve::EPSILON < va->v.x ||
- std::min(eb->v1()->v.y, eb->v2()->v.y) - carve::EPSILON > va->v.y ||
- std::max(eb->v1()->v.y, eb->v2()->v.y) + carve::EPSILON < va->v.y ||
- std::min(eb->v1()->v.z, eb->v2()->v.z) - carve::EPSILON > va->v.z ||
- std::max(eb->v1()->v.z, eb->v2()->v.z) + carve::EPSILON < va->v.z) {
+ carve::geom::aabb<3> eb_aabb;
+ eb_aabb.fit(eb->v1()->v, eb->v2()->v);
+ if (eb_aabb.maxAxisSeparation(va->v) > carve::EPSILON) {
return;
}
Modified: branches/soc-2011-tomato/extern/libmv/bundle.sh
===================================================================
--- branches/soc-2011-tomato/extern/libmv/bundle.sh 2012-05-10 11:17:15 UTC (rev 46494)
+++ branches/soc-2011-tomato/extern/libmv/bundle.sh 2012-05-10 11:20:15 UTC (rev 46495)
@@ -1,14 +1,16 @@
#!/bin/sh
+if [ "x$1" = "x--i-really-know-what-im-doing" ] ; then
+ echo Proceeding as requested by command line ...
+else
+ echo "*** Please run again with --i-really-know-what-im-doing ..."
+ exit 1
+fi
+
#BRANCH="keir"
#BRANCH="Matthias-Fauconneau"
BRANCH="Nazg-Gul"
-if [ -d ./.svn ]; then
- echo "This script is supposed to work only when using git-svn"
- exit 1
-fi
-
repo="git://github.com/${BRANCH}/libmv.git"
tmp=`mktemp -d`
@@ -22,8 +24,10 @@
cat ./patches/$p | patch -d $tmp/libmv -p1
done
-rm -rf libmv
-rm -rf `find third_party/ -mindepth 1 -maxdepth 1 | grep -v ceres | grep -v CMake | grep -c SCons`
+find libmv -type f -not -iwholename '*.svn*' -exec rm -rf {} \;
+find third_party -type f -not -iwholename '*.svn*' -not -iwholename '*third_party/ceres*' \
+ -not -iwholename '*third_party/SConscript*' -not -iwholename '*third_party/CMakeLists.txt*' \
+ -exec rm -rf {} \;
cat "files.txt" | while read f; do
mkdir -p `dirname $f`
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list