[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57348] branches/soc-2011-tomato: Merging r57134 through r57345 from trunk into soc-2011-tomato
Sergey Sharybin
sergey.vfx at gmail.com
Mon Jun 10 14:33:07 CEST 2013
Revision: 57348
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57348
Author: nazgul
Date: 2013-06-10 12:33:07 +0000 (Mon, 10 Jun 2013)
Log Message:
-----------
Merging r57134 through r57345 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57134
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57345
Modified Paths:
--------------
branches/soc-2011-tomato/CMakeLists.txt
branches/soc-2011-tomato/SConstruct
branches/soc-2011-tomato/build_files/build_environment/install_deps.sh
branches/soc-2011-tomato/build_files/buildbot/master.cfg
branches/soc-2011-tomato/build_files/scons/config/linuxcross-config.py
branches/soc-2011-tomato/build_files/scons/config/win32-mingw-config.py
branches/soc-2011-tomato/build_files/scons/config/win32-vc-config.py
branches/soc-2011-tomato/build_files/scons/config/win64-vc-config.py
branches/soc-2011-tomato/build_files/scons/tools/Blender.py
branches/soc-2011-tomato/build_files/scons/tools/btools.py
branches/soc-2011-tomato/doc/guides/interface_API.txt
branches/soc-2011-tomato/extern/libmv/CMakeLists.txt
branches/soc-2011-tomato/extern/libmv/ChangeLog
branches/soc-2011-tomato/extern/libmv/files.txt
branches/soc-2011-tomato/extern/libmv/libmv/simple_pipeline/keyframe_selection.cc
branches/soc-2011-tomato/extern/libmv/libmv/tracking/track_region.h
branches/soc-2011-tomato/extern/libmv/libmv-capi_stub.cc
branches/soc-2011-tomato/intern/cycles/blender/addon/properties.py
branches/soc-2011-tomato/intern/cycles/blender/addon/ui.py
branches/soc-2011-tomato/intern/cycles/blender/blender_object.cpp
branches/soc-2011-tomato/intern/cycles/blender/blender_session.cpp
branches/soc-2011-tomato/intern/cycles/blender/blender_sync.cpp
branches/soc-2011-tomato/intern/cycles/device/device_opencl.cpp
branches/soc-2011-tomato/intern/cycles/kernel/CMakeLists.txt
branches/soc-2011-tomato/intern/cycles/kernel/closure/bsdf_diffuse_ramp.h
branches/soc-2011-tomato/intern/cycles/kernel/closure/bsdf_phong_ramp.h
branches/soc-2011-tomato/intern/cycles/kernel/closure/bssrdf.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_accumulate.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_bvh.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_camera.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_compat_cpu.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_compat_opencl.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_curve.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_displace.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_emission.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_globals.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_light.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_montecarlo.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_object.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_passes.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_path.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_random.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_shader.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_types.h
branches/soc-2011-tomato/intern/cycles/kernel/osl/osl_services.cpp
branches/soc-2011-tomato/intern/cycles/kernel/shaders/node_texture_coordinate.osl
branches/soc-2011-tomato/intern/cycles/kernel/svm/svm.h
branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_brick.h
branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_checker.h
branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_closure.h
branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_convert.h
branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_fresnel.h
branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_hsv.h
branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_image.h
branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_musgrave.h
branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_noise.h
branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_ramp.h
branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_tex_coord.h
branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_texture.h
branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_value.h
branches/soc-2011-tomato/intern/cycles/render/film.cpp
branches/soc-2011-tomato/intern/cycles/render/film.h
branches/soc-2011-tomato/intern/cycles/render/graph.cpp
branches/soc-2011-tomato/intern/cycles/render/integrator.cpp
branches/soc-2011-tomato/intern/cycles/render/integrator.h
branches/soc-2011-tomato/intern/cycles/render/light.cpp
branches/soc-2011-tomato/intern/cycles/render/light.h
branches/soc-2011-tomato/intern/cycles/render/session.cpp
branches/soc-2011-tomato/intern/cycles/util/util_math.h
branches/soc-2011-tomato/intern/cycles/util/util_opencl.cpp
branches/soc-2011-tomato/intern/cycles/util/util_system.cpp
branches/soc-2011-tomato/intern/cycles/util/util_task.cpp
branches/soc-2011-tomato/intern/cycles/util/util_time.cpp
branches/soc-2011-tomato/intern/cycles/util/util_types.h
branches/soc-2011-tomato/intern/guardedalloc/intern/mallocn.c
branches/soc-2011-tomato/intern/guardedalloc/test/simpletest/memtest.c
branches/soc-2011-tomato/release/scripts/freestyle/style_modules/parameter_editor.py
branches/soc-2011-tomato/release/scripts/modules/bpy_types.py
branches/soc-2011-tomato/release/scripts/modules/nodeitems_utils.py
branches/soc-2011-tomato/release/scripts/presets/interface_theme/back_to_black.xml
branches/soc-2011-tomato/release/scripts/presets/interface_theme/blender_24x.xml
branches/soc-2011-tomato/release/scripts/presets/interface_theme/elsyiun.xml
branches/soc-2011-tomato/release/scripts/presets/interface_theme/hexagon.xml
branches/soc-2011-tomato/release/scripts/presets/interface_theme/ubuntu_ambiance.xml
branches/soc-2011-tomato/release/scripts/presets/keyconfig/3dsmax.py
branches/soc-2011-tomato/release/scripts/presets/keyconfig/maya.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/freestyle.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/mesh.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/node.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/view3d.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_freestyle.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_clip.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_dopesheet.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_image.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_info.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_node.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2011-tomato/release/scripts/startup/nodeitems_builtins.py
branches/soc-2011-tomato/release/scripts/templates_py/custom_nodes.py
branches/soc-2011-tomato/source/blender/blenfont/intern/blf_glyph.c
branches/soc-2011-tomato/source/blender/blenfont/intern/blf_internal.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_DerivedMesh.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_blender.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_global.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_lattice.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_modifier.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_object.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_text.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_texture.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/blender.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/constraint.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/customdata.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/dynamicpaint.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/editderivedmesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/lamp.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/lattice.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/material.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/mesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/modifier.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/modifiers_bmesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/node.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/object.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/paint.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/pbvh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/smoke.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/text.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/texture.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/unit.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/world.c
branches/soc-2011-tomato/source/blender/blenlib/BLI_math_geom.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_rect.h
branches/soc-2011-tomato/source/blender/blenlib/intern/listbase.c
branches/soc-2011-tomato/source/blender/blenlib/intern/math_color.c
branches/soc-2011-tomato/source/blender/blenlib/intern/math_geom.c
branches/soc-2011-tomato/source/blender/blenlib/intern/math_vector.c
branches/soc-2011-tomato/source/blender/blenlib/intern/rct.c
branches/soc-2011-tomato/source/blender/blenlib/intern/scanfill.c
branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
branches/soc-2011-tomato/source/blender/bmesh/CMakeLists.txt
branches/soc-2011-tomato/source/blender/bmesh/bmesh.h
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_edgeloop.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_edgeloop.h
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_mesh_conv.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_mesh_conv.h
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_opdefines.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_operator_api.h
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_operators.h
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_polygon.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_walkers_impl.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_bridge.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_dissolve.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_edgenet.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_fill_grid.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_mesh_conv.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_subdivide.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_subdivide_edgering.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_utils.c
branches/soc-2011-tomato/source/blender/bmesh/tools/bmesh_decimate.h
branches/soc-2011-tomato/source/blender/bmesh/tools/bmesh_decimate_dissolve.c
branches/soc-2011-tomato/source/blender/collada/GeometryExporter.cpp
branches/soc-2011-tomato/source/blender/collada/collada_utils.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MovieClipOperation.cpp
branches/soc-2011-tomato/source/blender/editors/animation/anim_filter.c
branches/soc-2011-tomato/source/blender/editors/armature/armature_ops.c
branches/soc-2011-tomato/source/blender/editors/armature/meshlaplacian.c
branches/soc-2011-tomato/source/blender/editors/curve/curve_ops.c
branches/soc-2011-tomato/source/blender/editors/curve/editcurve.c
branches/soc-2011-tomato/source/blender/editors/gpencil/gpencil_edit.c
branches/soc-2011-tomato/source/blender/editors/include/ED_mesh.h
branches/soc-2011-tomato/source/blender/editors/include/ED_screen.h
branches/soc-2011-tomato/source/blender/editors/include/UI_interface.h
branches/soc-2011-tomato/source/blender/editors/include/UI_resources.h
branches/soc-2011-tomato/source/blender/editors/include/UI_view2d.h
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_handlers.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_intern.h
branches/soc-2011-tomato/source/blender/editors/interface/interface_layout.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_ops.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_regions.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_style.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_templates.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_utils.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_widgets.c
branches/soc-2011-tomato/source/blender/editors/interface/resources.c
branches/soc-2011-tomato/source/blender/editors/interface/view2d.c
branches/soc-2011-tomato/source/blender/editors/mesh/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/mesh/editface.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_extrude.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_knife.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_loopcut.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_select.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_utils.c
branches/soc-2011-tomato/source/blender/editors/mesh/mesh_data.c
branches/soc-2011-tomato/source/blender/editors/mesh/mesh_intern.h
branches/soc-2011-tomato/source/blender/editors/mesh/mesh_ops.c
branches/soc-2011-tomato/source/blender/editors/object/object_edit.c
branches/soc-2011-tomato/source/blender/editors/object/object_lattice.c
branches/soc-2011-tomato/source/blender/editors/object/object_relations.c
branches/soc-2011-tomato/source/blender/editors/object/object_shapekey.c
branches/soc-2011-tomato/source/blender/editors/object/object_vgroup.c
branches/soc-2011-tomato/source/blender/editors/physics/particle_object.c
branches/soc-2011-tomato/source/blender/editors/render/render_internal.c
branches/soc-2011-tomato/source/blender/editors/render/render_opengl.c
branches/soc-2011-tomato/source/blender/editors/render/render_update.c
branches/soc-2011-tomato/source/blender/editors/screen/area.c
branches/soc-2011-tomato/source/blender/editors/screen/screen_edit.c
branches/soc-2011-tomato/source/blender/editors/screen/screen_ops.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_cursor.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_image_proj.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_intern.h
branches/soc-2011-tomato/source/blender/editors/space_clip/space_clip.c
branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2011-tomato/source/blender/editors/space_file/filesel.c
branches/soc-2011-tomato/source/blender/editors/space_file/space_file.c
branches/soc-2011-tomato/source/blender/editors/space_nla/nla_channels.c
branches/soc-2011-tomato/source/blender/editors/space_nla/nla_edit.c
branches/soc-2011-tomato/source/blender/editors/space_nla/nla_intern.h
branches/soc-2011-tomato/source/blender/editors/space_node/node_add.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_edit.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_group.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_intern.h
branches/soc-2011-tomato/source/blender/editors/space_node/node_relationships.c
branches/soc-2011-tomato/source/blender/editors/space_script/script_edit.c
branches/soc-2011-tomato/source/blender/editors/space_script/script_intern.h
branches/soc-2011-tomato/source/blender/editors/space_script/script_ops.c
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2011-tomato/source/blender/editors/space_text/text_ops.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_fly.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_conversions.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_generics.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_manipulator.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_ops.c
branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_smart_stitch.c
branches/soc-2011-tomato/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
branches/soc-2011-tomato/source/blender/gpu/intern/gpu_buffers.c
branches/soc-2011-tomato/source/blender/gpu/shaders/gpu_shader_material.glsl
branches/soc-2011-tomato/source/blender/makesdna/DNA_action_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_lattice_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_screen_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2011-tomato/source/blender/makesrna/RNA_access.h
branches/soc-2011-tomato/source/blender/makesrna/RNA_enum_types.h
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_access.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_action.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_define.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_object.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_scene.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_screen.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_space.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_wm.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_wm_api.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_armature.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_array.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_bevel.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_boolean.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_boolean_util.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_build.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_cast.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_cloth.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_collision.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_curve.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_decimate.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_displace.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_dynamicpaint.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_edgesplit.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_explode.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_fluidsim.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_hook.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_laplaciansmooth.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_lattice.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_mask.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_meshcache.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_meshdeform.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_mirror.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_none.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_ocean.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_particleinstance.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_remesh.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_screw.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_shrinkwrap.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_skin.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_smoke.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_smooth.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_softbody.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_solidify.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_subsurf.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_surface.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_triangulate.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_util.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_uvwarp.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_warp.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_wave.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_weightvgedit.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_weightvgmix.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_weightvgproximity.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_common.c
branches/soc-2011-tomato/source/blender/nodes/intern/node_common.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_attribute.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_common.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_common.c
branches/soc-2011-tomato/source/blender/python/BPY_extern.h
branches/soc-2011-tomato/source/blender/python/bmesh/bmesh_py_types.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_app.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_driver.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_interface.c
branches/soc-2011-tomato/source/blender/render/intern/source/pipeline.c
branches/soc-2011-tomato/source/blender/render/intern/source/shadbuf.c
branches/soc-2011-tomato/source/blender/windowmanager/SConscript
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_files.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_window.c
branches/soc-2011-tomato/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2011-tomato/source/creator/CMakeLists.txt
branches/soc-2011-tomato/source/creator/creator.c
branches/soc-2011-tomato/source/tools/update_themes.py
Added Paths:
-----------
branches/soc-2011-tomato/doc/python_api/examples/bpy.types.WindowManager.popup_menu.py
branches/soc-2011-tomato/intern/cycles/kernel/kernel_jitter.h
branches/soc-2011-tomato/source/blender/bmesh/tools/bmesh_path.c
branches/soc-2011-tomato/source/blender/bmesh/tools/bmesh_path.h
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_path.c
Removed Paths:
-------------
branches/soc-2011-tomato/extern/libmv/libmv/tracking/esm_region_tracker.cc
branches/soc-2011-tomato/extern/libmv/libmv/tracking/lmicklt_region_tracker.cc
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/tags/blender-2.67b-release/blender:57122
/trunk/blender:36831-57133
+ /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/tags/blender-2.67b-release/blender:57122
/trunk/blender:36831-57345
Modified: branches/soc-2011-tomato/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/CMakeLists.txt 2013-06-10 12:19:39 UTC (rev 57347)
+++ branches/soc-2011-tomato/CMakeLists.txt 2013-06-10 12:33:07 UTC (rev 57348)
@@ -118,9 +118,10 @@
option(WITH_INTERNATIONAL "Enable I18N (International fonts and text)" ON)
option(WITH_PYTHON "Enable Embedded Python API (only disable for development)" ON)
-option(WITH_PYTHON_SECURITY "Disables execution of scripts within blend files by default (recommend to leave off)" OFF)
+option(WITH_PYTHON_SECURITY "Disables execution of scripts within blend files by default" ON)
mark_as_advanced(WITH_PYTHON) # dont want people disabling this unless they really know what they are doing.
mark_as_advanced(WITH_PYTHON_SECURITY) # some distributions see this as a security issue, rather than have them patch it, make a build option.
+set(WITH_PYTHON_SECURITY ON CACHE BOOL "ON" FORCE) # temp force on.
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)
@@ -931,20 +932,26 @@
# include(${CMAKE_ROOT}/Modules/Platform/Windows-cl.cmake)
if(CMAKE_COMPILER_IS_GNUCC)
- set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/mingw32)
include(CheckCSourceCompiles)
# Setup 64bit and 64bit windows systems
CHECK_C_SOURCE_COMPILES("
#ifndef __MINGW64__
#error
#endif
- main(){}
+ int main(void) { return 0; }
"
WITH_MINGW64)
if(WITH_MINGW64)
message(STATUS "Compiling for 64 bit with MinGW-w64.")
set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/mingw64)
+ else()
+ message(STATUS "Compiling for 32 bit with MinGW-w32.")
+ set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/mingw32)
+
+ if(WITH_RAYOPTIMIZATION)
+ message(WARNING "MinGW-w32 is known to be unstable with 'WITH_RAYOPTIMIZATION' option enabled.")
+ endif()
endif()
else()
# Setup 64bit and 64bit windows systems
@@ -1088,11 +1095,7 @@
set(PNG_LIBPATH ${PNG}/lib) # not cmake defined
set(ZLIB_INCLUDE_DIRS ${LIBDIR}/zlib/include)
- if(CMAKE_CL_64)
- set(ZLIB_LIBRARIES ${LIBDIR}/zlib/lib/libz.lib)
- else()
- set(ZLIB_LIBRARIES ${LIBDIR}/zlib/lib/zlib.lib)
- endif()
+ set(ZLIB_LIBRARIES ${LIBDIR}/zlib/lib/libz_st.lib)
set(PTHREADS_INCLUDE_DIRS ${LIBDIR}/pthreads/include)
set(PTHREADS_LIBRARIES ${LIBDIR}/pthreads/lib/pthreadVC2.lib)
Modified: branches/soc-2011-tomato/SConstruct
===================================================================
--- branches/soc-2011-tomato/SConstruct 2013-06-10 12:19:39 UTC (rev 57347)
+++ branches/soc-2011-tomato/SConstruct 2013-06-10 12:33:07 UTC (rev 57348)
@@ -910,7 +910,6 @@
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc', 'linuxcross'):
dllsources = []
- dllsources += ['${BF_ZLIB_LIBPATH}/zlib.dll']
# Used when linking to libtiff was dynamic
# keep it here until compilation on all platform would be ok
# dllsources += ['${BF_TIFF_LIBPATH}/${BF_TIFF_LIB}.dll']
Modified: branches/soc-2011-tomato/build_files/build_environment/install_deps.sh
===================================================================
--- branches/soc-2011-tomato/build_files/build_environment/install_deps.sh 2013-06-10 12:19:39 UTC (rev 57347)
+++ branches/soc-2011-tomato/build_files/build_environment/install_deps.sh 2013-06-10 12:33:07 UTC (rev 57348)
@@ -3091,6 +3091,7 @@
if $ALL_STATIC; then
INFO "LLIB = ["xml2", "expat"] + LLIB"
+ fi
INFO ""
INFO "NOTE: static build with scons are very tricky to set-up, if you choose that option"
Modified: branches/soc-2011-tomato/build_files/buildbot/master.cfg
===================================================================
--- branches/soc-2011-tomato/build_files/buildbot/master.cfg 2013-06-10 12:19:39 UTC (rev 57347)
+++ branches/soc-2011-tomato/build_files/buildbot/master.cfg 2013-06-10 12:33:07 UTC (rev 57348)
@@ -28,9 +28,40 @@
from buildbot.changes.svnpoller import SVNPoller
c['change_source'] = SVNPoller(
- 'https://svn.blender.org/svnroot/bf-blender/trunk/',
- pollinterval=1200)
+ 'https://svn.blender.org/svnroot/bf-blender/trunk/',
+ pollinterval=1200)
+# SCHEDULERS
+#
+# Decide how to react to incoming changes.
+
+# from buildbot.scheduler import Scheduler
+from buildbot.schedulers import timed
+
+c['schedulers'] = []
+
+def schedule_build(name, hour, minute=0):
+ c['schedulers'].append(timed.Nightly(name='nightly ' + name,
+ builderNames=[name],
+ hour=hour,
+ minute=minute))
+
+"""
+schedule_cycle = 4
+
+for i in range(0, schedule_cycle):
+ names = []
+ for j in range(0, len(buildernames)):
+ if j % schedule_cycle == i:
+ names += [buildernames[j]]
+
+ print(names)
+ c['schedulers'].append(timed.Nightly(name='nightly' + str(i),
+ builderNames=names,
+ hour=3+i,
+ minute=0))
+"""
+
# BUILDERS
#
# The 'builders' list defines the Builders, which tell Buildbot how to perform a build:
@@ -53,7 +84,7 @@
buildernames = []
-def add_builder(c, name, libdir, factory, branch='', rsync=False):
+def add_builder(c, name, libdir, factory, branch='', rsync=False, hour=3, minute=0):
slavenames = []
for slave in master_private.slaves:
@@ -65,6 +96,8 @@
c['builders'].append(BuilderConfig(name=name, slavenames=slavenames, factory=f, category='blender'))
buildernames.append(name)
+ schedule_build(name, hour, minute)
+
# common steps
@@ -74,11 +107,9 @@
else:
return SVN(baseURL='https://svn.blender.org/svnroot/bf-blender/%%BRANCH%%/blender', mode='update', defaultBranch='trunk', workdir='blender')
-
def lib_svn_step(dir):
return SVN(name='lib svn', baseURL='https://svn.blender.org/svnroot/bf-blender/%%BRANCH%%/lib/' + dir, mode='update', defaultBranch='trunk', workdir='lib/' + dir)
-
def rsync_step(id, branch, rsync_script):
return ShellCommand(name='rsync', command=['python', rsync_script, id, branch], description='uploading', descriptionDone='uploaded', workdir='install')
@@ -112,55 +143,21 @@
# builders
-add_builder(c, 'mac_x86_64_10_6_scons', 'darwin-9.x.universal', generic_builder, '', True)
-add_builder(c, 'mac_x86_64_10_5_scons', '', generic_builder, '', True)
-#add_builder(c, 'salad_mac_x86_64_scons', 'darwin-9.x.universal', generic_builder, 'soc-2011-salad')
-add_builder(c, 'mac_i386_scons', 'darwin-9.x.universal', generic_builder)
-add_builder(c, 'mac_ppc_scons', 'darwin-9.x.universal', generic_builder)
-#add_builder(c, 'linux_x86_64_cmake', '', generic_builder)
-#add_builder(c, 'linux_glibc27_i386_scons', '', generic_builder)
-add_builder(c, 'linux_glibc211_i386_scons', '', generic_builder)
-#add_builder(c, 'salad_linux_i386_scons', '', generic_builder, 'soc-2011-salad')
-#add_builder(c, 'linux_glibc27_x86_64_scons', '', generic_builder)
-add_builder(c, 'linux_glibc211_x86_64_scons', '', generic_builder)
-#add_builder(c, 'salad_linux_x86_64_scons', '', generic_builder, 'soc-2011-salad')
-add_builder(c, 'win32_scons', 'windows', generic_builder)
-#add_builder(c, 'salad_win32_scons', 'windows', generic_builder, 'soc-2011-salad')
-add_builder(c, 'win64_scons', 'win64', generic_builder)
-add_builder(c, 'mingw_win32_scons', 'mingw32', generic_builder)
-add_builder(c, 'mingw_win64_scons', 'mingw64', generic_builder)
-#add_builder(c, 'freebsd_i386_cmake', '', generic_builder)
-#add_builder(c, 'freebsd_x86_64_cmake', '', generic_builder)
+add_builder(c, 'mac_x86_64_10_6_scons', 'darwin-9.x.universal', generic_builder, hour=5)
+add_builder(c, 'mac_i386_10_6_scons', 'darwin-9.x.universal', generic_builder, hour=11)
+add_builder(c, 'linux_glibc211_i386_scons', '', generic_builder, hour=1)
+add_builder(c, 'linux_glibc211_x86_64_scons', '', generic_builder, hour=2)
+add_builder(c, 'win32_scons', 'windows', generic_builder, hour=1)
+add_builder(c, 'win64_scons', 'win64', generic_builder, hour=2)
+#add_builder(c, 'mingw_win32_scons', 'mingw32', generic_builder, hour=4)
+add_builder(c, 'mingw_win64_scons', 'mingw64', generic_builder, hour=3)
+#add_builder(c, 'freebsd_i386_cmake', '', generic_builder, hour=1)
+#add_builder(c, 'freebsd_x86_64_cmake', '', generic_builder, hour=2)
-# SCHEDULERS
-#
-# Decide how to react to incoming changes.
+# Multiview branch
+add_builder(c, 'multiview_win64_scons', 'win64', generic_builder, 'multiview', hour=4)
+add_builder(c, 'multiview_win32_scons', 'windows', generic_builder, 'multiview', hour=5)
-# from buildbot.scheduler import Scheduler
-from buildbot.schedulers import timed
-
-c['schedulers'] = []
-#c['schedulers'].append(Scheduler(name="all", branch=None,
-# treeStableTimer=None,
-# builderNames=[]))
-#c['schedulers'].append(timed.Periodic(name="nightly",
-# builderNames=buildernames,
-# periodicBuildTimer=24*60*60))
-
-schedule_cycle = 4
-
-for i in range(0, schedule_cycle):
- names = []
- for j in range(0, len(buildernames)):
- if j % schedule_cycle == i:
- names += [buildernames[j]]
-
- print(names)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list