[Bf-blender-cvs] [cdbe20d] testbuild: Revert "Merge branch 'terrible_consequencer' into testbuild"
Antony Riakiotakis
noreply at git.blender.org
Fri Nov 14 04:32:30 CET 2014
Commit: cdbe20d13acd4cb9f2ea5d20d23c533f9f747773
Author: Antony Riakiotakis
Date: Fri Sep 26 17:57:07 2014 +0200
Branches: testbuild
https://developer.blender.org/rBcdbe20d13acd4cb9f2ea5d20d23c533f9f747773
Revert "Merge branch 'terrible_consequencer' into testbuild"
This reverts commit 18c6c0146627b006ff094e0eb0050f81cdf2a379, reversing
changes made to 5d9396c0a41873dff0fe438eaeb21744e13025c1.
===================================================================
M CMakeLists.txt
M build_files/build_environment/install_deps.sh
M build_files/buildbot/config/user-config-glibc211-i686.py
M build_files/buildbot/config/user-config-glibc211-x86_64.py
M build_files/buildbot/config/user-config-player-glibc211-i686.py
M build_files/buildbot/config/user-config-player-glibc211-x86_64.py
M doc/python_api/sphinx_doc_gen.sh
M extern/libmv/CMakeLists.txt
M extern/libmv/SConscript
M extern/libmv/bundle.sh
D extern/libmv/intern/camera_intrinsics.cc
D extern/libmv/intern/camera_intrinsics.h
D extern/libmv/intern/detector.cc
D extern/libmv/intern/detector.h
D extern/libmv/intern/homography.cc
D extern/libmv/intern/homography.h
D extern/libmv/intern/image.cc
D extern/libmv/intern/image.h
D extern/libmv/intern/logging.cc
D extern/libmv/intern/logging.h
D extern/libmv/intern/reconstruction.cc
D extern/libmv/intern/reconstruction.h
D extern/libmv/intern/region.h
D extern/libmv/intern/stub.cc
D extern/libmv/intern/track_region.cc
D extern/libmv/intern/track_region.h
D extern/libmv/intern/tracks.cc
D extern/libmv/intern/tracks.h
D extern/libmv/intern/utildefines.h
A extern/libmv/libmv-capi.cc
M extern/libmv/libmv-capi.h
A extern/libmv/libmv-capi_intern.h
A extern/libmv/libmv-capi_stub.cc
A extern/libmv/libmv-util.cc
A extern/libmv/libmv-util.h
M extern/libmv/third_party/ceres/CMakeLists.txt
M extern/libmv/third_party/ceres/ChangeLog
M extern/libmv/third_party/ceres/SConscript
M extern/libmv/third_party/ceres/bundle.sh
M extern/libmv/third_party/ceres/files.txt
M extern/libmv/third_party/ceres/include/ceres/c_api.h
M extern/libmv/third_party/ceres/include/ceres/ceres.h
M extern/libmv/third_party/ceres/include/ceres/conditioned_cost_function.h
M extern/libmv/third_party/ceres/include/ceres/cost_function.h
M extern/libmv/third_party/ceres/include/ceres/cost_function_to_functor.h
M extern/libmv/third_party/ceres/include/ceres/covariance.h
M extern/libmv/third_party/ceres/include/ceres/crs_matrix.h
D extern/libmv/third_party/ceres/include/ceres/gradient_problem.h
D extern/libmv/third_party/ceres/include/ceres/gradient_problem_solver.h
D extern/libmv/third_party/ceres/include/ceres/internal/disable_warnings.h
M extern/libmv/third_party/ceres/include/ceres/internal/numeric_diff.h
D extern/libmv/third_party/ceres/include/ceres/internal/reenable_warnings.h
M extern/libmv/third_party/ceres/include/ceres/iteration_callback.h
M extern/libmv/third_party/ceres/include/ceres/jet.h
M extern/libmv/third_party/ceres/include/ceres/local_parameterization.h
M extern/libmv/third_party/ceres/include/ceres/loss_function.h
M extern/libmv/third_party/ceres/include/ceres/normal_prior.h
A extern/libmv/third_party/ceres/include/ceres/numeric_diff_functor.h
M extern/libmv/third_party/ceres/include/ceres/ordered_groups.h
M extern/libmv/third_party/ceres/include/ceres/problem.h
M extern/libmv/third_party/ceres/include/ceres/solver.h
M extern/libmv/third_party/ceres/include/ceres/types.h
D extern/libmv/third_party/ceres/include/ceres/version.h
A extern/libmv/third_party/ceres/internal/ceres/CMakeLists.txt
M extern/libmv/third_party/ceres/internal/ceres/array_utils.cc
M extern/libmv/third_party/ceres/internal/ceres/array_utils.h
D extern/libmv/third_party/ceres/internal/ceres/callbacks.cc
D extern/libmv/third_party/ceres/internal/ceres/callbacks.h
M extern/libmv/third_party/ceres/internal/ceres/canonical_views_clustering.cc
M extern/libmv/third_party/ceres/internal/ceres/canonical_views_clustering.h
M extern/libmv/third_party/ceres/internal/ceres/conjugate_gradients_solver.cc
M extern/libmv/third_party/ceres/internal/ceres/coordinate_descent_minimizer.cc
M extern/libmv/third_party/ceres/internal/ceres/coordinate_descent_minimizer.h
M extern/libmv/third_party/ceres/internal/ceres/covariance_impl.cc
M extern/libmv/third_party/ceres/internal/ceres/covariance_impl.h
M extern/libmv/third_party/ceres/internal/ceres/cxsparse.h
M extern/libmv/third_party/ceres/internal/ceres/dynamic_compressed_row_jacobian_writer.cc
M extern/libmv/third_party/ceres/internal/ceres/gradient_checking_cost_function.cc
D extern/libmv/third_party/ceres/internal/ceres/gradient_problem.cc
D extern/libmv/third_party/ceres/internal/ceres/gradient_problem_evaluator.h
D extern/libmv/third_party/ceres/internal/ceres/gradient_problem_solver.cc
M extern/libmv/third_party/ceres/internal/ceres/graph.h
M extern/libmv/third_party/ceres/internal/ceres/graph_algorithms.h
M extern/libmv/third_party/ceres/internal/ceres/iterative_schur_complement_solver.cc
M extern/libmv/third_party/ceres/internal/ceres/line_search_direction.cc
M extern/libmv/third_party/ceres/internal/ceres/line_search_minimizer.cc
D extern/libmv/third_party/ceres/internal/ceres/line_search_preprocessor.cc
D extern/libmv/third_party/ceres/internal/ceres/line_search_preprocessor.h
M extern/libmv/third_party/ceres/internal/ceres/linear_solver.cc
M extern/libmv/third_party/ceres/internal/ceres/linear_solver.h
M extern/libmv/third_party/ceres/internal/ceres/local_parameterization.cc
M extern/libmv/third_party/ceres/internal/ceres/loss_function.cc
M extern/libmv/third_party/ceres/internal/ceres/minimizer.cc
M extern/libmv/third_party/ceres/internal/ceres/minimizer.h
M extern/libmv/third_party/ceres/internal/ceres/parameter_block_ordering.cc
M extern/libmv/third_party/ceres/internal/ceres/parameter_block_ordering.h
M extern/libmv/third_party/ceres/internal/ceres/preconditioner.cc
M extern/libmv/third_party/ceres/internal/ceres/preconditioner.h
D extern/libmv/third_party/ceres/internal/ceres/preprocessor.cc
D extern/libmv/third_party/ceres/internal/ceres/preprocessor.h
M extern/libmv/third_party/ceres/internal/ceres/problem.cc
M extern/libmv/third_party/ceres/internal/ceres/problem_impl.cc
M extern/libmv/third_party/ceres/internal/ceres/problem_impl.h
M extern/libmv/third_party/ceres/internal/ceres/program.cc
M extern/libmv/third_party/ceres/internal/ceres/program.h
D extern/libmv/third_party/ceres/internal/ceres/reorder_program.cc
D extern/libmv/third_party/ceres/internal/ceres/reorder_program.h
M extern/libmv/third_party/ceres/internal/ceres/schur_complement_solver.cc
M extern/libmv/third_party/ceres/internal/ceres/schur_complement_solver.h
M extern/libmv/third_party/ceres/internal/ceres/single_linkage_clustering.cc
M extern/libmv/third_party/ceres/internal/ceres/single_linkage_clustering.h
M extern/libmv/third_party/ceres/internal/ceres/small_blas.h
M extern/libmv/third_party/ceres/internal/ceres/solver.cc
A extern/libmv/third_party/ceres/internal/ceres/solver_impl.cc
A extern/libmv/third_party/ceres/internal/ceres/solver_impl.h
D extern/libmv/third_party/ceres/internal/ceres/solver_utils.cc
D extern/libmv/third_party/ceres/internal/ceres/solver_utils.h
M extern/libmv/third_party/ceres/internal/ceres/sparse_normal_cholesky_solver.cc
M extern/libmv/third_party/ceres/internal/ceres/sparse_normal_cholesky_solver.h
M extern/libmv/third_party/ceres/internal/ceres/suitesparse.h
M extern/libmv/third_party/ceres/internal/ceres/trust_region_minimizer.cc
D extern/libmv/third_party/ceres/internal/ceres/trust_region_preprocessor.cc
D extern/libmv/third_party/ceres/internal/ceres/trust_region_preprocessor.h
M extern/libmv/third_party/ceres/internal/ceres/types.cc
M extern/libmv/third_party/ceres/internal/ceres/visibility.cc
M extern/libmv/third_party/ceres/internal/ceres/visibility.h
M extern/libmv/third_party/ceres/internal/ceres/visibility_based_preconditioner.cc
M extern/libmv/third_party/ceres/internal/ceres/visibility_based_preconditioner.h
M intern/atomic/atomic_ops.h
M intern/audaspace/intern/AUD_C-API.cpp
M intern/audaspace/intern/AUD_C-API.h
M intern/cycles/CMakeLists.txt
M intern/cycles/app/io_export_cycles_xml.py
M intern/cycles/blender/CCL_api.h
M intern/cycles/blender/CMakeLists.txt
M intern/cycles/blender/addon/properties.py
M intern/cycles/blender/addon/version_update.py
M intern/cycles/blender/blender_camera.cpp
D intern/cycles/blender/blender_logging.cpp
M intern/cycles/blender/blender_shader.cpp
M intern/cycles/kernel/geom/geom_bvh.h
M intern/cycles/kernel/geom/geom_bvh_shadow.h
M intern/cycles/kernel/geom/geom_motion_triangle.h
M intern/cycles/kernel/geom/geom_triangle.h
M intern/cycles/kernel/kernel.cu
M intern/cycles/kernel/kernel_bake.h
M intern/cycles/kernel/kernel_path.h
M intern/cycles/kernel/kernel_path_state.h
M intern/cycles/kernel/kernel_shader.h
M intern/cycles/kernel/kernel_shadow.h
M intern/cycles/kernel/kernel_textures.h
M intern/cycles/kernel/kernel_types.h
M intern/cycles/kernel/kernel_volume.h
M intern/cycles/kernel/osl/osl_services.cpp
M intern/cycles/render/camera.cpp
M intern/cycles/render/camera.h
M intern/cycles/render/graph.cpp
M intern/cycles/render/graph.h
M intern/cycles/render/mesh.cpp
M intern/cycles/render/mesh.h
M intern/cycles/render/scene.cpp
M intern/cycles/render/scene.h
M intern/cycles/util/CMakeLists.txt
M intern/cycles/util/util_boundbox.h
D intern/cycles/util/util_logging.cpp
D intern/cycles/util/util_logging.h
M intern/cycles/util/util_types.h
M intern/ghost/intern/GHOST_SystemCocoa.mm
M intern/guardedalloc/intern/mallocn.c
M intern/guardedalloc/intern/mallocn_intern.h
M intern/guardedalloc/intern/mallocn_lockfree_impl.c
M intern/opennl/extern/ONL_opennl.h
M intern/opennl/intern/opennl.c
M intern/opennl/superlu/scolumn_bmod.c
M intern/opennl/superlu/scopy_to_ucol.c
M intern/opennl/superlu/sgssv.c
M intern/opennl/superlu/sgstrf.c
M intern/opennl/superlu/sgstrs.c
M intern/opennl/superlu/smemory.c
M intern/opennl/superlu/smyblas2.c
M intern/opennl/superlu/spanel_bmod.c
M intern/opennl/superlu/spanel_dfs.c
M intern/opennl/superlu/spivotL.c
M intern/opennl/superlu/spruneL.c
M intern/opennl/superlu/ssnode_bmod.c
M intern/opennl/superlu/ssp_blas2.c
M intern/opennl/superlu/ssp_blas3.c
M intern/opennl/superlu/ssp_defs.h
M intern/opennl/superlu/strsv.c
M intern/opennl/superlu/sutil.c
M intern/opennl/superlu/util.c
M intern/opennl/superlu/util.h
M release/datafiles/locale
M release/datafiles/splash.png
M release/datafiles/splash_2x.png
M release/scripts/addons
M release/scripts/addons_contrib
M release/scripts/freestyle/modules/freestyle/chainingiterators.py
M release/scripts/freestyle/modules/freestyle/functions.py
M release/scripts/freestyle/modules/freestyle/shaders.py
M release/scripts/modules/bpy_extras/view3d_utils.py
M release/scripts/startup/bl_operators/clip.py
M release/scripts/startup/bl_operators/object_quick_effects.py
M release/scripts/startup/bl_ui/properties_paint_common.py
M release/scripts/startup/bl_ui/space_image.py
M release/scripts/startup/bl_ui/space_node.py
M release/scripts/startup/bl_ui/space_sequencer.py
M release/scripts/startup/bl_ui/space_view3d.py
M release/scripts/startup/bl_ui/space_view3d_toolbar.py
M release/scripts/templates_py/batch_export.py
M release/scripts/templates_py/operator_modal_view3d_raycast.py
M scons
M source/blender/blenkernel/BKE_blender.h
M source/blender/blenkernel/BKE_customdata.h
M source/blender/blenkernel/BKE_library.h
M source/blender/blenkernel/BKE_paint.h
M source/blender/blenkernel/BKE_scene.h
M source/blender/blenkernel/BKE_sequencer.h
M source/blender/blenkernel/BKE_sound.h
M source/blender/blenkernel/intern/DerivedMesh.c
M source/blender/blenkernel/intern/armature.c
M source/blender/blenkernel/intern/camera.c
M source/blender/blenkernel/intern/cdderivedmesh.c
M source/blender/blenkernel/intern/cloth.c
M source/blender/blenkernel/intern/collision.c
M source/blender/blenkernel/intern/colortools.c
M source/blender/blenkernel/intern/constraint.c
M source/blender/blenkernel/intern/curve.c
M source/blender/blenkernel/intern/customdata.c
M source/blender/blenkernel/intern/effect.c
M source/blender/blenkernel/intern/image.c
M source/blender/blenkernel/intern/implicit.c
M source/blender/blenkernel/intern/library.c
M source/blender/blenkernel/intern/mask.c
M source/blender/blenkernel/intern/movieclip.c
M source/blender/blenkernel/intern/node.c
M source/blender/blenkernel/intern/object.c
M source/blender/blenkernel/intern/paint.c
M source/blender/blenkernel/intern/particle.c
M source/blender/blenkernel/intern/particle_system.c
M source/blender/blenkernel/intern/scene.c
M source/blender/blenkernel/intern/seqcache.c
M source/blender/blenkernel/intern/seqeffects.c
M source/blender/blenkernel/intern/sequencer.c
M source/blender/blenkernel/intern/sound.c
M source/blender/blenkernel/intern/tracking.c
M source/blender/blenkernel/intern/treehash.c
D source/blender/blenlib/BLI_compiler_typecheck.h
M source/blender/blenlib/BLI_ghash.h
M source/blender/blenlib/BLI_kdopbvh.h
M source/blender/blenlib/BLI_listbase.h
M source/blender/blenlib/BLI_utildefines.h
M source/blender/blenlib/CMakeLists.txt
M source/blender/blenlib/intern/BLI_args.c
M source/blender/blenlib/intern/BLI_ghash.c
M source/blender/blenlib/intern/BLI_kdopbvh.c
M source/blender/blenlib/intern/listbase.c
M source/blender/blenlib/intern/math_geom.c
M source/blender/blenlib/intern/math_rotation.c
M source/blender/blenlib/intern/path_util.c
M source/blender/blenlib/intern/scanfill_utils.c
M source/blender/blenloader/intern/readblenentry.c
M source/blender/blenloader/intern/readfile.c
M source/blender/blenloader/intern/readfile.h
M source/blender/blenloader/intern/versioning_270.c
M source/blender/blenloader/intern/writefile.c
M source/blender/bmesh/intern/bmesh_construct.c
M source/blender/bmesh/intern/bmesh_interp.c
M source/blender/bmesh/intern/bmesh_iterators.c
M source/blender/bmesh/intern/bmesh_iterators.h
M source/blender/bmesh/intern/bmesh_iterators_inline.h
M source/blender/bmesh/intern/bmesh_marking.c
M source/blender/bmesh/intern/bmesh_structure.c
M source/blender/bmesh/intern/bmesh_structure.h
M source/blender/compositor/operations/COM_MapUVOperation.cpp
M source/blender/compositor/operations/COM_SunBeamsOperation.cpp
M source/blender/editors/armature/armature_intern.h
M source/blender/editors/armature/armature_relations.c
M source/blender/editors/armature/armature_select.c
M source/blender/editors/armature/editarmature_sketch.c
M source/blender/editors/armature/pose_select.c
M source/blender/editors/curve/editfont.c
M source/blender/editors/include/ED_armature.h
M source/blender/editors/include/UI_interface.h
M source/blender/editors/include/UI_view2d.h
M source/blender/editors/interface/interface_handlers.c
M source/blender/editors/interface/interface_intern.h
M source/blender/editors/interface/interface_layout.c
M source/blender/editors/interface/interface_templates.c
M source/blender/editors/interface/interface_widgets.c
M source/blender/editors/interface/view2d.c
M source/blender/editors/mesh/meshtools.c
M source/blender/editors/object/object_bake.c
M source/blender/editors/object/object_bake_api.c
M source/blender/editors/object/object_vgroup.c
M source/blender/editors/physics/particle_edit.c
M source/blender/editors/physics/physics_fluid.c
M source/blender/editors/screen/screen_ops.c
M source/blender/editors/sculpt_paint/paint_image.c
M source/blender/editors/sculpt_paint/paint_image_2d.c
M source/blender/editors/sculpt_paint/paint_image_proj.c
M source/blender/editors/sculpt_paint/paint_ops.c
M source/blender/editors/sculpt_paint/paint_stroke.c
M source/blender/editors/sculpt_paint/sculpt.c
M source/blender/editors/sculpt_paint/sculpt_uv.c
M source/blender/editors/space_image/image_ops.c
M source/blender/editors/space_node/node_relationships.c
M source/blender/editors/space_node/node_select.c
M source/blender/editors/space_sequencer/CMakeLists.txt
M source/blender/editors/space_sequencer/sequencer_draw.c
M source/blender/editors/space_sequencer/sequencer_edit.c
M source/blender/editors/space_sequencer/sequencer_intern.h
M source/blender/editors/space_sequencer/sequencer_ops.c
D source/blender/editors/space_sequencer/sequencer_preview.c
M source/blender/editors/space_sequencer/space_sequencer.c
M source/blender/editors/space_text/text_draw.c
M source/blender/editors/space_time/space_time.c
M source/blender/editors/space_view3d/drawobject.c
M source/blender/editors/space_view3d/view3d_draw.c
M source/blender/editors/space_view3d/view3d_edit.c
M source/blender/editors/space_view3d/view3d_select.c
M source/blender/editors/space_view3d/view3d_walk.c
M source/blender/editors/transform/transform_conversions.c
M source/blender/editors/transform/transform_snap.c
M source/blender/editors/uvedit/uvedit_parametrizer.c
M source/blender/editors/uvedit/uvedit_smart_stitch.c
M source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp
M source/blender/freestyle/intern/python/BPy_Interface0D.cpp
M source/blender/freestyle/intern/python/BPy_Operators.cpp
M source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp
M source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_FalseBP1D.cpp
M source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_Length2DBP1D.cpp
M source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_SameShapeIdBP1D.cpp
M source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_TrueBP1D.cpp
M source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_ViewMapGradientNormBP1D.cpp
M source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp
M source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.cpp
M source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.cpp
M source/blender/freestyle/intern/python/StrokeShader/BPy_BackboneStretcherShader.cpp
M source/blender/freestyle/intern/python/StrokeShader/BPy_BezierCurveShader.cpp
M source/blender/freestyle/intern/python/StrokeShader/BPy_BlenderTextureShader.cpp
M source/blender/freestyle/intern/python/StrokeShader/BPy_CalligraphicShader.cpp
M source/blender/freestyle/intern/python/StrokeShader/BPy_ColorNoiseShader.cpp
M source/blender/freestyle/intern/python/StrokeShader/BPy_ColorVariationPatternShader.cpp
M source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantColorShader.cpp
M source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantThicknessShader.cpp
M source/blender/freestyle/intern/python/StrokeShader/BPy_ConstrainedIncreasingThicknessShader.cpp
M source/blender/freestyle/intern/python/StrokeShader/BPy_GuidingLinesShader.cpp
M source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingColorShader.cpp
M source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingThicknessShader.cpp
M source/blender/freestyle/intern/python/StrokeShader/BPy_PolygonalizationShader.cpp
M source/blender/freestyle/intern/python/StrokeShader/BPy_SamplingShader.cpp
M source/blender/freestyle/intern/python/StrokeShader/BPy_SmoothingShader.cpp
M source/blender/freestyle/intern/python/StrokeShader/BPy_SpatialNoiseShader.cpp
M source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureShader.cpp
M source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureStepShader.cpp
M source/blender/freestyle/intern/python/StrokeShader/BPy_TextureAssignerShader.cpp
M source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessNoiseShader.cpp
M source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessVariationPatternShader.cpp
M source/blender/freestyle/intern/python/StrokeShader/BPy_TipRemoverShader.cpp
M source/blender/freestyle/intern/python/StrokeShader/BPy_fstreamShader.cpp
M source/blender/freestyle/intern/python/StrokeShader/BPy_streamShader.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/BPy_ShapeIdF0D.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/BPy_CurveNatureF0D.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_Normal2DF0D.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_VertexOrientation2DF0D.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/BPy_VertexOrientation3DF0D.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetOccludeeF0D.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetShapeF0D.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_Curvature2DAngleF0D.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_DensityF0D.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedXF0D.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedYF0D.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedZF0D.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetXF0D.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetYF0D.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetZF0D.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_LocalAverageDepthF0D.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_ZDiscontinuityF0D.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetCurvilinearAbscissaF0D.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetParameterF0D.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetViewMapGradientNormF0D.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadCompleteViewMapPixelF0D.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadMapPixelF0D.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadSteerableViewMapPixelF0D.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/BPy_QuantitativeInvisibilityF0D.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/BPy_GetOccludersF0D.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/BPy_CurveNatureF1D.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Normal2DF1D.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Orientation2DF1D.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/BPy_Orientation3DF1D.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_Curvature2DAngleF1D.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_DensityF1D.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetCompleteViewMapDensityF1D.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetDirectionalViewMapDensityF1D.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedXF1D.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedYF1D.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedZF1D.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetSteerableViewMapDensityF1D.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetViewMapGradientNormF1D.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetXF1D.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetYF1D.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetZF1D.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_LocalAverageDepthF1D.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_ZDiscontinuityF1D.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned_int/BPy_QuantitativeInvisibilityF1D.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludeeF1D.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludersF1D.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetShapeF1D.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_ChainingTimeStampF1D.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_IncrementChainingTimeStampF1D.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_TimeStampF1D.cpp
M source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_FalseUP0D.cpp
M source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_TrueUP0D.cpp
M source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ContourUP1D.cpp
M source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_DensityLowerThanUP1D.cpp
M source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.cpp
M source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToTimeStampUP1D.cpp
M source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ExternalContourUP1D.cpp
M source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_FalseUP1D.cpp
M source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.cpp
M source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ShapeUP1D.cpp
M source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_TrueUP1D.cpp
M source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_WithinImageBoundaryUP1D.cpp
M source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp
M source/blender/gpu/intern/gpu_select.c
M source/blender/ikplugin/intern/itasc_plugin.cpp
M source/blender/imbuf/intern/cache.c
M source/blender/imbuf/intern/colormanagement.c
M source/blender/imbuf/intern/moviecache.c
M source/blender/makesdna/DNA_ID.h
M source/blender/makesdna/DNA_brush_types.h
M source/blender/makesdna/DNA_sequence_types.h
M source/blender/makesdna/DNA_sound_types.h
M source/blender/makesdna/DNA_space_types.h
M source/blender/makesrna/intern/rna_image_api.c
M source/blender/makesrna/intern/rna_material.c
M source/blender/makesrna/intern/rna_object.c
M source/blender/makesrna/intern/rna_sculpt_paint.c
M source/blender/makesrna/intern/rna_sequencer_api.c
M source/blender/makesrna/intern/rna_sound.c
M source/blender/makesrna/intern/rna_space.c
M source/blender/modifiers/CMakeLists.txt
M source/blender/modifiers/SConscript
M source/blender/modifiers/intern/MOD_array.c
M source/blender/modifiers/intern/MOD_skin.c
M source/blender/nodes/intern/node_exec.c
M source/blender/nodes/shader/nodes/node_shader_camera.c
M source/blender/nodes/shader/nodes/node_shader_math.c
M source/blender/nodes/shader/nodes/node_shader_vectMath.c
M source/blender/nodes/texture/nodes/node_texture_math.c
M source/blender/python/intern/bpy_app_translations.c
M source/blender/python/mathutils/mathutils_Quaternion.c
M source/blender/render/intern/raytrace/rayobject_octree.cpp
M source/blender/render/intern/source/convertblender.c
M source/blender/render/intern/source/initrender.c
M source/blender/render/intern/source/multires_bake.c
M source/blender/render/intern/source/pipeline.c
M source/blender/render/intern/source/pixelshading.c
M source/blender/render/intern/source/pointdensity.c
M source/blender/render/intern/source/rayshade.c
M source/blender/render/intern/source/render_texture.c
M source/blender/render/intern/source/rendercore.c
M source/blender/render/intern/source/renderdatabase.c
M source/blender/render/intern/source/shadbuf.c
M source/blender/render/intern/source/shadeoutput.c
M source/blender/render/intern/source/sss.c
M source/blender/render/intern/source/strand.c
M source/blender/render/intern/source/sunsky.c
M source/blender/render/intern/source/zbuf.c
M source/blender/windowmanager/WM_api.h
M source/blender/windowmanager/intern/wm_operators.c
M source/creator/CMakeLists.txt
M source/creator/creator.c
M source/creator/osx_locals.map
M source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
M source/gameengine/Ketsji/KX_Scene.cpp
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2cabeb6..1dd9721 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -280,7 +280,6 @@ option(WITH_CYCLES_CUDA_BINARIES "Build cycles CUDA binaries" OFF)
set(CYCLES_CUDA_BINARIES_ARCH sm_20 sm_21 sm_30 sm_35 sm_50 CACHE STRING "CUDA architectures to build binaries for")
mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH)
unset(PLATFORM_DEFAULT)
-option(WITH_CYCLES_LOGGING "Build cycles with logging support" OFF)
# LLVM
option(WITH_LLVM "Use LLVM" OFF)
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh
index f081f43..c1b2fd9 100755
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@ -25,12 +25,10 @@
ARGS=$( \
getopt \
-o s:i:t:h \
---long source:,install:,tmp:,info:,threads:,help,no-sudo,with-all,with-opencollada,\
-ver-ocio:,ver-oiio:,ver-llvm:,ver-osl:,\
+--long source:,install:,tmp:,threads:,help,no-sudo,with-all,with-opencollada,ver-ocio:,ver-oiio:,ver-llvm:,ver-osl:,\
force-all,force-python,force-numpy,force-boost,force-ocio,force-oiio,force-llvm,force-osl,force-opencollada,\
-force-ffmpeg,\
-skip-python,skip-numpy,skip-boost,skip-ocio,skip-oiio,skip-llvm,skip-osl,skip-ffmpeg,skip-opencollada,\
-required-numpy: \
+force-ffmpeg,skip-python,skip-numpy,skip-boost,skip-ocio,skip-oiio,skip-llvm,skip-osl,skip-ffmpeg,\
+skip-opencollada,required-numpy: \
-- "$@" \
)
@@ -40,7 +38,6 @@ SRC="$HOME/src/blender-deps"
INST="/opt/lib"
TMP="/tmp"
CWD=$PWD
-INFO_PATH = CWD
# Do not install some optional, potentially conflicting libs by default...
WITH_ALL=false
@@ -77,9 +74,6 @@ ARGUMENTS_INFO="\"COMMAND LINE ARGUMENTS:
--tmp=<path>
Use a specific temp path (defaults to '\$TMP').
- --info=<path>
- Use a specific info path (to store BUILD_NOTES.txt, defaults to '\$INFO_PATH').
-
-t n, --threads=n
Use a specific number of threads when building the libraries (auto-detected as '\$THREADS').
@@ -326,9 +320,6 @@ while true; do
--tmp)
TMP="$2"; shift; shift; continue
;;
- --info)
- INFO_PATH="$2"; shift; shift; continue
- ;;
-t|--threads)
THREADS="$2"; shift; shift; continue
;;
@@ -3107,9 +3098,9 @@ else
exit 1
fi
-print_info | tee $INFO_PATH/BUILD_NOTES.txt
+print_info | tee BUILD_NOTES.txt
PRINT ""
-PRINT "This information has been written to $INFO_PATH/BUILD_NOTES.txt"
+PRINT "This information has been written to BUILD_NOTES.txt"
PRINT ""
# Switch back to user language.
diff --git a/build_files/buildbot/config/user-config-glibc211-i686.py b/build_files/buildbot/config/user-config-glibc211-i686.py
index 0971735..d7a1439 100644
--- a/build_files/buildbot/config/user-config-glibc211-i686.py
+++ b/build_files/buildbot/config/user-config-glibc211-i686.py
@@ -49,7 +49,7 @@ BF_CXX_LIB_STATIC = '/usr/lib/gcc/i486-linux-gnu/4.7.1/libstdc++.a'
WITH_BF_OPENAL = True
WITH_BF_STATICOPENAL = True
BF_OPENAL = '/opt/lib/openal'
-BF_OPENAL_LIB_STATIC = '/opt/lib/openal/lib/libopenal.a /opt/lib/openal/lib/libcommon.a'
+BF_OPENAL_LIB_STATIC = '/opt/lib/openal/lib/libopenal.a'
WITH_BF_GETTEXT_STATIC = True
diff --git a/build_files/buildbot/config/user-config-glibc211-x86_64.py b/build_files/buildbot/config/user-config-glibc211-x86_64.py
index 748d100..f07c447 100644
--- a/build_files/buildbot/config/user-config-glibc211-x86_64.py
+++ b/build_files/buildbot/config/user-config-glibc211-x86_64.py
@@ -49,7 +49,7 @@ BF_CXX_LIB_STATIC = '/usr/lib/gcc/x86_64-linux-gnu/4.7.1/libstdc++.a'
WITH_BF_OPENAL = True
WITH_BF_STATICOPENAL = True
BF_OPENAL = '/opt/lib/openal'
-BF_OPENAL_LIB_STATIC = '/opt/lib/openal/lib/libopenal.a /opt/lib/openal/lib/libcommon.a'
+BF_OPENAL_LIB_STATIC = '/opt/lib/openal/lib/libopenal.a'
WITH_BF_GETTEXT_STATIC = True
diff --git a/build_files/buildbot/config/user-config-player-glibc211-i686.py b/build_files/buildbot/config/user-config-player-glibc211-i686.py
index 384da40..641dbe0 100644
--- a/build_files/buildbot/config/user-config-player-glibc211-i686.py
+++ b/build_files/buildbot/config/user-config-player-glibc211-i686.py
@@ -34,7 +34,7 @@ BF_CXX_LIB_STATIC = '/usr/lib/gcc/i486-linux-gnu/4.7.1/libstdc++.a'
WITH_BF_OPENAL = True
WITH_BF_STATICOPENAL = True
BF_OPENAL = '/opt/lib/openal'
-BF_OPENAL_LIB_STATIC = '/opt/lib/openal/lib/libopenal.a /opt/lib/openal/lib/libcommon.a'
+BF_OPENAL_LIB_STATIC = '/opt/lib/openal/lib/libopenal.a'
WITH_BF_GETTEXT_STATIC = True
diff --git a/build_files/buildbot/config/user-config-player-glibc211-x86_64.py b/build_files/buildbot/config/user-config-player-glibc211-x86_64.py
index 5176d59..8050326 100644
--- a/build_files/buildbot/config/user-config-player-glibc211-x86_64.py
+++ b/build_files/buildbot/config/user-config-player-glibc211-x86_64.py
@@ -34,7 +34,7 @@ BF_CXX_LIB_STATIC = '/usr/lib/gcc/x86_64-linux-gnu/4.7.1/libstdc++.a'
WITH_BF_OPENAL = True
WITH_BF_STATICOPENAL = True
BF_OPENAL = '/opt/lib/openal'
-BF_OPENAL_LIB_STATIC = '/opt/lib/openal/lib/libopenal.a /opt/lib/openal/lib/libcommon.a'
+BF_OPENAL_LIB_STATIC = '/opt/lib/openal/lib/libopenal.a'
WITH_BF_GETTEXT_STATIC = True
diff --git a/doc/python_api/sphinx_doc_gen.sh b/doc/python_api/sphinx_doc_gen.sh
index d7fc372..c8256a1 100755
--- a/doc/python_api/sphinx_doc_gen.sh
+++ b/doc/python_api/sphinx_doc_gen.sh
@@ -100,7 +100,7 @@ if $DO_UPLOAD ; then
cp $SPHINXBASE/sphinx-out/contents.html $SPHINXBASE/sphinx-out/index.html
ssh $SSH_USER at blender.org 'rm -rf '$SSH_UPLOAD_FULL'/*'
- rsync --progress -ave "ssh -p 22" $SPHINXBASE/sphinx-out/* $SSH_HOST:$SSH_UPLOAD_FULL/
+ rsync --progress -avze "ssh -p 22" $SPHINXBASE/sphinx-out/* $SSH_HOST:$SSH_UPLOAD_FULL/
## symlink the dir to a static URL
#ssh $SSH_USER at blender.org 'rm '$SSH_UPLOAD'/250PythonDoc && ln -s '$SSH_UPLOAD_FULL' '$SSH_UPLOAD'/250PythonDoc'
@@ -115,11 +115,11 @@ if $DO_UPLOAD ; then
if $DO_OUT_PDF ; then
# rename so local PDF has matching name.
- rsync --progress -ave "ssh -p 22" $SPHINXBASE/sphinx-out/blender_python_reference_$BLENDER_VERSION.pdf $SSH_HOST:$SSH_UPLOAD_FULL/blender_python_reference_$BLENDER_VERSION.pdf
+ rsync --progress -avze "ssh -p 22" $SPHINXBASE/sphinx-out/blender_python_reference_$BLENDER_VERSION.pdf $SSH_HOST:$SSH_UPLOAD_FULL/blender_python_reference_$BLENDER_VERSION.pdf
fi
if $DO_OUT_HTML_ZIP ; then
- rsync --progress -ave "ssh -p 22" $SPHINXBASE/blender_python_reference_$BLENDER_VERSION.zip $SSH_HOST:$SSH_UPLOAD_FULL/blender_python_reference_$BLENDER_VERSION.zip
+ rsync --progress -avze "ssh -p 22" $SPHINXBASE/blender_python_reference_$BLENDER_VERSION.zip $SSH_HOST:$SSH_UPLOAD_FULL/blender_python_reference_$BLENDER_VERSION.zip
fi
fi
diff --git a/extern/libmv/CMakeLists.txt b/extern/libmv/CMakeLists.txt
index 6a4a61e..9030ae9 100644
--- a/extern/libmv/CMakeLists.txt
+++ b/extern/libmv/CMakeLists.txt
@@ -35,10 +35,12 @@ set(INC_SYS
set(SRC
libmv-capi.h
+ libmv-capi_intern.h
)
if(WITH_LIBMV)
add_definitions(
+ -DWITH_LIBMV
-DWITH_LIBMV_GUARDED_ALLOC
-DGOOGLE_GLOG_DLL_DECL=
-DLIBMV_NO_FAST_DETECTOR=
@@ -71,14 +73,8 @@ if(WITH_LIBMV)
)
list(APPEND SRC
- intern/camera_intrinsics.cc
- intern/detector.cc
- intern/homography.cc
- intern/image.cc
- intern/logging.cc
- intern/reconstruction.cc
- intern/track_region.cc
- intern/tracks.cc
+ libmv-capi.cc
+ libmv-util.cc
libmv/base/aligned_malloc.cc
libmv/image/array_nd.cc
libmv/image/convolve.cc
@@ -113,15 +109,7 @@ if(WITH_LIBMV)
libmv/tracking/track_region.cc
libmv/tracking/trklt_region_tracker.cc
-
- intern/camera_intrinsics.h
- intern/detector.h
- intern/homography.h
- intern/image.h
- intern/logging.h
- intern/reconstruction.h
- intern/track_region.h
- intern/tracks.h
+ libmv-util.h
libmv/base/aligned_malloc.h
libmv/base/id_generator.h
libmv/base/scoped_ptr.h
@@ -229,7 +217,7 @@ if(WITH_LIBMV)
endif()
else()
list(APPEND SRC
- intern/stub.cc
+ libmv-capi_stub.cc
)
endif()
@@ -240,7 +228,7 @@ if(WITH_LIBMV)
endif()
# make GLog a separate target, so it can be used for gtest as well.
-if(WITH_LIBMV OR WITH_GTESTS OR WITH_CYCLES_LOGGING)
+if(WITH_LIBMV OR WITH_GTESTS)
# We compile GLog together with GFlag so we don't worry about
# adding extra lib to linker.
set(GLOG_SRC
diff --git a/extern/libmv/SConscript b/extern/libmv/SConscript
index 162fb88..6156dd4 100644
--- a/extern/libmv/SConscript
+++ b/extern/libmv/SConscript
@@ -24,11 +24,11 @@ if env['WITH_BF_LIBMV']:
defs.append('CERES_TR1_SHARED_PTR')
defs.append('GOOGLE_GLOG_DLL_DECL=')
+ defs.append('WITH_LIBMV')
defs.append('WITH_LIBMV_GUARDED_ALLOC')
defs.append('LIBMV_NO_FAST_DETECTOR')
- src = env.Glob('intern/*.cc')
- src.remove('intern' + os.sep + 'stub.cc')
+ src = env.Glob('*.cc')
src += env.Glob('libmv/base/*.cc')
src += env.Glob('libmv/image/*.cc')
src += env.Glob('libmv/multiview/*.cc')
@@ -52,7 +52,7 @@ if env['WITH_BF_LIBMV']:
src += env.Glob("third_party/glog/src/*.cc")
incs += ' ./third_party/glog/src'
else:
- src = env.Glob("intern/stub.cc")
+ src = env.Glob("libmv-capi_stub.cc")
src = [src for src in src if src.find('_test.cc') == -1]
diff --git a/extern/libmv/bundle.sh b/extern/libmv/bundle.sh
index f37ab1f..0560ab0 100755
--- a/extern/libmv/bundle.sh
+++ b/extern/libmv/bundle.sh
@@ -7,7 +7,7 @@ else
exit 1
fi
-BRANCH="master"
+BRANCH="devel"
repo="git://git.blender.org/libmv.git"
tmp=`mktemp -d`
@@ -128,10 +128,12 @@ set(INC_SYS
set(SRC
libmv-capi.h
+ libmv-capi_intern.h
)
if(WITH_LIBMV)
add_definitions(
+ -DWITH_LIBMV
-DWITH_LIBMV_GUARDED_ALLOC
-DGOOGLE_GLOG_DLL_DECL=
-DLIBMV_NO_FAST_DETECTOR=
@@ -164,29 +166,11 @@ if(WITH_LIBMV)
)
list(APPEND SRC
- intern/camera_intrinsics.cc
- intern/detector.cc
- intern/frame_accessor.cc
- intern/homography.cc
- intern/image.cc
- intern/logging.cc
- intern/reconstruction.cc
- intern/track_region.cc
- intern/tracks.cc
- intern/tracksN.cc
+ libmv-capi.cc
+ libmv-util.cc
${sources}
${third_sources}
-
- intern/camera_intrinsics.h
- intern/detector.h
- intern/frame_accessor.h
- intern
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list