Revision: 59852
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59852
Author: gdh
Date: 2013-09-05 18:58:29 +0000 (Thu, 05 Sep 2013)
Log Message:
-----------
Merged trunk into branch. Includes r59807 to r59851.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59807
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59851
Modified Paths:
--------------
branches/soc-2013-cycles_mblur/build_files/scons/config/freebsd8-config.py
branches/soc-2013-cycles_mblur/build_files/scons/config/freebsd9-config.py
branches/soc-2013-cycles_mblur/build_files/scons/config/linux-config.py
branches/soc-2013-cycles_mblur/build_files/scons/tools/btools.py
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/CMakeLists.txt
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/ChangeLog
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/SConscript
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/bundle.sh
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/files.txt
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/include/ceres/autodiff_cost_function.h
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/include/ceres/autodiff_local_parameterization.h
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/include/ceres/ceres.h
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/include/ceres/cost_function.h
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/include/ceres/dynamic_autodiff_cost_function.h
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/include/ceres/internal/autodiff.h
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/include/ceres/internal/fixed_array.h
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/include/ceres/internal/variadic_evaluate.h
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/include/ceres/iteration_callback.h
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/include/ceres/jet.h
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/include/ceres/loss_function.h
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/include/ceres/numeric_diff_cost_function.h
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/include/ceres/problem.h
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/include/ceres/sized_cost_function.h
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/include/ceres/solver.h
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/include/ceres/types.h
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/blas.h
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/block_jacobi_preconditioner.cc
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/block_jacobi_preconditioner.h
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/block_random_access_sparse_matrix.h
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/block_sparse_matrix.cc
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/block_sparse_matrix.h
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/block_structure.cc
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/cgnr_solver.cc
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/cgnr_solver.h
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/compressed_row_sparse_matrix.cc
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/compressed_row_sparse_matrix.h
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/coordinate_descent_minimizer.h
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/corrector.cc
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/corrector.h
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/cxsparse.cc
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/cxsparse.h
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/dense_normal_cholesky_solver.cc
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/dense_normal_cholesky_solver.h
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/dense_qr_solver.cc
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/dense_qr_solver.h
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/dense_sparse_matrix.cc
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/dense_sparse_matrix.h
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/dogleg_strategy.cc
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/dogleg_strategy.h
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/graph_algorithms.h
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/implicit_schur_complement.cc
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/implicit_schur_complement.h
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/iterative_schur_complement_solver.cc
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/iterative_schur_complement_solver.h
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/levenberg_marquardt_strategy.cc
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/line_search.cc
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/line_search.h
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/line_search_direction.cc
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/line_search_direction.h
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/line_search_minimizer.cc
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/linear_least_squares_problems.cc
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/linear_least_squares_problems.h
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/linear_solver.h
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/low_rank_inverse_hessian.cc
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/low_rank_inverse_hessian.h
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/minimizer.h
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/parameter_block.h
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/parameter_block_ordering.cc
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/parameter_block_ordering.h
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/partitioned_matrix_view.cc
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/partitioned_matrix_view.h
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/preconditioner.cc
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/preconditioner.h
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/problem.cc
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/problem_impl.cc
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/problem_impl.h
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/program_evaluator.h
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/residual_block.cc
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/schur_complement_solver.cc
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/schur_complement_solver.h
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/schur_eliminator.h
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/schur_eliminator_impl.h
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/schur_jacobi_preconditioner.cc
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/schur_jacobi_preconditioner.h
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/solver.cc
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/solver_impl.cc
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/solver_impl.h
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/sparse_matrix.h
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/sparse_normal_cholesky_solver.cc
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/sparse_normal_cholesky_solver.h
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/split.h
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/suitesparse.cc
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/suitesparse.h
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/triplet_sparse_matrix.cc
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/triplet_sparse_matrix.h
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/trust_region_minimizer.cc
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/trust_region_strategy.h
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/types.cc
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/visibility.cc
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/visibility_based_preconditioner.cc
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/visibility_based_preconditioner.h
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/wall_time.cc
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/wall_time.h
branches/soc-2013-cycles_mblur/intern/ghost/SConscript
branches/soc-2013-cycles_mblur/intern/ghost/intern/GHOST_WindowSDL.cpp
branches/soc-2013-cycles_mblur/intern/ghost/test/CMakeLists.txt
branches/soc-2013-cycles_mblur/intern/guardedalloc/test/simpletest/memtest.c
branches/soc-2013-cycles_mblur/release/scripts/startup/bl_operators/node.py
branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/properties_paint_common.py
branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_blender.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_brush.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_tracking.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/bpath.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/brush.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/idprop.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/sca.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/scene.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/sequencer.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/tracking.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_kdopbvh.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_listbase.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_math_base.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/listbase.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/math_base_inline.c
branches/soc-2013-cycles_mblur/source/blender/blenloader/intern/readfile.c
branches/soc-2013-cycles_mblur/source/blender/blenloader/intern/writefile.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_bridge.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_subdivide_edgering.c
branches/soc-2013-cycles_mblur/source/blender/collada/CameraExporter.cpp
branches/soc-2013-cycles_mblur/source/blender/collada/CameraExporter.h
branches/soc-2013-cycles_mblur/source/blender/collada/DocumentImporter.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/CMakeLists.txt
branches/soc-2013-cycles_mblur/source/blender/compositor/intern/COM_Converter.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/intern/COM_MemoryBuffer.h
branches/soc-2013-cycles_mblur/source/blender/compositor/nodes/COM_AlphaOverNode.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/nodes/COM_ChannelMatteNode.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/nodes/COM_ChromaMatteNode.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/nodes/COM_ColorBalanceNode.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/nodes/COM_ColorMatteNode.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/nodes/COM_ColorRampNode.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/nodes/COM_ColorToBWNode.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/nodes/COM_CombineHSVANode.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/nodes/COM_CombineRGBANode.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/nodes/COM_CombineYCCANode.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/nodes/COM_CombineYUVANode.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/nodes/COM_ConvertAlphaNode.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/nodes/COM_DistanceMatteNode.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/nodes/COM_FilterNode.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/nodes/COM_GlareNode.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/nodes/COM_HueSaturationValueNode.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/nodes/COM_ImageNode.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/nodes/COM_KeyingNode.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/nodes/COM_LuminanceMatteNode.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/nodes/COM_MixNode.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/nodes/COM_RenderLayersNode.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/nodes/COM_RenderLayersNode.h
branches/soc-2013-cycles_mblur/source/blender/compositor/nodes/COM_SeparateHSVANode.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/nodes/COM_SeparateRGBANode.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/nodes/COM_SeparateYCCANode.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/nodes/COM_SeparateYUVANode.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/nodes/COM_TranslateNode.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/nodes/COM_ZCombineNode.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_AlphaOverKeyOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_AlphaOverMixedOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_ChangeHSVOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_ChannelMatteOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_ChromaMatteOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_ColorMatteOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_DifferenceMatteOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_DistanceRGBMatteOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_DistanceYCCMatteOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_GlareGhostOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_GlareStreaksOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_ImageOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_LuminanceMatteOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_OutputFileOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_ReadBufferOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_ReadBufferOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_ViewerOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_WrapOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_WrapOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_ZCombineOperation.h
branches/soc-2013-cycles_mblur/source/blender/editors/animation/anim_channels_defines.c
branches/soc-2013-cycles_mblur/source/blender/editors/include/ED_clip.h
branches/soc-2013-cycles_mblur/source/blender/editors/include/UI_resources.h
branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface.c
branches/soc-2013-cycles_mblur/source/blender/editors/interface/resources.c
branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2013-cycles_mblur/source/blender/editors/object/object_transform.c
branches/soc-2013-cycles_mblur/source/blender/editors/render/render_internal.c
branches/soc-2013-cycles_mblur/source/blender/editors/render/render_opengl.c
branches/soc-2013-cycles_mblur/source/blender/editors/screen/glutil.c
branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/paint_image_proj.c
branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_clip/clip_buttons.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_clip/clip_draw.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_clip/clip_editor.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_clip/clip_graph_draw.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_clip/clip_graph_ops.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_clip/clip_ops.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_clip/clip_utils.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_clip/space_clip.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_clip/tracking_select.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_image/image_ops.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_logic/logic_window.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_node/drawnode.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_node/node_add.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_node/node_draw.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_node/node_edit.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_node/node_intern.h
branches/soc-2013-cycles_mblur/source/blender/editors/space_node/node_relationships.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_node/node_select.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_node/space_node.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2013-cycles_mblur/source/blender/editors/uvedit/uvedit_draw.c
branches/soc-2013-cycles_mblur/source/blender/gpu/shaders/gpu_shader_material.glsl
branches/soc-2013-cycles_mblur/source/blender/imbuf/IMB_colormanagement.h
branches/soc-2013-cycles_mblur/source/blender/imbuf/intern/IMB_colormanagement_intern.h
branches/soc-2013-cycles_mblur/source/blender/imbuf/intern/colormanagement.c
branches/soc-2013-cycles_mblur/source/blender/imbuf/intern/divers.c
branches/soc-2013-cycles_mblur/source/blender/makesdna/DNA_meshdata_types.h
branches/soc-2013-cycles_mblur/source/blender/makesdna/DNA_sensor_types.h
branches/soc-2013-cycles_mblur/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2013-cycles_mblur/source/blender/makesrna/RNA_access.h
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_image_api.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_sensor.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_space.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2013-cycles_mblur/source/blender/python/bmesh/bmesh_py_types.c
branches/soc-2013-cycles_mblur/source/blender/render/intern/source/pipeline.c
branches/soc-2013-cycles_mblur/source/blender/render/intern/source/render_result.c
branches/soc-2013-cycles_mblur/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2013-cycles_mblur/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2013-cycles_mblur/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/soc-2013-cycles_mblur/source/gameengine/Converter/KX_ConvertActuators.h
branches/soc-2013-cycles_mblur/source/gameengine/Converter/KX_ConvertSensors.cpp
Added Paths:
-----------
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/include/ceres/c_api.h
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/include/ceres/covariance.h
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/blas.cc
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/block_random_access_crs_matrix.cc
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/block_random_access_crs_matrix.h
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/c_api.cc
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/compressed_col_sparse_matrix_utils.cc
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/compressed_col_sparse_matrix_utils.h
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/covariance.cc
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/covariance_impl.cc
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/covariance_impl.h
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/incomplete_lq_factorization.cc
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/incomplete_lq_factorization.h
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/lapack.cc
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/lapack.h
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/small_blas.h
branches/soc-2013-cycles_mblur/intern/ghost/test/multitest/stubs.c
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_ConvertOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_ConvertOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_MixOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_MixOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_RenderLayersProg.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_RenderLayersProg.h
Removed Paths:
-------------
branches/soc-2013-cycles_mblur/build_files/scons/config/freebsd7-config.py
branches/soc-2013-cycles_mblur/extern/libmv/third_party/ceres/internal/ceres/matrix_proto.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_CombineChannelsOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_CombineChannelsOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_ConvertColorToBWOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_ConvertColorToBWOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_ConvertColorToValueProg.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_ConvertColorToValueProg.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_ConvertPremulToStraightOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_ConvertPremulToStraightOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_ConvertRGBToYUVOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_ConvertRGBToYUVOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_ConvertStraightToPremulOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_ConvertStraightToPremulOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_ConvertValueToColorProg.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_ConvertValueToColorProg.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_ConvertYUVToRGBOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_ConvertYUVToRGBOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_MixAddOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_MixAddOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_MixBaseOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_MixBaseOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_MixBlendOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_MixBlendOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_MixBurnOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_MixBurnOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_MixColorOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_MixColorOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_MixDarkenOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_MixDarkenOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_MixDifferenceOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_MixDifferenceOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_MixDivideOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_MixDivideOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_MixDodgeOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_MixDodgeOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_MixGlareOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_MixGlareOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_MixHueOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_MixHueOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_MixLightenOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_MixLightenOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_MixLinearLightOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_MixLinearLightOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_MixMultiplyOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_MixMultiplyOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_MixOverlayOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_MixOverlayOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_MixSaturationOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_MixSaturationOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_MixScreenOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_MixScreenOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_MixSoftLightOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_MixSoftLightOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_MixSubtractOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_MixSubtractOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_MixValueOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_MixValueOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_RenderLayersAOOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_RenderLayersAOOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_RenderLayersAlphaProg.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_RenderLayersAlphaProg.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_RenderLayersBaseProg.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_RenderLayersBaseProg.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_RenderLayersColorOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_RenderLayersColorOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_RenderLayersCyclesOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_RenderLayersCyclesOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_RenderLayersDepthProg.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_RenderLayersDepthProg.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_RenderLayersDiffuseOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_RenderLayersDiffuseOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_RenderLayersEmitOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_RenderLayersEmitOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_RenderLayersEnvironmentOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_RenderLayersEnvironmentOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_RenderLayersImageProg.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_RenderLayersImageProg.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_RenderLayersIndirectOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_RenderLayersIndirectOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_RenderLayersMaterialIndexOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_RenderLayersMaterialIndexOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_RenderLayersMistOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_RenderLayersMistOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_RenderLayersNormalOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_RenderLayersNormalOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_RenderLayersObjectIndexOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_RenderLayersObjectIndexOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_RenderLayersReflectionOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_RenderLayersReflectionOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_RenderLayersRefractionOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_RenderLayersRefractionOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_RenderLayersShadowOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_RenderLayersShadowOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_RenderLayersSpecularOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_RenderLayersSpecularOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_RenderLayersSpeedOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_RenderLayersSpeedOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_RenderLayersUVOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_RenderLayersUVOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_SeparateChannelOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_SeparateChannelOperation.h
Property Changed:
----------------
branches/soc-2013-cycles_mblur/
branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface.c
Property changes on: branches/soc-2013-cycles_mblur
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_dev:58091-58422
/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,58822,58989
/branches/soc-2013-depsgraph_mt:57516,57900,57939-57940,57945,57958-57961,58151,58155-58156,58169,58277-58279,58282-58283,58711,58787,58789,58796,59086-59087,59163,59166,59170,59181,59259-59260
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032,59214,59220,59251,59601
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-59806
+ /branches/ge_dev:58091-58422
/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,58822,58989
/branches/soc-2013-depsgraph_mt:57516,57900,57939-57940,57945,57958-57961,58151,58155-58156,58169,58277-58279,58282-58283,58711,58787,58789,58796,59086-59087,59163,59166,59170,59181,59259-59260
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032,59214,59220,59251,59601
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-59851
Deleted:
branches/soc-2013-cycles_mblur/build_files/scons/config/freebsd7-config.py
===================================================================
--- branches/soc-2013-cycles_mblur/build_files/scons/config/freebsd7-config.py
2013-09-05 18:12:37 UTC (rev 59851)
+++ branches/soc-2013-cycles_mblur/build_files/scons/config/freebsd7-config.py
2013-09-05 18:58:29 UTC (rev 59852)
@@ -1,210 +0,0 @@
-CC = 'gcc44'
-CXX = 'g++44'
-
-LCGDIR = '../lib/freebsd7'
-LIBDIR = "${LCGDIR}"
-
-BF_PYTHON_ABI_FLAGS = ''
-BF_PYTHON = '/usr/local'
-BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
-BF_PYTHON_VERSION = '3.3'
-WITH_BF_STATICPYTHON = False
-BF_PYTHON_INC =
'${BF_PYTHON}/include/python${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}'
-BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
-BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}'
-BF_PYTHON_LIB_STATIC =
'${BF_PYTHON}/lib/libpython${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}.a'
-
-WITH_BF_OPENAL = True
-WITH_BF_STATICOPENAL = False
-BF_OPENAL = '/usr/local'
-BF_OPENAL_INC = '${BF_OPENAL}/include'
-BF_OPENAL_LIB = 'openal'
-BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
-
-BF_CXX = '/usr/local'
-WITH_BF_STATICCXX = False
-BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
-
-WITH_BF_JACK = True
-BF_JACK = '/usr/local'
-BF_JACK_INC = '${BF_JACK}/include/jack'
-BF_JACK_LIB = 'jack'
-BF_JACK_LIBPATH = '${BF_JACK}/lib'
-
-WITH_BF_SNDFILE = True
-BF_SNDFILE = '/usr/local'
-BF_SNDFILE_INC = '${BF_SNDFILE}/include/sndfile'
-BF_SNDFILE_LIB = 'sndfile'
-BF_SNDFILE_LIBPATH = '${BF_SNDFILE}/lib'
-
-WITH_BF_SDL = True
-BF_SDL = '/usr/local' #$(shell sdl-config --prefix)
-BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config
--cflags)
-BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs)
-lSDL_mixer
-
-WITH_BF_OPENEXR = True
-WITH_BF_STATICOPENEXR = False
-BF_OPENEXR = '/usr/local'
-# when compiling with your own openexr lib you might need to set...
-# BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR ${BF_OPENEXR}/include'
-
-BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR'
-BF_OPENEXR_LIB = 'Half IlmImf Iex Imath '
-BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a
${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a
${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a'
-# BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
-
-WITH_BF_DDS = True
-
-WITH_BF_JPEG = True
-BF_JPEG = '/usr/local'
-BF_JPEG_INC = '${BF_JPEG}/include'
-BF_JPEG_LIB = 'jpeg'
-
-WITH_BF_PNG = True
-BF_PNG = '/usr/local'
-BF_PNG_INC = '${BF_PNG}/include'
-BF_PNG_LIB = 'png'
-
-WITH_BF_TIFF = True
-BF_TIFF = '/usr/local'
-BF_TIFF_INC = '${BF_TIFF}/include'
-BF_TIFF_LIB = 'tiff'
-
-WITH_BF_ZLIB = True
-BF_ZLIB = '/usr'
-BF_ZLIB_INC = '${BF_ZLIB}/include'
-BF_ZLIB_LIB = 'z'
-
-WITH_BF_INTERNATIONAL = True
-
-WITH_BF_GAMEENGINE = False
-WITH_BF_PLAYER = True
-WITH_BF_OCEANSIM = True
-
-WITH_BF_BULLET = True
-BF_BULLET = '#extern/bullet2/src'
-BF_BULLET_INC = '${BF_BULLET}'
-BF_BULLET_LIB = 'extern_bullet'
-
-BF_FREETYPE = '/usr/local'
-BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
-BF_FREETYPE_LIB = 'freetype'
-
-### XXX Find what this actually wants; it doesn't want libquicktime.
-WITH_BF_QUICKTIME = False
-BF_QUICKTIME = '/usr/local'
-BF_QUICKTIME_INC = '${BF_QUICKTIME}/include'
-
-WITH_BF_ICONV = True
-BF_ICONV = LIBDIR + "/iconv"
-BF_ICONV_INC = '${BF_ICONV}/include'
-BF_ICONV_LIB = 'iconv'
-BF_ICONV_LIBPATH = '${BF_ICONV}/lib'
-
-WITH_BF_BINRELOC = True
-
-# enable ffmpeg support
-WITH_BF_FFMPEG = True
-BF_FFMPEG = '/usr/local'
-BF_FFMPEG_LIB = 'avformat avcodec swscale avutil avdevice'
-BF_FFMPEG_INC = '${BF_FFMPEG}/include'
-BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
-
-# enable ogg, vorbis and theora in ffmpeg
-WITH_BF_OGG = True
-BF_OGG = '/usr/local'
-BF_OGG_INC = '${BF_OGG}/include'
-BF_OGG_LIB = 'ogg vorbis vorbisenc theoraenc theoradec'
-
-WITH_BF_OPENJPEG = True
-BF_OPENJPEG = '#extern/libopenjpeg'
-BF_OPENJPEG_LIB = ''
-BF_OPENJPEG_INC = '${BF_OPENJPEG}'
-BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib'
-
-WITH_BF_FFTW3 = True
-BF_FFTW3 = LIBDIR + '/usr/local'
-BF_FFTW3_INC = '${BF_FFTW3}/include'
-BF_FFTW3_LIB = 'fftw3'
-BF_FFTW3_LIBPATH = '${BF_FFTW3}/lib'
-
-WITH_BF_REDCODE = False
-BF_REDCODE = '#extern/libredcode'
-BF_REDCODE_LIB = ''
-# BF_REDCODE_INC = '${BF_REDCODE}/include'
-BF_REDCODE_INC = '${BF_REDCODE}/../' #C files request "libredcode/format.h"
which is in "#extern/libredcode/format.h", stupid but compiles for now.
-BF_REDCODE_LIBPATH='${BF_REDCODE}/lib'
-
-# Mesa Libs should go here if your using them as well....
-WITH_BF_STATICOPENGL = False
-BF_OPENGL = '/usr/local'
-BF_OPENGL_INC = '${BF_OPENGL}/include'
-BF_OPENGL_LIB = 'GL GLU X11 Xi'
-BF_OPENGL_LIBPATH = '/usr/X11R6/lib'
-BF_OPENGL_LIB_STATIC = '${BF_OPENGL_LIBPATH}/libGL.a
${BF_OPENGL_LIBPATH}/libGLU.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a
${BF_OPENGL_LIBPATH}/libX11.a ${BF_OPENGL_LIBPATH}/libXi.a
${BF_OPENGL_LIBPATH}/libXext.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a'
-
-WITH_BF_COLLADA = False
-BF_COLLADA = '#source/blender/collada'
-BF_COLLADA_INC = '${BF_COLLADA}'
-BF_COLLADA_LIB = 'bf_collada'
-BF_OPENCOLLADA = '/usr'
-BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}'
-BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader
OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver
pcre buffer ftoa'
-BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
-BF_PCRE = '/usr/local'
-BF_PCRE_LIB = 'pcre'
-BF_PCRE_LIBPATH = '${BF_PCRE}/lib'
-BF_EXPAT = '/usr/local'
-BF_EXPAT_LIB = 'expat'
-BF_EXPAT_LIBPATH = '${BF_EXPAT}/lib'
-
-WITH_GHOST_XDND = False
-
-WITH_BF_OPENMP = True
-
-#Freestyle
-WITH_BF_FREESTYLE = True
-
-#Ray trace optimization
-WITH_BF_RAYOPTIMIZATION = True
-BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-pthread']
-
-CCFLAGS =
['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing','-D_LARGEFILE_SOURCE','-D_FILE_OFFSET_BITS=64','-D_LARGEFILE64_SOURCE']
-
-CPPFLAGS = []
-CXXFLAGS = []
-if WITH_BF_FFMPEG:
- # libavutil needs UINT64_C()
- CXXFLAGS += ['-D__STDC_CONSTANT_MACROS', ]
-REL_CFLAGS = []
-REL_CXXFLAGS = []
-REL_CCFLAGS = ['-DNDEBUG', '-O2']
-##BF_DEPEND = True
-##
-##AR = ar
-##ARFLAGS = ruv
-##ARFLAGSQUIET = ru
-##
-C_WARN = ['-Wno-char-subscripts', '-Wdeclaration-after-statement',
'-Wstrict-prototypes']
-CC_WARN = ['-Wall']
-CXX_WARN = ['-Wno-invalid-offsetof', '-Wno-sign-compare']
-
-
-##FIX_STUBS_WARNINGS = -Wno-unused
-
-LLIBS = ['util', 'c', 'm', 'pthread', 'stdc++']
-##LOPTS = --dynamic
-##DYNLDFLAGS = -shared $(LDFLAGS)
-
-BF_PROFILE = False
-BF_PROFILE_CCFLAGS = ['-pg','-g']
-BF_PROFILE_LINKFLAGS = ['-pg']
-
-BF_DEBUG = False
-BF_DEBUG_CCFLAGS = ['-g', '-D_DEBUG']
-
-BF_BUILDDIR = '../build/freebsd7'
-BF_INSTALLDIR='../install/freebsd7'
-
-#Link against pthread
-PLATFORM_LINKFLAGS = ['-pthread']
Modified:
branches/soc-2013-cycles_mblur/build_files/scons/config/freebsd8-config.py
===================================================================
--- branches/soc-2013-cycles_mblur/build_files/scons/config/freebsd8-config.py
2013-09-05 18:12:37 UTC (rev 59851)
+++ branches/soc-2013-cycles_mblur/build_files/scons/config/freebsd8-config.py
2013-09-05 18:58:29 UTC (rev 59852)
@@ -139,7 +139,7 @@
WITH_BF_STATICOPENGL = False
BF_OPENGL = '/usr/local'
BF_OPENGL_INC = '${BF_OPENGL}/include'
-BF_OPENGL_LIB = 'GL GLU X11 Xi'
+BF_OPENGL_LIB = 'GL GLU X11 Xi Xxf86vm'
BF_OPENGL_LIBPATH = '/usr/X11R6/lib'
BF_OPENGL_LIB_STATIC = '${BF_OPENGL_LIBPATH}/libGL.a
${BF_OPENGL_LIBPATH}/libGLU.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a
${BF_OPENGL_LIBPATH}/libX11.a ${BF_OPENGL_LIBPATH}/libXi.a
${BF_OPENGL_LIBPATH}/libXext.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a'
Modified:
branches/soc-2013-cycles_mblur/build_files/scons/config/freebsd9-config.py
===================================================================
--- branches/soc-2013-cycles_mblur/build_files/scons/config/freebsd9-config.py
2013-09-05 18:12:37 UTC (rev 59851)
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
