[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56780] branches/ge_harmony: Merged revisions 56639-56779 from trunk/blender
Daniel Stokes
kupomail at gmail.com
Tue May 14 04:10:52 CEST 2013
Revision: 56780
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56780
Author: kupoman
Date: 2013-05-14 02:10:50 +0000 (Tue, 14 May 2013)
Log Message:
-----------
Merged revisions 56639-56779 from trunk/blender
Modified Paths:
--------------
branches/ge_harmony/extern/CMakeLists.txt
branches/ge_harmony/extern/SConscript
branches/ge_harmony/extern/libmv/CMakeLists.txt
branches/ge_harmony/extern/libmv/ChangeLog
branches/ge_harmony/extern/libmv/SConscript
branches/ge_harmony/extern/libmv/bundle.sh
branches/ge_harmony/extern/libmv/libmv/multiview/fundamental.cc
branches/ge_harmony/extern/libmv/libmv/multiview/fundamental.h
branches/ge_harmony/extern/libmv/libmv/simple_pipeline/bundle.cc
branches/ge_harmony/extern/libmv/libmv/simple_pipeline/bundle.h
branches/ge_harmony/extern/libmv/libmv/simple_pipeline/camera_intrinsics.h
branches/ge_harmony/extern/libmv/libmv/simple_pipeline/detect.cc
branches/ge_harmony/extern/libmv/libmv/simple_pipeline/detect.h
branches/ge_harmony/extern/libmv/libmv/simple_pipeline/initialize_reconstruction.cc
branches/ge_harmony/extern/libmv/libmv/simple_pipeline/intersect.cc
branches/ge_harmony/extern/libmv/libmv/simple_pipeline/pipeline.cc
branches/ge_harmony/extern/libmv/libmv/simple_pipeline/reconstruction_scale.cc
branches/ge_harmony/extern/libmv/libmv-capi.h
branches/ge_harmony/extern/libmv/third_party/glog/src/windows/port.h
branches/ge_harmony/intern/cycles/blender/addon/ui.py
branches/ge_harmony/intern/cycles/blender/blender_curves.cpp
branches/ge_harmony/intern/cycles/blender/blender_mesh.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_cuda.cpp
branches/ge_harmony/intern/cycles/kernel/closure/bsdf_microfacet.h
branches/ge_harmony/intern/cycles/kernel/closure/bsdf_phong_ramp.h
branches/ge_harmony/intern/cycles/kernel/closure/bsdf_ward.h
branches/ge_harmony/intern/cycles/kernel/closure/bsdf_westin.h
branches/ge_harmony/intern/cycles/kernel/closure/bssrdf.h
branches/ge_harmony/intern/cycles/kernel/kernel_camera.h
branches/ge_harmony/intern/cycles/kernel/kernel_light.h
branches/ge_harmony/intern/cycles/kernel/kernel_montecarlo.h
branches/ge_harmony/intern/cycles/kernel/osl/osl_services.cpp
branches/ge_harmony/intern/cycles/kernel/osl/osl_services.h
branches/ge_harmony/intern/cycles/kernel/shaders/node_bump.osl
branches/ge_harmony/intern/cycles/kernel/shaders/node_normal_map.osl
branches/ge_harmony/intern/cycles/kernel/shaders/node_rgb_ramp.osl
branches/ge_harmony/intern/cycles/kernel/svm/svm_closure.h
branches/ge_harmony/intern/cycles/kernel/svm/svm_displace.h
branches/ge_harmony/intern/cycles/kernel/svm/svm_gradient.h
branches/ge_harmony/intern/cycles/kernel/svm/svm_ramp.h
branches/ge_harmony/intern/cycles/kernel/svm/svm_tex_coord.h
branches/ge_harmony/intern/cycles/render/bssrdf.cpp
branches/ge_harmony/intern/cycles/render/camera.cpp
branches/ge_harmony/intern/cycles/render/graph.cpp
branches/ge_harmony/intern/cycles/render/graph.h
branches/ge_harmony/intern/cycles/render/light.cpp
branches/ge_harmony/intern/cycles/render/nodes.cpp
branches/ge_harmony/intern/cycles/render/nodes.h
branches/ge_harmony/intern/cycles/render/shader.cpp
branches/ge_harmony/intern/cycles/subd/subd_build.cpp
branches/ge_harmony/intern/cycles/util/util_boundbox.h
branches/ge_harmony/intern/cycles/util/util_math.h
branches/ge_harmony/intern/ghost/intern/GHOST_SystemCocoa.h
branches/ge_harmony/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/ge_harmony/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/ge_harmony/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/ge_harmony/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/ge_harmony/intern/guardedalloc/MEM_guardedalloc.h
branches/ge_harmony/release/scripts/startup/bl_operators/node.py
branches/ge_harmony/release/scripts/startup/bl_operators/object_quick_effects.py
branches/ge_harmony/release/scripts/startup/bl_operators/view3d.py
branches/ge_harmony/release/scripts/startup/bl_ui/properties_physics_smoke.py
branches/ge_harmony/release/scripts/startup/bl_ui/properties_render_layer.py
branches/ge_harmony/release/scripts/startup/bl_ui/space_clip.py
branches/ge_harmony/release/scripts/startup/nodeitems_builtins.py
branches/ge_harmony/source/blender/blenfont/intern/blf_font.c
branches/ge_harmony/source/blender/blenfont/intern/blf_glyph.c
branches/ge_harmony/source/blender/blenfont/intern/blf_internal.h
branches/ge_harmony/source/blender/blenfont/intern/blf_internal_types.h
branches/ge_harmony/source/blender/blenkernel/BKE_blender.h
branches/ge_harmony/source/blender/blenkernel/BKE_brush.h
branches/ge_harmony/source/blender/blenkernel/BKE_curve.h
branches/ge_harmony/source/blender/blenkernel/BKE_tracking.h
branches/ge_harmony/source/blender/blenkernel/CMakeLists.txt
branches/ge_harmony/source/blender/blenkernel/SConscript
branches/ge_harmony/source/blender/blenkernel/intern/brush.c
branches/ge_harmony/source/blender/blenkernel/intern/curve.c
branches/ge_harmony/source/blender/blenkernel/intern/depsgraph.c
branches/ge_harmony/source/blender/blenkernel/intern/displist.c
branches/ge_harmony/source/blender/blenkernel/intern/editderivedmesh.c
branches/ge_harmony/source/blender/blenkernel/intern/fcurve.c
branches/ge_harmony/source/blender/blenkernel/intern/freestyle.c
branches/ge_harmony/source/blender/blenkernel/intern/lamp.c
branches/ge_harmony/source/blender/blenkernel/intern/material.c
branches/ge_harmony/source/blender/blenkernel/intern/mesh.c
branches/ge_harmony/source/blender/blenkernel/intern/smoke.c
branches/ge_harmony/source/blender/blenkernel/intern/tracking.c
branches/ge_harmony/source/blender/blenlib/BLI_listbase.h
branches/ge_harmony/source/blender/blenlib/BLI_math_geom.h
branches/ge_harmony/source/blender/blenlib/BLI_utildefines.h
branches/ge_harmony/source/blender/blenlib/intern/edgehash.c
branches/ge_harmony/source/blender/blenlib/intern/fileops.c
branches/ge_harmony/source/blender/blenlib/intern/listbase.c
branches/ge_harmony/source/blender/blenlib/intern/math_geom.c
branches/ge_harmony/source/blender/blenlib/intern/math_matrix.c
branches/ge_harmony/source/blender/blenlib/intern/string.c
branches/ge_harmony/source/blender/blenlib/intern/string_cursor_utf8.c
branches/ge_harmony/source/blender/blenlib/intern/string_utf8.c
branches/ge_harmony/source/blender/blenloader/intern/readfile.c
branches/ge_harmony/source/blender/bmesh/CMakeLists.txt
branches/ge_harmony/source/blender/bmesh/bmesh.h
branches/ge_harmony/source/blender/bmesh/intern/bmesh_core.c
branches/ge_harmony/source/blender/bmesh/intern/bmesh_iterators.c
branches/ge_harmony/source/blender/bmesh/intern/bmesh_iterators.h
branches/ge_harmony/source/blender/bmesh/intern/bmesh_opdefines.c
branches/ge_harmony/source/blender/bmesh/intern/bmesh_walkers_impl.c
branches/ge_harmony/source/blender/bmesh/operators/bmo_connect.c
branches/ge_harmony/source/blender/bmesh/operators/bmo_edgesplit.c
branches/ge_harmony/source/blender/bmesh/operators/bmo_mirror.c
branches/ge_harmony/source/blender/bmesh/operators/bmo_utils.c
branches/ge_harmony/source/blender/compositor/nodes/COM_GroupNode.cpp
branches/ge_harmony/source/blender/compositor/nodes/COM_GroupNode.h
branches/ge_harmony/source/blender/compositor/nodes/COM_ZCombineNode.cpp
branches/ge_harmony/source/blender/compositor/operations/COM_BlurBaseOperation.h
branches/ge_harmony/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp
branches/ge_harmony/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp
branches/ge_harmony/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
branches/ge_harmony/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
branches/ge_harmony/source/blender/compositor/operations/COM_ZCombineOperation.cpp
branches/ge_harmony/source/blender/editors/armature/armature_ops.c
branches/ge_harmony/source/blender/editors/curve/curve_ops.c
branches/ge_harmony/source/blender/editors/include/ED_transform.h
branches/ge_harmony/source/blender/editors/include/ED_uvedit.h
branches/ge_harmony/source/blender/editors/include/UI_interface.h
branches/ge_harmony/source/blender/editors/interface/interface.c
branches/ge_harmony/source/blender/editors/interface/interface_handlers.c
branches/ge_harmony/source/blender/editors/interface/interface_layout.c
branches/ge_harmony/source/blender/editors/interface/interface_regions.c
branches/ge_harmony/source/blender/editors/interface/interface_templates.c
branches/ge_harmony/source/blender/editors/interface/interface_widgets.c
branches/ge_harmony/source/blender/editors/interface/resources.c
branches/ge_harmony/source/blender/editors/mesh/editmesh_tools.c
branches/ge_harmony/source/blender/editors/mesh/mesh_data.c
branches/ge_harmony/source/blender/editors/mesh/meshtools.c
branches/ge_harmony/source/blender/editors/object/object_edit.c
branches/ge_harmony/source/blender/editors/object/object_transform.c
branches/ge_harmony/source/blender/editors/render/render_internal.c
branches/ge_harmony/source/blender/editors/render/render_preview.c
branches/ge_harmony/source/blender/editors/screen/area.c
branches/ge_harmony/source/blender/editors/sculpt_paint/paint_image_2d.c
branches/ge_harmony/source/blender/editors/sculpt_paint/paint_image_proj.c
branches/ge_harmony/source/blender/editors/sculpt_paint/paint_stroke.c
branches/ge_harmony/source/blender/editors/sculpt_paint/sculpt.c
branches/ge_harmony/source/blender/editors/space_action/action_ops.c
branches/ge_harmony/source/blender/editors/space_clip/clip_intern.h
branches/ge_harmony/source/blender/editors/space_clip/clip_ops.c
branches/ge_harmony/source/blender/editors/space_clip/space_clip.c
branches/ge_harmony/source/blender/editors/space_clip/tracking_ops.c
branches/ge_harmony/source/blender/editors/space_file/file_draw.c
branches/ge_harmony/source/blender/editors/space_graph/graph_ops.c
branches/ge_harmony/source/blender/editors/space_logic/logic_window.c
branches/ge_harmony/source/blender/editors/space_node/drawnode.c
branches/ge_harmony/source/blender/editors/space_node/node_ops.c
branches/ge_harmony/source/blender/editors/space_outliner/outliner_draw.c
branches/ge_harmony/source/blender/editors/space_sequencer/sequencer_ops.c
branches/ge_harmony/source/blender/editors/space_text/space_text.c
branches/ge_harmony/source/blender/editors/space_view3d/drawmesh.c
branches/ge_harmony/source/blender/editors/space_view3d/view3d_header.c
branches/ge_harmony/source/blender/editors/transform/transform.c
branches/ge_harmony/source/blender/editors/transform/transform.h
branches/ge_harmony/source/blender/editors/transform/transform_conversions.c
branches/ge_harmony/source/blender/editors/transform/transform_ops.c
branches/ge_harmony/source/blender/editors/transform/transform_orientations.c
branches/ge_harmony/source/blender/editors/uvedit/uvedit_buttons.c
branches/ge_harmony/source/blender/editors/uvedit/uvedit_draw.c
branches/ge_harmony/source/blender/editors/uvedit/uvedit_intern.h
branches/ge_harmony/source/blender/editors/uvedit/uvedit_ops.c
branches/ge_harmony/source/blender/editors/uvedit/uvedit_smart_stitch.c
branches/ge_harmony/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/ge_harmony/source/blender/freestyle/intern/application/AppConfig.h
branches/ge_harmony/source/blender/freestyle/intern/application/AppView.h
branches/ge_harmony/source/blender/freestyle/intern/application/Controller.h
branches/ge_harmony/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h
branches/ge_harmony/source/blender/freestyle/intern/geometry/BBox.h
branches/ge_harmony/source/blender/freestyle/intern/geometry/Bezier.h
branches/ge_harmony/source/blender/freestyle/intern/geometry/GeomCleaner.h
branches/ge_harmony/source/blender/freestyle/intern/geometry/Grid.h
branches/ge_harmony/source/blender/freestyle/intern/geometry/GridHelpers.h
branches/ge_harmony/source/blender/freestyle/intern/geometry/Noise.h
branches/ge_harmony/source/blender/freestyle/intern/geometry/Polygon.h
branches/ge_harmony/source/blender/freestyle/intern/geometry/SweepLine.h
branches/ge_harmony/source/blender/freestyle/intern/geometry/VecMat.h
branches/ge_harmony/source/blender/freestyle/intern/geometry/normal_cycle.h
branches/ge_harmony/source/blender/freestyle/intern/image/GaussianFilter.h
branches/ge_harmony/source/blender/freestyle/intern/image/Image.h
branches/ge_harmony/source/blender/freestyle/intern/image/ImagePyramid.h
branches/ge_harmony/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp
branches/ge_harmony/source/blender/freestyle/intern/scene_graph/DrawingStyle.h
branches/ge_harmony/source/blender/freestyle/intern/scene_graph/FrsMaterial.h
branches/ge_harmony/source/blender/freestyle/intern/scene_graph/SceneVisitor.h
branches/ge_harmony/source/blender/freestyle/intern/stroke/Canvas.h
branches/ge_harmony/source/blender/freestyle/intern/stroke/Curve.h
branches/ge_harmony/source/blender/freestyle/intern/stroke/Modifiers.h
branches/ge_harmony/source/blender/freestyle/intern/stroke/Module.h
branches/ge_harmony/source/blender/freestyle/intern/stroke/Operators.h
branches/ge_harmony/source/blender/freestyle/intern/stroke/Predicates0D.h
branches/ge_harmony/source/blender/freestyle/intern/stroke/Predicates1D.h
branches/ge_harmony/source/blender/freestyle/intern/stroke/Stroke.h
branches/ge_harmony/source/blender/freestyle/intern/stroke/StrokeLayer.h
branches/ge_harmony/source/blender/freestyle/intern/stroke/StrokeRenderer.h
branches/ge_harmony/source/blender/freestyle/intern/stroke/StrokeRep.h
branches/ge_harmony/source/blender/freestyle/intern/stroke/StrokeShader.h
branches/ge_harmony/source/blender/freestyle/intern/stroke/StrokeTesselator.h
branches/ge_harmony/source/blender/freestyle/intern/stroke/StyleModule.h
branches/ge_harmony/source/blender/freestyle/intern/system/BaseIterator.h
branches/ge_harmony/source/blender/freestyle/intern/system/BaseObject.h
branches/ge_harmony/source/blender/freestyle/intern/system/Exception.h
branches/ge_harmony/source/blender/freestyle/intern/system/Id.h
branches/ge_harmony/source/blender/freestyle/intern/system/Interpreter.h
branches/ge_harmony/source/blender/freestyle/intern/system/Iterator.h
branches/ge_harmony/source/blender/freestyle/intern/system/PointerSequence.h
branches/ge_harmony/source/blender/freestyle/intern/system/ProgressBar.h
branches/ge_harmony/source/blender/freestyle/intern/system/PseudoNoise.h
branches/ge_harmony/source/blender/freestyle/intern/system/RandGen.h
branches/ge_harmony/source/blender/freestyle/intern/system/RenderMonitor.h
branches/ge_harmony/source/blender/freestyle/intern/system/TimeStamp.h
branches/ge_harmony/source/blender/freestyle/intern/system/TimeUtils.h
branches/ge_harmony/source/blender/freestyle/intern/view_map/BoxGrid.h
branches/ge_harmony/source/blender/freestyle/intern/view_map/FEdgeXDetector.h
branches/ge_harmony/source/blender/freestyle/intern/view_map/Functions0D.h
branches/ge_harmony/source/blender/freestyle/intern/view_map/Functions1D.h
branches/ge_harmony/source/blender/freestyle/intern/view_map/GridDensityProvider.h
branches/ge_harmony/source/blender/freestyle/intern/view_map/Interface0D.h
branches/ge_harmony/source/blender/freestyle/intern/view_map/Interface1D.h
branches/ge_harmony/source/blender/freestyle/intern/view_map/OccluderSource.h
branches/ge_harmony/source/blender/freestyle/intern/view_map/Silhouette.h
branches/ge_harmony/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.h
branches/ge_harmony/source/blender/freestyle/intern/view_map/SphericalGrid.h
branches/ge_harmony/source/blender/freestyle/intern/view_map/SteerableViewMap.h
branches/ge_harmony/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.h
branches/ge_harmony/source/blender/freestyle/intern/view_map/ViewMap.h
branches/ge_harmony/source/blender/freestyle/intern/view_map/ViewMapBuilder.h
branches/ge_harmony/source/blender/freestyle/intern/view_map/ViewMapTesselator.h
branches/ge_harmony/source/blender/freestyle/intern/winged_edge/Curvature.h
branches/ge_harmony/source/blender/freestyle/intern/winged_edge/WEdge.h
branches/ge_harmony/source/blender/freestyle/intern/winged_edge/WFillGrid.h
branches/ge_harmony/source/blender/freestyle/intern/winged_edge/WXEdge.h
branches/ge_harmony/source/blender/gpu/intern/gpu_extensions.c
branches/ge_harmony/source/blender/gpu/intern/gpu_simple_shader.c
branches/ge_harmony/source/blender/gpu/shaders/gpu_shader_material.glsl
branches/ge_harmony/source/blender/imbuf/IMB_colormanagement.h
branches/ge_harmony/source/blender/imbuf/IMB_imbuf.h
branches/ge_harmony/source/blender/imbuf/intern/colormanagement.c
branches/ge_harmony/source/blender/imbuf/intern/jpeg.c
branches/ge_harmony/source/blender/imbuf/intern/rectop.c
branches/ge_harmony/source/blender/makesdna/DNA_smoke_types.h
branches/ge_harmony/source/blender/makesrna/RNA_access.h
branches/ge_harmony/source/blender/makesrna/intern/rna_access.c
branches/ge_harmony/source/blender/makesrna/intern/rna_mask.c
branches/ge_harmony/source/blender/makesrna/intern/rna_mesh.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_particle.c
branches/ge_harmony/source/blender/makesrna/intern/rna_scene.c
branches/ge_harmony/source/blender/makesrna/intern/rna_smoke.c
branches/ge_harmony/source/blender/makesrna/intern/rna_space.c
branches/ge_harmony/source/blender/makesrna/intern/rna_ui_api.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_array.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_boolean.c
branches/ge_harmony/source/blender/nodes/NOD_static_types.h
branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_bump.c
branches/ge_harmony/source/blender/nodes/texture/nodes/node_texture_mixRgb.c
branches/ge_harmony/source/blender/python/intern/bpy_rna.c
branches/ge_harmony/source/blender/render/extern/include/RE_pipeline.h
branches/ge_harmony/source/blender/render/intern/include/render_types.h
branches/ge_harmony/source/blender/render/intern/source/convertblender.c
branches/ge_harmony/source/blender/render/intern/source/external_engine.c
branches/ge_harmony/source/blender/render/intern/source/pipeline.c
branches/ge_harmony/source/blender/windowmanager/WM_api.h
branches/ge_harmony/source/blender/windowmanager/WM_keymap.h
branches/ge_harmony/source/blender/windowmanager/intern/wm_draw.c
branches/ge_harmony/source/blender/windowmanager/intern/wm_event_system.c
branches/ge_harmony/source/blender/windowmanager/intern/wm_keymap.c
branches/ge_harmony/source/blenderplayer/CMakeLists.txt
branches/ge_harmony/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/ge_harmony/source/creator/CMakeLists.txt
branches/ge_harmony/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/ge_harmony/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/ge_harmony/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/ge_harmony/source/gameengine/Ketsji/BL_Action.cpp
branches/ge_harmony/source/gameengine/Ketsji/BL_Action.h
branches/ge_harmony/source/gameengine/Ketsji/BL_BlenderShader.cpp
branches/ge_harmony/source/gameengine/Rasterizer/RAS_BucketManager.cpp
branches/ge_harmony/source/gameengine/VideoTexture/ImageBuff.cpp
Added Paths:
-----------
branches/ge_harmony/extern/libmv/libmv-capi.cc
branches/ge_harmony/extern/libmv/libmv-capi_stub.cc
branches/ge_harmony/source/blender/bmesh/intern/bmesh_edgeloop.c
branches/ge_harmony/source/blender/bmesh/intern/bmesh_edgeloop.h
branches/ge_harmony/source/blender/bmesh/operators/bmo_bridge.c
Removed Paths:
-------------
branches/ge_harmony/extern/libmv/libmv-capi.cpp
Property Changed:
----------------
branches/ge_harmony/
branches/ge_harmony/source/blender/editors/interface/interface.c
branches/ge_harmony/source/blender/editors/space_outliner/
Property changes on: branches/ge_harmony
___________________________________________________________________
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,52854-52856,54573
/trunk/blender:48067-56638
+ /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,52854-52856,54573
/trunk/blender:48067-56779
Modified: branches/ge_harmony/extern/CMakeLists.txt
===================================================================
--- branches/ge_harmony/extern/CMakeLists.txt 2013-05-13 22:58:27 UTC (rev 56779)
+++ branches/ge_harmony/extern/CMakeLists.txt 2013-05-14 02:10:50 UTC (rev 56780)
@@ -29,6 +29,7 @@
add_subdirectory(colamd)
add_subdirectory(rangetree)
add_subdirectory(wcwidth)
+add_subdirectory(libmv)
if(WITH_BULLET)
if(NOT WITH_SYSTEM_BULLET)
@@ -69,10 +70,6 @@
add_subdirectory(lzma)
endif()
-if(WITH_LIBMV)
- add_subdirectory(libmv)
-endif()
-
if(WITH_MOD_BOOLEAN)
add_subdirectory(carve)
endif()
Modified: branches/ge_harmony/extern/SConscript
===================================================================
--- branches/ge_harmony/extern/SConscript 2013-05-13 22:58:27 UTC (rev 56779)
+++ branches/ge_harmony/extern/SConscript 2013-05-14 02:10:50 UTC (rev 56780)
@@ -6,6 +6,7 @@
SConscript(['colamd/SConscript'])
SConscript(['rangetree/SConscript'])
SConscript(['wcwidth/SConscript'])
+SConscript(['libmv/SConscript'])
if env['WITH_BF_GAMEENGINE']:
SConscript(['recastnavigation/SConscript'])
@@ -34,9 +35,6 @@
if env['WITH_BF_LZMA']:
SConscript(['lzma/SConscript'])
-if env['WITH_BF_LIBMV']:
- SConscript(['libmv/SConscript'])
-
if env['WITH_BF_BOOLEAN']:
SConscript(['carve/SConscript'])
Modified: branches/ge_harmony/extern/libmv/CMakeLists.txt
===================================================================
--- branches/ge_harmony/extern/libmv/CMakeLists.txt 2013-05-13 22:58:27 UTC (rev 56779)
+++ branches/ge_harmony/extern/libmv/CMakeLists.txt 2013-05-14 02:10:50 UTC (rev 56780)
@@ -28,198 +28,216 @@
set(INC
.
- third_party/ceres/include
)
-set(INC_SYS
- ../Eigen3
- ${PNG_INCLUDE_DIR}
- ${ZLIB_INCLUDE_DIRS}
+set(SRC
+ libmv-capi.h
)
-set(SRC
- libmv-capi.cpp
- libmv/image/array_nd.cc
- libmv/image/convolve.cc
- libmv/multiview/conditioning.cc
- libmv/multiview/euclidean_resection.cc
- libmv/multiview/fundamental.cc
- libmv/multiview/homography.cc
- libmv/multiview/panography.cc
- libmv/multiview/projection.cc
- libmv/multiview/triangulation.cc
- libmv/numeric/numeric.cc
- libmv/numeric/poly.cc
- libmv/simple_pipeline/bundle.cc
- libmv/simple_pipeline/camera_intrinsics.cc
- libmv/simple_pipeline/detect.cc
- libmv/simple_pipeline/initialize_reconstruction.cc
- libmv/simple_pipeline/intersect.cc
- libmv/simple_pipeline/modal_solver.cc
- libmv/simple_pipeline/pipeline.cc
- libmv/simple_pipeline/reconstruction.cc
- libmv/simple_pipeline/reconstruction_scale.cc
- libmv/simple_pipeline/resect.cc
- libmv/simple_pipeline/tracks.cc
- libmv/tracking/brute_region_tracker.cc
- libmv/tracking/esm_region_tracker.cc
- libmv/tracking/hybrid_region_tracker.cc
- libmv/tracking/klt_region_tracker.cc
- libmv/tracking/lmicklt_region_tracker.cc
- libmv/tracking/pyramid_region_tracker.cc
- libmv/tracking/retrack_region_tracker.cc
- libmv/tracking/track_region.cc
- libmv/tracking/trklt_region_tracker.cc
+if(WITH_LIBMV)
+ add_definitions(
+ -DWITH_LIBMV
+ )
- third_party/fast/fast_10.c
- third_party/fast/fast_11.c
- third_party/fast/fast_12.c
- third_party/fast/fast_9.c
- third_party/fast/fast.c
- third_party/fast/nonmax.c
- third_party/gflags/gflags.cc
- third_party/gflags/gflags_completions.cc
- third_party/gflags/gflags_reporting.cc
+ list(APPEND INC
+ third_party/ceres/include
+ )
- libmv-capi.h
- libmv/base/id_generator.h
- libmv/base/scoped_ptr.h
- libmv/base/vector.h
- libmv/base/vector_utils.h
- libmv/image/array_nd.h
- libmv/image/convolve.h
- libmv/image/correlation.h
- libmv/image/image.h
- libmv/image/sample.h
- libmv/image/tuple.h
- libmv/logging/logging.h
- libmv/multiview/conditioning.h
- libmv/multiview/euclidean_resection.h
- libmv/multiview/fundamental.h
- libmv/multiview/homography.h
- libmv/multiview/homography_parameterization.h
- libmv/multiview/nviewtriangulation.h
- libmv/multiview/panography.h
- libmv/multiview/projection.h
- libmv/multiview/resection.h
- libmv/multiview/triangulation.h
- libmv/numeric/dogleg.h
- libmv/numeric/function_derivative.h
- libmv/numeric/levenberg_marquardt.h
- libmv/numeric/numeric.h
- libmv/numeric/poly.h
- libmv/simple_pipeline/bundle.h
- libmv/simple_pipeline/callbacks.h
- libmv/simple_pipeline/camera_intrinsics.h
- libmv/simple_pipeline/detect.h
- libmv/simple_pipeline/initialize_reconstruction.h
- libmv/simple_pipeline/intersect.h
- libmv/simple_pipeline/modal_solver.h
- libmv/simple_pipeline/pipeline.h
- libmv/simple_pipeline/reconstruction.h
- libmv/simple_pipeline/reconstruction_scale.h
- libmv/simple_pipeline/resect.h
- libmv/simple_pipeline/tracks.h
- libmv/tracking/brute_region_tracker.h
- libmv/tracking/esm_region_tracker.h
- libmv/tracking/hybrid_region_tracker.h
- libmv/tracking/klt_region_tracker.h
- libmv/tracking/lmicklt_region_tracker.h
- libmv/tracking/pyramid_region_tracker.h
- libmv/tracking/region_tracker.h
- libmv/tracking/retrack_region_tracker.h
- libmv/tracking/track_region.h
- libmv/tracking/trklt_region_tracker.h
+ set(INC_SYS
+ ../Eigen3
+ ${PNG_INCLUDE_DIR}
+ ${ZLIB_INCLUDE_DIRS}
+ )
- third_party/fast/fast.h
- third_party/gflags/config.h
- third_party/gflags/gflags/gflags_completions.h
- third_party/gflags/gflags/gflags_declare.h
- third_party/gflags/gflags/gflags.h
- third_party/gflags/mutex.h
- third_party/gflags/util.h
- third_party/msinttypes/inttypes.h
- third_party/msinttypes/stdint.h
-)
-
-if(WIN32)
list(APPEND SRC
- third_party/glog/src/logging.cc
- third_party/glog/src/raw_logging.cc
- third_party/glog/src/utilities.cc
- third_party/glog/src/vlog_is_on.cc
- third_party/glog/src/windows/port.cc
+ libmv-capi.cc
+ libmv/image/array_nd.cc
+ libmv/image/convolve.cc
+ libmv/multiview/conditioning.cc
+ libmv/multiview/euclidean_resection.cc
+ libmv/multiview/fundamental.cc
+ libmv/multiview/homography.cc
+ libmv/multiview/panography.cc
+ libmv/multiview/projection.cc
+ libmv/multiview/triangulation.cc
+ libmv/numeric/numeric.cc
+ libmv/numeric/poly.cc
+ libmv/simple_pipeline/bundle.cc
+ libmv/simple_pipeline/camera_intrinsics.cc
+ libmv/simple_pipeline/detect.cc
+ libmv/simple_pipeline/initialize_reconstruction.cc
+ libmv/simple_pipeline/intersect.cc
+ libmv/simple_pipeline/modal_solver.cc
+ libmv/simple_pipeline/pipeline.cc
+ libmv/simple_pipeline/reconstruction.cc
+ libmv/simple_pipeline/reconstruction_scale.cc
+ libmv/simple_pipeline/resect.cc
+ libmv/simple_pipeline/tracks.cc
+ libmv/tracking/brute_region_tracker.cc
+ libmv/tracking/esm_region_tracker.cc
+ libmv/tracking/hybrid_region_tracker.cc
+ libmv/tracking/klt_region_tracker.cc
+ libmv/tracking/lmicklt_region_tracker.cc
+ libmv/tracking/pyramid_region_tracker.cc
+ libmv/tracking/retrack_region_tracker.cc
+ libmv/tracking/track_region.cc
+ libmv/tracking/trklt_region_tracker.cc
- third_party/glog/src/utilities.h
- third_party/glog/src/stacktrace_generic-inl.h
- third_party/glog/src/stacktrace.h
- third_party/glog/src/stacktrace_x86_64-inl.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/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
- )
+ third_party/fast/fast_10.c
+ third_party/fast/fast_11.c
+ third_party/fast/fast_12.c
+ third_party/fast/fast_9.c
+ third_party/fast/fast.c
+ third_party/fast/nonmax.c
+ third_party/gflags/gflags.cc
+ third_party/gflags/gflags_completions.cc
+ third_party/gflags/gflags_reporting.cc
- list(APPEND INC
- third_party/glog/src/windows
+ libmv/base/id_generator.h
+ libmv/base/scoped_ptr.h
+ libmv/base/vector.h
+ libmv/base/vector_utils.h
+ libmv/image/array_nd.h
+ libmv/image/convolve.h
+ libmv/image/correlation.h
+ libmv/image/image.h
+ libmv/image/sample.h
+ libmv/image/tuple.h
+ libmv/logging/logging.h
+ libmv/multiview/conditioning.h
+ libmv/multiview/euclidean_resection.h
+ libmv/multiview/fundamental.h
+ libmv/multiview/homography.h
+ libmv/multiview/homography_parameterization.h
+ libmv/multiview/nviewtriangulation.h
+ libmv/multiview/panography.h
+ libmv/multiview/projection.h
+ libmv/multiview/resection.h
+ libmv/multiview/triangulation.h
+ libmv/numeric/dogleg.h
+ libmv/numeric/function_derivative.h
+ libmv/numeric/levenberg_marquardt.h
+ libmv/numeric/numeric.h
+ libmv/numeric/poly.h
+ libmv/simple_pipeline/bundle.h
+ libmv/simple_pipeline/callbacks.h
+ libmv/simple_pipeline/camera_intrinsics.h
+ libmv/simple_pipeline/detect.h
+ libmv/simple_pipeline/initialize_reconstruction.h
+ libmv/simple_pipeline/intersect.h
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list