Revision: 55548
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55548
Author: kjym3
Date: 2013-03-24 12:13:13 +0000 (Sun, 24 Mar 2013)
Log Message:
-----------
Merged changes in the trunk up to revision 55546.
Conflicts resolved:
source/blenderplayer/bad_level_call_stubs/SConscript
Partly reverted changes to intern/cycles/blender/addon/ui.py in revision 52899
to make it easier to merge trunk changes.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55546
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52899
Modified Paths:
--------------
branches/soc-2008-mxcurioni/CMakeLists.txt
branches/soc-2008-mxcurioni/SConstruct
branches/soc-2008-mxcurioni/build_files/build_environment/install_deps.sh
branches/soc-2008-mxcurioni/doc/python_api/rst/bge.logic.rst
branches/soc-2008-mxcurioni/extern/carve/lib/intersect_face_division.cpp
branches/soc-2008-mxcurioni/extern/libmv/third_party/ceres/ChangeLog
branches/soc-2008-mxcurioni/extern/libmv/third_party/ceres/include/ceres/cost_function_to_functor.h
branches/soc-2008-mxcurioni/extern/libmv/third_party/ceres/include/ceres/internal/autodiff.h
branches/soc-2008-mxcurioni/extern/libmv/third_party/ceres/include/ceres/numeric_diff_functor.h
branches/soc-2008-mxcurioni/extern/libmv/third_party/ceres/include/ceres/problem.h
branches/soc-2008-mxcurioni/extern/libmv/third_party/ceres/include/ceres/rotation.h
branches/soc-2008-mxcurioni/extern/libmv/third_party/ceres/internal/ceres/canonical_views_clustering.cc
branches/soc-2008-mxcurioni/extern/libmv/third_party/ceres/internal/ceres/canonical_views_clustering.h
branches/soc-2008-mxcurioni/extern/libmv/third_party/ceres/internal/ceres/generate_eliminator_specialization.py
branches/soc-2008-mxcurioni/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_2.cc
branches/soc-2008-mxcurioni/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_3.cc
branches/soc-2008-mxcurioni/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_4.cc
branches/soc-2008-mxcurioni/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_d.cc
branches/soc-2008-mxcurioni/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_3.cc
branches/soc-2008-mxcurioni/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_4.cc
branches/soc-2008-mxcurioni/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_9.cc
branches/soc-2008-mxcurioni/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_d.cc
branches/soc-2008-mxcurioni/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_3.cc
branches/soc-2008-mxcurioni/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_4.cc
branches/soc-2008-mxcurioni/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_d.cc
branches/soc-2008-mxcurioni/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_2.cc
branches/soc-2008-mxcurioni/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_3.cc
branches/soc-2008-mxcurioni/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_4.cc
branches/soc-2008-mxcurioni/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_d.cc
branches/soc-2008-mxcurioni/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_d_d_d.cc
branches/soc-2008-mxcurioni/extern/libmv/third_party/ceres/internal/ceres/line_search.cc
branches/soc-2008-mxcurioni/extern/libmv/third_party/ceres/internal/ceres/line_search.h
branches/soc-2008-mxcurioni/extern/libmv/third_party/ceres/internal/ceres/line_search_direction.cc
branches/soc-2008-mxcurioni/extern/libmv/third_party/ceres/internal/ceres/line_search_direction.h
branches/soc-2008-mxcurioni/extern/libmv/third_party/ceres/internal/ceres/line_search_minimizer.cc
branches/soc-2008-mxcurioni/extern/libmv/third_party/ceres/internal/ceres/line_search_minimizer.h
branches/soc-2008-mxcurioni/extern/libmv/third_party/ceres/internal/ceres/problem_impl.cc
branches/soc-2008-mxcurioni/extern/libmv/third_party/ceres/internal/ceres/schur_complement_solver.cc
branches/soc-2008-mxcurioni/extern/libmv/third_party/ceres/internal/ceres/schur_complement_solver.h
branches/soc-2008-mxcurioni/extern/libmv/third_party/ceres/internal/ceres/schur_eliminator.cc
branches/soc-2008-mxcurioni/extern/libmv/third_party/ceres/internal/ceres/solver_impl.cc
branches/soc-2008-mxcurioni/extern/libmv/third_party/ceres/internal/ceres/solver_impl.h
branches/soc-2008-mxcurioni/extern/libmv/third_party/ceres/internal/ceres/sparse_normal_cholesky_solver.cc
branches/soc-2008-mxcurioni/extern/libmv/third_party/ceres/internal/ceres/sparse_normal_cholesky_solver.h
branches/soc-2008-mxcurioni/extern/libmv/third_party/ceres/internal/ceres/visibility.cc
branches/soc-2008-mxcurioni/extern/libmv/third_party/ceres/internal/ceres/visibility.h
branches/soc-2008-mxcurioni/extern/libmv/third_party/ceres/internal/ceres/visibility_based_preconditioner.cc
branches/soc-2008-mxcurioni/extern/wcwidth/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_C-API.cpp
branches/soc-2008-mxcurioni/intern/cycles/blender/addon/ui.py
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_camera.cpp
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_mesh.cpp
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_shader.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_camera.h
branches/soc-2008-mxcurioni/intern/cycles/render/light.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowX11.cpp
branches/soc-2008-mxcurioni/intern/memutil/MEM_CacheLimiter.h
branches/soc-2008-mxcurioni/intern/memutil/MEM_CacheLimiterC-Api.h
branches/soc-2008-mxcurioni/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp
branches/soc-2008-mxcurioni/intern/raskter/raskter.c
branches/soc-2008-mxcurioni/intern/rigidbody/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/string/STR_String.h
branches/soc-2008-mxcurioni/release/datafiles/blender_icons.svg
branches/soc-2008-mxcurioni/release/datafiles/blender_icons16.png
branches/soc-2008-mxcurioni/release/datafiles/blender_icons32.png
branches/soc-2008-mxcurioni/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py
branches/soc-2008-mxcurioni/release/scripts/modules/bl_i18n_utils/settings.py
branches/soc-2008-mxcurioni/release/scripts/modules/bl_i18n_utils/utils.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/node.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_object.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_particle.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_info.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2008-mxcurioni/release/scripts/templates_py/custom_nodes.py
branches/soc-2008-mxcurioni/source/blender/blenfont/BLF_translation.h
branches/soc-2008-mxcurioni/source/blender/blenfont/intern/blf.c
branches/soc-2008-mxcurioni/source/blender/blenfont/intern/blf_lang.c
branches/soc-2008-mxcurioni/source/blender/blenfont/intern/blf_translation.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_anim.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_blender.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_brush.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_camera.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_curve.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_customdata.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_deform.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_displist.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_idcode.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_idprop.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_mesh.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_movieclip.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_multires.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_nla.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_node.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_object.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/blender.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/bpath.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/brush.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/camera.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/constraint.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/curve.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/customdata.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/deform.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/displist.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/dynamicpaint.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/fcurve.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/idcode.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/idprop.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/image.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/modifier.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/movieclip.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/multires.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/node.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/object.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/smoke.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/writeavi.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/nla_private.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_callbacks.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_gsqueue.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_geom.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_path_util.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_rect.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_vfontdata.h
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/fileops.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/freetypefont.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/gsqueue.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_geom.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/path_util.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/rct.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/voronoi.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/writefile.c
branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_utils.c
branches/soc-2008-mxcurioni/source/blender/collada/ArmatureExporter.cpp
branches/soc-2008-mxcurioni/source/blender/collada/collada_internal.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_Converter.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_ExecutionGroup.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_ExecutionGroup.h
branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_ExecutionSystem.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_NodeOperation.h
branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_compositor.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_CompositorNode.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_MovieClipNode.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_RenderLayersNode.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_SocketProxyNode.h
branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_ViewerNode.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_CompositorOperation.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_CompositorOperation.h
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_CropOperation.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MovieClipOperation.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MovieClipOperation.h
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_OpenCLKernels.cl
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_OutputFileOperation.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_RenderLayersBaseProg.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_RenderLayersBaseProg.h
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_markers.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/armature_select.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/pose_select.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/pose_transform.c
branches/soc-2008-mxcurioni/source/blender/editors/curve/editcurve.c
branches/soc-2008-mxcurioni/source/blender/editors/gpencil/drawgpencil.c
branches/soc-2008-mxcurioni/source/blender/editors/gpencil/gpencil_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/gpencil/gpencil_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_anim_api.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_armature.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_curve.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_gpencil.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_mball.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_mesh.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_object.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_particle.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_transform.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_view3d.h
branches/soc-2008-mxcurioni/source/blender/editors/include/UI_icons.h
branches/soc-2008-mxcurioni/source/blender/editors/include/UI_interface.h
branches/soc-2008-mxcurioni/source/blender/editors/include/UI_resources.h
branches/soc-2008-mxcurioni/source/blender/editors/include/UI_view2d.h
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_handlers.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_layout.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_panel.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_utils.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_widgets.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/view2d.c
branches/soc-2008-mxcurioni/source/blender/editors/io/io_collada.c
branches/soc-2008-mxcurioni/source/blender/editors/io/io_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/mask/mask_select.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editface.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_add.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_knife.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_knife_project.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_loopcut.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_rip.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_select.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_utils.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_data.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_navmesh.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/meshtools.c
branches/soc-2008-mxcurioni/source/blender/editors/metaball/mball_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_add.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_bake.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/object/object_lattice.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_modifier.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_relations.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_select.c
branches/soc-2008-mxcurioni/source/blender/editors/physics/dynamicpaint_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/physics/particle_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/render/render_internal.c
branches/soc-2008-mxcurioni/source/blender/editors/render/render_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/render/render_preview.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/screendump.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_image_2d.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_image_proj.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2008-mxcurioni/source/blender/editors/sound/sound_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_action/action_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_buttons/buttons_texture.c
branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_editor.c
branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_clip/space_clip.c
branches/soc-2008-mxcurioni/source/blender/editors/space_console/console_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_console/console_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/file_panels.c
branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_nla/nla_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_node/drawnode.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_add.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_group.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_templates.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/space_node.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_select.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_tools.c
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_select.c
branches/soc-2008-mxcurioni/source/blender/editors/space_text/space_text.c
branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_format_lua.c
branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_format_osl.c
branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_format_py.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawobject.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawvolume.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_fly.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_project.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_ruler.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_conversions.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_orientations.c
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2008-mxcurioni/source/blender/gpu/GPU_draw.h
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_draw.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_material.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_simple_shader.c
branches/soc-2008-mxcurioni/source/blender/imbuf/IMB_moviecache.h
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/cineon/cineon_dpx.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/cineon/cineonlib.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/cineon/dpxlib.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/cineon/logImageCore.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/moviecache.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/rectop.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/scaling.c
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_movieclip_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_node_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_access.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_curve.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_define.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_rna.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_ui.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_boolean_util.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_cloth.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_mirror.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_ocean.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/node_composite_tree.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/node_composite_util.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_image.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_movieclip.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/node_exec.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/node_shader_tree.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_mix_shader.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_value.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/node_texture_tree.c
branches/soc-2008-mxcurioni/source/blender/python/bmesh/bmesh_py_types_meshdata.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_app.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_app_translations.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_operator_wrap.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.h
branches/soc-2008-mxcurioni/source/blender/python/intern/gpu.c
branches/soc-2008-mxcurioni/source/blender/render/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/render/extern/include/RE_engine.h
branches/soc-2008-mxcurioni/source/blender/render/intern/source/external_engine.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/render_result.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/WM_api.h
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_cursors.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_files.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_jobs.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2008-mxcurioni/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blenderplayer/bad_level_call_stubs/SConscript
branches/soc-2008-mxcurioni/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2008-mxcurioni/source/creator/CMakeLists.txt
branches/soc-2008-mxcurioni/source/creator/creator.c
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ModifierDeformer.cpp
branches/soc-2008-mxcurioni/source/gameengine/Expressions/Value.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_CameraActuator.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_KetsjiEngine.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_NavMeshObject.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ObjectActuator.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Scene.cpp
branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVA.cpp
Added Paths:
-----------
branches/soc-2008-mxcurioni/release/datafiles/LICENSE-bmonofont-i18n.ttf.txt
branches/soc-2008-mxcurioni/release/datafiles/LICENSE-droidsans.ttf.txt
branches/soc-2008-mxcurioni/release/scripts/modules/bl_i18n_utils/settings_user.py
branches/soc-2008-mxcurioni/release/scripts/modules/bl_i18n_utils/utils_languages_menu.py
branches/soc-2008-mxcurioni/release/scripts/modules/bl_i18n_utils/utils_rtl.py
branches/soc-2008-mxcurioni/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
Removed Paths:
-------------
branches/soc-2008-mxcurioni/release/scripts/modules/bl_i18n_utils/check_po.py
branches/soc-2008-mxcurioni/release/scripts/modules/bl_i18n_utils/clean_po.py
branches/soc-2008-mxcurioni/release/scripts/modules/bl_i18n_utils/import_po_from_branches.py
branches/soc-2008-mxcurioni/release/scripts/modules/bl_i18n_utils/languages_menu_utils.py
branches/soc-2008-mxcurioni/release/scripts/modules/bl_i18n_utils/rtl_utils.py
branches/soc-2008-mxcurioni/release/scripts/modules/bl_i18n_utils/spell_check_utils.py
branches/soc-2008-mxcurioni/release/scripts/modules/bl_i18n_utils/update_branches.py
branches/soc-2008-mxcurioni/release/scripts/modules/bl_i18n_utils/update_mo.py
branches/soc-2008-mxcurioni/release/scripts/modules/bl_i18n_utils/update_msg.py
branches/soc-2008-mxcurioni/release/scripts/modules/bl_i18n_utils/update_po.py
branches/soc-2008-mxcurioni/release/scripts/modules/bl_i18n_utils/update_pot.py
branches/soc-2008-mxcurioni/release/scripts/modules/bl_i18n_utils/update_trunk.py
branches/soc-2008-mxcurioni/release/scripts/modules/bl_i18n_utils/user_settings.py
Property Changed:
----------------
branches/soc-2008-mxcurioni/
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_particle.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/
Property changes on: branches/soc-2008-mxcurioni
___________________________________________________________________
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:34011-39896,39898-40096,40098-44221,44223-44419,44421-47664,47667-51853,51855-55392
+
/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:34011-39896,39898-40096,40098-44221,44223-44419,44421-47664,47667-51853,51855-55546
Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt 2013-03-24 10:52:20 UTC (rev
55547)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt 2013-03-24 12:13:13 UTC (rev
55548)
@@ -124,7 +124,7 @@
option(WITH_PYTHON_SAFETY "Enable internal API error checking to track invalid
data to prevent crash on access (at the expense of some effeciency, only enable
for development)." OFF)
option(WITH_PYTHON_MODULE "Enable building as a python module which runs
without a user interface, like running regular blender in background mode
(experimental, only enable for development)" OFF)
-if (APPLE)
+if(APPLE)
option(WITH_PYTHON_FRAMEWORK "Enable building using the Python
available in the framework (OSX only)" OFF)
endif()
@@ -297,9 +297,9 @@
endif()
execute_process(COMMAND uname -r OUTPUT_VARIABLE MAC_SYS) # check for
actual system-version
- if (${MAC_SYS} MATCHES 12)
+ if(${MAC_SYS} MATCHES 12)
set(OSX_SYSTEM 10.8)
- elseif (${MAC_SYS} MATCHES 11)
+ elseif(${MAC_SYS} MATCHES 11)
set(OSX_SYSTEM 10.7)
elseif(${MAC_SYS} MATCHES 10)
set(OSX_SYSTEM 10.6)
@@ -539,7 +539,7 @@
if(UNIX AND NOT APPLE)
macro(find_package_wrapper)
- STRING(TOUPPER ${ARGV0} _NAME_UPPER)
+ string(TOUPPER ${ARGV0} _NAME_UPPER)
if(${WITH_STATIC_LIBS})
set(_cmake_find_library_suffixes_back
${CMAKE_FIND_LIBRARY_SUFFIXES})
set(CMAKE_FIND_LIBRARY_SUFFIXES .a
${CMAKE_FIND_LIBRARY_SUFFIXES})
@@ -669,7 +669,7 @@
endif()
endif()
- if (WITH_INPUT_NDOF)
+ if(WITH_INPUT_NDOF)
find_package_wrapper(Spacenav)
if(NOT SPACENAV_FOUND)
set(WITH_INPUT_NDOF OFF)
@@ -690,10 +690,11 @@
endif()
set(Boost_USE_MULTITHREADED ON)
set(__boost_packages filesystem regex system thread
date_time)
- if (WITH_INTERNATIONAL)
+ if(WITH_INTERNATIONAL)
list(APPEND __boost_packages locale)
endif()
find_package(Boost 1.48 COMPONENTS ${__boost_packages})
+ unset(__boost_packages)
if(Boost_USE_STATIC_LIBS AND WITH_BOOST_ICU)
find_package(IcuLinux)
endif()
@@ -711,7 +712,7 @@
set(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARIES}
${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${ZLIB_LIBRARIES} ${BOOST_LIBRARIES})
set(OPENIMAGEIO_LIBPATH) # TODO, remove and reference the
absolute path everywhere
- set(OPENIMAGEIO_DEFINITIONS)
+ set(OPENIMAGEIO_DEFINITIONS "")
if(WITH_IMAGE_TIFF)
list(APPEND OPENIMAGEIO_LIBRARIES "${TIFF_LIBRARY}")
@@ -902,7 +903,7 @@
if(CMAKE_COMPILER_IS_GNUCC)
set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/mingw32)
- INCLUDE (CheckCSourceCompiles)
+ include(CheckCSourceCompiles)
# Setup 64bit and 64bit windows systems
CHECK_C_SOURCE_COMPILES("
#ifndef __MINGW64__
@@ -1138,7 +1139,7 @@
endif()
set_lib_path(PYTHON "python")
- STRING(REPLACE "." "" _PYTHON_VERSION_NO_DOTS
${PYTHON_VERSION})
+ string(REPLACE "." "" _PYTHON_VERSION_NO_DOTS
${PYTHON_VERSION})
# Use shared libs for vc2008 and vc2010 until we
actually have vc2010 libs
set(PYTHON_LIBRARY
${LIBDIR}/python/lib/python${_PYTHON_VERSION_NO_DOTS}.lib)
# set(PYTHON_LIBRARY
${PYTHON}/lib/python${_PYTHON_VERSION_NO_DOTS}.lib) #CACHE FILEPATH
@@ -1380,7 +1381,7 @@
set(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO}/include)
set(OPENIMAGEIO_LIBRARIES OpenImageIO)
set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO}/lib)
- set(OPENIMAGEIO_DEFINITIONS)
+ set(OPENIMAGEIO_DEFINITIONS "")
endif()
if(WITH_LLVM)
@@ -1633,7 +1634,7 @@
set(TIFF_LIBPATH ${TIFF}/lib)
endif()
- if (WITH_INPUT_NDOF)
+ if(WITH_INPUT_NDOF)
# linker needs "-weak_framework 3DconnexionClient"
endif()
@@ -1641,7 +1642,7 @@
set(BOOST ${LIBDIR}/boost)
set(BOOST_INCLUDE_DIR ${BOOST}/include)
set(BOOST_LIBRARIES boost_date_time-mt boost_filesystem-mt
boost_regex-mt boost_system-mt boost_thread-mt boost_wave-mt)
- if (WITH_INTERNATIONAL)
+ if(WITH_INTERNATIONAL)
list(APPEND BOOST_LIBRARIES boost_locale-mt)
set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -liconv")
# boost_locale needs it !
endif()
@@ -1933,13 +1934,14 @@
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_DIV_BY_ZERO
-Wno-div-by-zero)
# gcc 4.2 gives annoying warnings on every file with this
- if (NOT "${CMAKE_C_COMPILER_VERSION}" VERSION_LESS "4.3")
+ if(NOT "${CMAKE_C_COMPILER_VERSION}" VERSION_LESS "4.3")
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_UNINITIALIZED
-Wuninitialized)
endif()
# versions before gcc4.6 give many BLI_math warnings
- if (NOT "${CMAKE_C_COMPILER_VERSION}" VERSION_LESS "4.6")
- ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_REDUNDANT_DECLS
-Wredundant-decls)
+ if(NOT "${CMAKE_C_COMPILER_VERSION}" VERSION_LESS "4.6")
+ ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_REDUNDANT_DECLS
-Wredundant-decls)
+ ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS
CXX_WARN_REDUNDANT_DECLS -Wredundant-decls)
endif()
# disable because it gives warnings for printf() & friends.
@@ -1956,10 +1958,9 @@
ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_INIT_SELF
-Winit-self) # needs -Wuninitialized
ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_MISSING_INCLUDE_DIRS
-Wmissing-include-dirs)
ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_DIV_BY_ZERO
-Wno-div-by-zero)
- ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_REDUNDANT_DECLS
-Wredundant-decls)
# gcc 4.2 gives annoying warnings on every file with this
- if (NOT "${CMAKE_C_COMPILER_VERSION}" VERSION_LESS "4.3")
+ if(NOT "${CMAKE_C_COMPILER_VERSION}" VERSION_LESS "4.3")
ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_UNINITIALIZED
-Wuninitialized)
endif()
Modified: branches/soc-2008-mxcurioni/SConstruct
===================================================================
--- branches/soc-2008-mxcurioni/SConstruct 2013-03-24 10:52:20 UTC (rev
55547)
+++ branches/soc-2008-mxcurioni/SConstruct 2013-03-24 12:13:13 UTC (rev
55548)
@@ -384,6 +384,9 @@
env['CPPFLAGS'].append('-DWITH_AVI')
env['CPPFLAGS'].append('-DWITH_BOOL_COMPAT')
+if env['OURPLATFORM'] not in ('win32-vc', 'win64-vc'):
+ env['CPPFLAGS'].append('-DHAVE_STDBOOL_H')
+
# lastly we check for root_build_dir ( we should not do before, otherwise we
might do wrong builddir
B.root_build_dir = env['BF_BUILDDIR']
B.doc_build_dir = os.path.join(env['BF_INSTALLDIR'], 'doc')
Modified:
branches/soc-2008-mxcurioni/build_files/build_environment/install_deps.sh
===================================================================
--- branches/soc-2008-mxcurioni/build_files/build_environment/install_deps.sh
2013-03-24 10:52:20 UTC (rev 55547)
+++ branches/soc-2008-mxcurioni/build_files/build_environment/install_deps.sh
2013-03-24 12:13:13 UTC (rev 55548)
@@ -168,8 +168,7 @@
PYTHON_FORCE_REBUILD=false
PYTHON_SKIP=false
-#Could not get numpy-1.6.2 to compile with python-3.3
-NUMPY_VERSION="1.7.0rc1"
+NUMPY_VERSION="1.7.0"
NUMPY_VERSION_MIN="1.7"
NUMPY_SOURCE="http://sourceforge.net/projects/numpy/files/NumPy/$NUMPY_VERSION/numpy-$NUMPY_VERSION.tar.gz";
NUMPY_FORCE_REBUILD=false
@@ -224,8 +223,6 @@
# FFMPEG optional libs.
VORBIS_USE=false
VORBIS_DEV=""
-SCHRO_USE=false
-SCRHO_DEV=""
THEORA_USE=false
THEORA_DEV=""
XVID_USE=false
@@ -471,10 +468,10 @@
detect_distro() {
if [ -f /etc/debian_version ]; then
DISTRO="DEB"
+ elif [ -f /etc/arch-release ]; then
+ DISTRO="ARCH"
elif [ -f /etc/redhat-release -o /etc/SuSE-release ]; then
DISTRO="RPM"
- elif [ -f /etc/arch-release ]; then
- DISTRO="ARCH"
fi
}
@@ -1067,8 +1064,12 @@
cd $_src
# XXX For now, always update from latest repo...
- git pull origin
+ git pull origin master
+ # XXX We have to stick to this revision, the next one introduced a change
to ExtraHandler' parseElement signature :/
+ git checkout c89cf095c40aa2a518b1104c448825eacc92d174
+ git reset --hard
+
# Always refresh the whole build!
if [ -d build ]; then
rm -rf build
@@ -1144,11 +1145,6 @@
extra="$extra --enable-libtheora"
fi
- # XXX At least under Debian, static schro gives problem at blender linking
time... :/
- if $SCHRO_USE && ! $ALL_STATIC; then
- extra="$extra --enable-libschroedinger"
- fi
-
if $XVID_USE; then
extra="$extra --enable-libxvid"
fi
@@ -1362,14 +1358,6 @@
install_packages_DEB $VPX_DEV
VPX_USE=true
fi
-
- INFO ""
- SCHRO_DEV="libschroedinger-dev"
- check_package_DEB $SCHRO_DEV
- if [ $? -eq 0 ]; then
- install_packages_DEB $SCHRO_DEV
- SCHRO_USE=true
- fi
fi
INFO ""
@@ -1607,9 +1595,10 @@
# Enable non-free repositories for all flavours
rpm_flavour
if [ $RPM = "FEDORA" ]; then
+ _fedora_rel="`egrep "[0-9]{1,}" /etc/fedora-release -o`"
sudo yum -y localinstall --nogpgcheck \
@@ 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
