[Bf-blender-cvs] [cdc7c1f] experimental-build: Revert to 1604a26fe6, with buildbot tweaks.
Bastien Montagne
noreply at git.blender.org
Sun Oct 11 22:14:48 CEST 2015
Commit: cdc7c1fd7cfc7f1bd59161a2f77fc4e54ffe78b5
Author: Bastien Montagne
Date: Sun Oct 11 22:13:49 2015 +0200
Branches: experimental-build
https://developer.blender.org/rBcdc7c1fd7cfc7f1bd59161a2f77fc4e54ffe78b5
Revert to 1604a26fe6, with buildbot tweaks.
===================================================================
M CMakeLists.txt
M SConstruct
M build_files/buildbot/slave_test.py
M build_files/cmake/macros.cmake
M build_files/scons/tools/Blender.py
M doc/python_api/examples/bpy.ops.2.py
M doc/python_api/examples/bpy.props.2.py
M doc/python_api/examples/bpy.props.py
M doc/python_api/examples/bpy.types.Menu.2.py
M doc/python_api/examples/bpy.types.Menu.py
M doc/python_api/rst/bge.constraints.rst
M doc/python_api/rst/bge.render.rst
M doc/python_api/rst/bge_types/bge.types.KX_GameObject.rst
M doc/python_api/rst/bge_types/bge.types.KX_Scene.rst
M doc/python_api/rst/bge_types/bge.types.SCA_ISensor.rst
M doc/python_api/rst/info_gotcha.rst
M doc/python_api/sphinx_doc_gen.py
M extern/libmv/intern/stub.cc
M extern/rangetree/range_tree_c_api.h
M intern/cycles/blender/addon/__init__.py
M intern/cycles/blender/addon/engine.py
M intern/cycles/blender/addon/properties.py
M intern/cycles/blender/addon/ui.py
M intern/cycles/blender/blender_camera.cpp
M intern/cycles/blender/blender_curves.cpp
M intern/cycles/blender/blender_mesh.cpp
M intern/cycles/blender/blender_python.cpp
M intern/cycles/blender/blender_session.cpp
M intern/cycles/blender/blender_session.h
M intern/cycles/blender/blender_shader.cpp
M intern/cycles/blender/blender_sync.cpp
M intern/cycles/blender/blender_sync.h
M intern/cycles/bvh/bvh.cpp
M intern/cycles/bvh/bvh.h
M intern/cycles/device/device_cpu.cpp
M intern/cycles/device/device_cuda.cpp
M intern/cycles/device/device_multi.cpp
M intern/cycles/device/device_network.cpp
M intern/cycles/device/device_opencl.cpp
M intern/cycles/kernel/closure/bsdf_ashikhmin_shirley.h
M intern/cycles/kernel/closure/bsdf_ashikhmin_velvet.h
M intern/cycles/kernel/closure/bsdf_microfacet.h
M intern/cycles/kernel/geom/geom.h
M intern/cycles/kernel/geom/geom_bvh_shadow.h
M intern/cycles/kernel/geom/geom_bvh_subsurface.h
M intern/cycles/kernel/geom/geom_bvh_traversal.h
M intern/cycles/kernel/geom/geom_bvh_volume.h
M intern/cycles/kernel/geom/geom_motion_triangle.h
M intern/cycles/kernel/geom/geom_qbvh_shadow.h
M intern/cycles/kernel/geom/geom_qbvh_subsurface.h
M intern/cycles/kernel/geom/geom_qbvh_traversal.h
M intern/cycles/kernel/geom/geom_qbvh_volume.h
M intern/cycles/kernel/geom/geom_triangle_intersect.h
M intern/cycles/kernel/geom/geom_volume.h
M intern/cycles/kernel/kernel_projection.h
M intern/cycles/kernel/kernel_shader.h
M intern/cycles/kernel/kernel_textures.h
M intern/cycles/kernel/kernel_types.h
M intern/cycles/kernel/osl/osl_closures.h
M intern/cycles/kernel/osl/osl_services.cpp
M intern/cycles/kernel/shaders/node_image_texture.osl
M intern/cycles/kernel/shaders/node_math.osl
M intern/cycles/kernel/svm/svm_image.h
M intern/cycles/render/bake.cpp
M intern/cycles/render/bake.h
M intern/cycles/render/camera.cpp
M intern/cycles/render/camera.h
M intern/cycles/render/graph.cpp
M intern/cycles/render/graph.h
M intern/cycles/render/image.cpp
M intern/cycles/render/image.h
M intern/cycles/render/light.cpp
M intern/cycles/render/mesh.cpp
M intern/cycles/render/mesh.h
M intern/cycles/render/nodes.cpp
M intern/cycles/render/nodes.h
M intern/cycles/render/object.cpp
M intern/cycles/render/osl.cpp
M intern/cycles/render/particles.cpp
M intern/cycles/render/scene.cpp
M intern/cycles/render/scene.h
M intern/cycles/render/session.cpp
M intern/cycles/render/shader.cpp
M intern/cycles/render/shader.h
M intern/cycles/render/svm.cpp
M intern/cycles/render/tables.cpp
M intern/cycles/util/util_math_fast.h
M intern/cycles/util/util_transform.cpp
M intern/cycles/util/util_transform.h
M intern/ghost/GHOST_C-api.h
M intern/ghost/GHOST_Types.h
M intern/ghost/intern/GHOST_ContextWGL.cpp
M intern/ghost/intern/GHOST_Debug.h
M intern/ghost/intern/GHOST_NDOFManagerX11.cpp
M intern/ghost/intern/GHOST_SystemWin32.cpp
M intern/guardedalloc/intern/mallocn_guarded_impl.c
M release/datafiles/fonts/droidsans.ttf.gz
M release/scripts/freestyle/modules/freestyle/predicates.py
M release/scripts/freestyle/modules/parameter_editor.py
M release/scripts/modules/bl_i18n_utils/settings.py
M release/scripts/modules/bl_i18n_utils/utils_spell_check.py
M release/scripts/modules/bpy_extras/view3d_utils.py
M release/scripts/modules/bpy_types.py
M release/scripts/presets/keyconfig/3dsmax.py
M release/scripts/presets/keyconfig/maya.py
M release/scripts/startup/bl_operators/__init__.py
M release/scripts/startup/bl_operators/add_mesh_torus.py
M release/scripts/startup/bl_operators/clip.py
M release/scripts/startup/bl_operators/screen_play_rendered_anim.py
M release/scripts/startup/bl_ui/__init__.py
M release/scripts/startup/bl_ui/properties_constraint.py
M release/scripts/startup/bl_ui/properties_data_camera.py
M release/scripts/startup/bl_ui/properties_data_curve.py
M release/scripts/startup/bl_ui/properties_data_mesh.py
M release/scripts/startup/bl_ui/properties_freestyle.py
M release/scripts/startup/bl_ui/properties_game.py
M release/scripts/startup/bl_ui/properties_grease_pencil_common.py
M release/scripts/startup/bl_ui/properties_mask_common.py
M release/scripts/startup/bl_ui/properties_material.py
M release/scripts/startup/bl_ui/properties_particle.py
M release/scripts/startup/bl_ui/properties_physics_common.py
M release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
M release/scripts/startup/bl_ui/properties_render.py
M release/scripts/startup/bl_ui/properties_render_layer.py
M release/scripts/startup/bl_ui/properties_scene.py
M release/scripts/startup/bl_ui/properties_texture.py
M release/scripts/startup/bl_ui/space_clip.py
M release/scripts/startup/bl_ui/space_dopesheet.py
M release/scripts/startup/bl_ui/space_filebrowser.py
M release/scripts/startup/bl_ui/space_graph.py
M release/scripts/startup/bl_ui/space_image.py
M release/scripts/startup/bl_ui/space_info.py
M release/scripts/startup/bl_ui/space_logic.py
M release/scripts/startup/bl_ui/space_nla.py
M release/scripts/startup/bl_ui/space_node.py
M release/scripts/startup/bl_ui/space_sequencer.py
M release/scripts/startup/bl_ui/space_time.py
M release/scripts/startup/bl_ui/space_userpref.py
M release/scripts/startup/bl_ui/space_view3d.py
M release/scripts/startup/bl_ui/space_view3d_toolbar.py
M release/scripts/startup/nodeitems_builtins.py
M release/scripts/templates_py/addon_add_object.py
M source/blender/blenfont/BLF_api.h
M source/blender/blenfont/BLF_translation.h
M source/blender/blenfont/CMakeLists.txt
M source/blender/blenfont/intern/blf_font.c
M source/blender/blenfont/intern/blf_glyph.c
M source/blender/blenfont/intern/blf_internal_types.h
M source/blender/blenfont/intern/blf_lang.c
M source/blender/blenfont/intern/blf_translation.c
M source/blender/blenkernel/BKE_blender.h
M source/blender/blenkernel/BKE_brush.h
M source/blender/blenkernel/BKE_camera.h
M source/blender/blenkernel/BKE_global.h
M source/blender/blenkernel/BKE_image.h
M source/blender/blenkernel/BKE_mball.h
M source/blender/blenkernel/BKE_mball_tessellate.h
M source/blender/blenkernel/BKE_mesh.h
M source/blender/blenkernel/BKE_nla.h
M source/blender/blenkernel/BKE_node.h
M source/blender/blenkernel/BKE_paint.h
M source/blender/blenkernel/BKE_pbvh.h
M source/blender/blenkernel/BKE_scene.h
M source/blender/blenkernel/BKE_sequencer.h
M source/blender/blenkernel/BKE_tracking.h
M source/blender/blenkernel/BKE_treehash.h
M source/blender/blenkernel/BKE_writeavi.h
M source/blender/blenkernel/BKE_writeffmpeg.h
M source/blender/blenkernel/BKE_writeframeserver.h
M source/blender/blenkernel/CMakeLists.txt
M source/blender/blenkernel/intern/DerivedMesh.c
M source/blender/blenkernel/intern/armature.c
M source/blender/blenkernel/intern/blender.c
M source/blender/blenkernel/intern/bpath.c
M source/blender/blenkernel/intern/brush.c
M source/blender/blenkernel/intern/camera.c
M source/blender/blenkernel/intern/cdderivedmesh.c
M source/blender/blenkernel/intern/customdata.c
M source/blender/blenkernel/intern/deform.c
M source/blender/blenkernel/intern/depsgraph.c
M source/blender/blenkernel/intern/gpencil.c
M source/blender/blenkernel/intern/icons.c
M source/blender/blenkernel/intern/image.c
M source/blender/blenkernel/intern/material.c
M source/blender/blenkernel/intern/mball_tessellate.c
M source/blender/blenkernel/intern/mesh.c
M source/blender/blenkernel/intern/mesh_evaluate.c
M source/blender/blenkernel/intern/mesh_mapping.c
M source/blender/blenkernel/intern/mesh_validate.c
M source/blender/blenkernel/intern/modifiers_bmesh.c
M source/blender/blenkernel/intern/nla.c
M source/blender/blenkernel/intern/node.c
M source/blender/blenkernel/intern/object.c
M source/blender/blenkernel/intern/ocean.c
M source/blender/blenkernel/intern/packedFile.c
M source/blender/blenkernel/intern/paint.c
M source/blender/blenkernel/intern/particle.c
M source/blender/blenkernel/intern/pbvh.c
M source/blender/blenkernel/intern/pbvh_bmesh.c
M source/blender/blenkernel/intern/pbvh_intern.h
M source/blender/blenkernel/intern/scene.c
M source/blender/blenkernel/intern/seqcache.c
M source/blender/blenkernel/intern/sequencer.c
M source/blender/blenkernel/intern/subsurf_ccg.c
M source/blender/blenkernel/intern/tracking.c
M source/blender/blenkernel/intern/tracking_auto.c
M source/blender/blenkernel/intern/unit.c
M source/blender/blenkernel/intern/writeavi.c
M source/blender/blenkernel/intern/writeffmpeg.c
M source/blender/blenkernel/intern/writeframeserver.c
M source/blender/blenlib/BLI_compiler_typecheck.h
M source/blender/blenlib/BLI_edgehash.h
M source/blender/blenlib/BLI_ghash.h
M source/blender/blenlib/BLI_math_base.h
M source/blender/blenlib/BLI_math_vector.h
M source/blender/blenlib/BLI_string.h
M source/blender/blenlib/BLI_task.h
M source/blender/blenlib/BLI_threads.h
M source/blender/blenlib/CMakeLists.txt
M source/blender/blenlib/intern/BLI_filelist.c
M source/blender/blenlib/intern/BLI_ghash.c
M source/blender/blenlib/intern/BLI_heap.c
M source/blender/blenlib/intern/convexhull2d.c
M source/blender/blenlib/intern/edgehash.c
M source/blender/blenlib/intern/freetypefont.c
M source/blender/blenlib/intern/hash_md5.c
M source/blender/blenlib/intern/math_base.c
M source/blender/blenlib/intern/math_base_inline.c
M source/blender/blenlib/intern/math_rotation.c
M source/blender/blenlib/intern/math_vector.c
M source/blender/blenlib/intern/path_util.c
M source/blender/blenlib/intern/polyfill2d.c
M source/blender/blenlib/intern/polyfill2d_beautify.c
M source/blender/blenlib/intern/rand.c
M source/blender/blenlib/intern/scanfill_utils.c
M source/blender/blenlib/intern/string.c
M source/blender/blenlib/intern/system.c
M source/blender/blenlib/intern/task.c
M source/blender/blenlib/intern/threads.c
M source/blender/blenlib/intern/timecode.c
M source/blender/blenloader/BLO_undofile.h
M source/blender/blenloader/intern/readfile.c
M source/blender/blenloader/intern/undofile.c
M source/blender/blenloader/intern/versioning_270.c
M source/blender/blenloader/intern/versioning_legacy.c
M source/blender/blenloader/intern/writefile.c
M source/blender/bmesh/bmesh_class.h
M source/blender/bmesh/intern/bmesh_construct.c
M source/blender/bmesh/intern/bmesh_construct.h
M source/blender/bmesh/intern/bmesh_core.c
M source/blender/bmesh/intern/bmesh_core.h
M source/blender/bmesh/intern/bmesh_edgeloop.c
M source/blender/bmesh/intern/bmesh_edgeloop.h
M source/blender/bmesh/intern/bmesh_interp.c
M source/blender/bmesh/intern/bmesh_iterators.c
M source/blender/bmesh/intern/bmesh_iterators.h
M source/blender/bmesh/intern/bmesh_log.c
M source/blender/bmesh/intern/bmesh_log.h
M source/blender/bmesh/intern/bmesh_marking.c
M source/blender/bmesh/intern/bmesh_marking.h
M source/blender/bmesh/intern/bmesh_mesh.c
M source/blender/bmesh/intern/bmesh_mesh.h
M source/blender/bmesh/intern/bmesh_mesh_conv.c
M source/blender/bmesh/intern/bmesh_mesh_conv.h
M source/blender/bmesh/intern/bmesh_mesh_validate.c
M source/blender/bmesh/intern/bmesh_mods.c
M source/blender/bmesh/intern/bmesh_mods.h
M source/blender/bmesh/intern/bmesh_operator_api.h
M source/blender/bmesh/intern/bmesh_operator_api_inline.h
M source/blender/bmesh/intern/bmesh_operators.c
M source/blender/bmesh/intern/bmesh_operators.h
M source/blender/bmesh/intern/bmesh_polygon.c
M source/blender/bmesh/intern/bmesh_polygon.h
M source/blender/bmesh/intern/bmesh_private.h
M source/blender/bmesh/intern/bmesh_queries.c
M source/blender/bmesh/intern/bmesh_queries.h
M source/blender/bmesh/intern/bmesh_structure.c
M source/blender/bmesh/intern/bmesh_structure.h
M source/blender/bmesh/intern/bmesh_walkers.c
M source/blender/bmesh/intern/bmesh_walkers.h
M source/blender/bmesh/operators/bmo_subdivide.c
M source/blender/bmesh/tools/bmesh_beautify.c
M source/blender/bmesh/tools/bmesh_bevel.c
M source/blender/bmesh/tools/bmesh_bevel.h
M source/blender/bmesh/tools/bmesh_decimate.h
M source/blender/bmesh/tools/bmesh_decimate_collapse.c
M source/blender/bmesh/tools/bmesh_decimate_dissolve.c
M source/blender/bmesh/tools/bmesh_edgenet.c
M source/blender/bmesh/tools/bmesh_edgenet.h
M source/blender/bmesh/tools/bmesh_intersect.c
M source/blender/bmesh/tools/bmesh_region_match.c
M source/blender/bmesh/tools/bmesh_triangulate.h
M source/blender/bmesh/tools/bmesh_wireframe.c
M source/blender/collada/AnimationExporter.h
M source/blender/collada/GeometryExporter.cpp
M source/blender/collada/GeometryExporter.h
M source/blender/collada/ImageExporter.cpp
M source/blender/compositor/CMakeLists.txt
M source/blender/compositor/COM_compositor.h
M source/blender/compositor/intern/COM_CompositorContext.h
M source/blender/compositor/intern/COM_Converter.cpp
M source/blender/compositor/intern/COM_ExecutionGroup.cpp
M source/blender/compositor/intern/COM_ExecutionSystem.cpp
M source/blender/compositor/intern/COM_ExecutionSystem.h
M source/blender/compositor/intern/COM_compositor.cpp
M source/blender/compositor/nodes/COM_CompositorNode.cpp
M source/blender/compositor/nodes/COM_ImageNode.cpp
M source/blender/compositor/nodes/COM_ImageNode.h
M source/blender/compositor/nodes/COM_OutputFileNode.cpp
M source/blender/compositor/nodes/COM_RenderLayersNode.cpp
M source/blender/compositor/nodes/COM_SplitViewerNode.cpp
M source/blender/compositor/nodes/COM_ViewerNode.cpp
M source/blender/compositor/operations/COM_CompositorOperation.cpp
M source/blender/compositor/operations/COM_CompositorOperation.h
M source/blender/compositor/operations/COM_CropOperation.cpp
M source/blender/compositor/operations/COM_GlareGhostOperation.cpp
M source/blender/compositor/operations/COM_ImageOperation.cpp
M source/blender/compositor/operations/COM_ImageOperation.h
M source/blender/compositor/operations/COM_MultilayerImageOperation.cpp
M source/blender/compositor/operations/COM_MultilayerImageOperation.h
M source/blender/compositor/operations/COM_OutputFileOperation.cpp
M source/blender/compositor/operations/COM_OutputFileOperation.h
M source/blender/compositor/operations/COM_RenderLayersProg.cpp
M source/blender/compositor/operations/COM_RenderLayersProg.h
M source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
M source/blender/compositor/operations/COM_ViewerOperation.cpp
M source/blender/compositor/operations/COM_ViewerOperation.h
M source/blender/editors/animation/anim_channels_edit.c
M source/blender/editors/animation/anim_draw.c
M source/blender/editors/animation/anim_filter.c
M source/blender/editors/animation/anim_markers.c
M source/blender/editors/animation/keyframes_general.c
M source/blender/editors/armature/armature_ops.c
M source/blender/editors/armature/meshlaplacian.c
M source/blender/editors/armature/pose_slide.c
M source/blender/editors/curve/curve_ops.c
M source/blender/editors/curve/editcurve_add.c
M source/blender/editors/gpencil/drawgpencil.c
M source/blender/editors/gpencil/gpencil_paint.c
M source/blender/editors/include/ED_anim_api.h
M source/blender/editors/include/ED_mesh.h
M source/blender/editors/include/ED_paint.h
M source/blender/editors/include/ED_particle.h
M source/blender/editors/include/ED_screen.h
M source/blender/editors/include/ED_util.h
M source/blender/editors/include/ED_view3d.h
M source/blender/editors/include/UI_interface.h
M source/blender/editors/include/UI_resources.h
M source/blender/editors/include/UI_view2d.h
M source/blender/editors/interface/interface.c
M source/blender/editors/interface/interface_eyedropper.c
M source/blender/editors/interface/interface_handlers.c
M source/blender/editors/interface/interface_intern.h
M source/blender/editors/interface/interface_ops.c
M source/blender/editors/interface/interface_panel.c
M source/blender/editors/interface/interface_regions.c
M source/blender/editors/interface/interface_templates.c
M source/blender/editors/interface/interface_widgets.c
M source/blender/editors/interface/resources.c
M source/blender/editors/interface/view2d_ops.c
M source/blender/editors/mask/mask_draw.c
M source/blender/editors/mesh/editface.c
M source/blender/editors/mesh/editmesh_extrude.c
M source/blender/editors/mesh/editmesh_knife.c
M source/blender/editors/mesh/editmesh_knife_project.c
M source/blender/editors/mesh/editmesh_path.c
M source/blender/editors/mesh/editmesh_rip.c
M source/blender/editors/mesh/editmesh_select.c
M source/blender/editors/mesh/editmesh_utils.c
M source/blender/editors/mesh/mesh_ops.c
M source/blender/editors/mesh/meshtools.c
M source/blender/editors/object/object_bake_api.c
M source/blender/editors/object/object_edit.c
M source/blender/editors/object/object_intern.h
M source/blender/editors/object/object_modifier.c
M source/blender/editors/object/object_ops.c
M source/blender/editors/object/object_vgroup.c
M source/blender/editors/physics/particle_edit.c
M source/blender/editors/render/render_intern.h
M source/blender/editors/render/render_internal.c
M source/blender/editors/render/render_opengl.c
M source/blender/editors/render/render_ops.c
M source/blender/editors/render/render_preview.c
M source/blender/editors/render/render_shading.c
M source/blender/editors/screen/area.c
M source/blender/editors/screen/screen_edit.c
M source/blender/editors/screen/screen_ops.c
M source/blender/editors/screen/screendump.c
M source/blender/editors/sculpt_paint/paint_curve.c
M source/blender/editors/sculpt_paint/paint_image.c
M source/blender/editors/sculpt_paint/paint_image_2d.c
M source/blender/editors/sculpt_paint/paint_image_proj.c
M source/blender/editors/sculpt_paint/paint_stroke.c
M source/blender/editors/sculpt_paint/paint_undo.c
M source/blender/editors/sculpt_paint/paint_utils.c
M source/blender/editors/sculpt_paint/paint_vertex.c
M source/blender/editors/sculpt_paint/sculpt.c
M source/blender/editors/space_action/action_data.c
M source/blender/editors/space_action/action_edit.c
M source/blender/editors/space_action/action_intern.h
M source/blender/editors/space_action/action_ops.c
M source/blender/editors/space_clip/clip_draw.c
M source/blender/editors/space_clip/clip_utils.c
M source/blender/editors/space_clip/tracking_ops.c
M source/blender/editors/space_console/console_ops.c
M source/blender/editors/space_file/file_draw.c
M source/blender/editors/space_file/filelist.c
M source/blender/editors/space_file/space_file.c
M source/blender/editors/space_graph/graph_draw.c
M source/blender/editors/space_graph/graph_edit.c
M source/blender/editors/space_graph/graph_intern.h
M source/blender/editors/space_graph/graph_ops.c
M source/blender/editors/space_graph/graph_select.c
M source/blender/editors/space_image/image_buttons.c
M source/blender/editors/space_image/image_draw.c
M source/blender/editors/space_image/image_edit.c
M source/blender/editors/space_image/image_ops.c
M source/blender/editors/space_image/space_image.c
M source/blender/editors/space_info/info_stats.c
M source/blender/editors/space_logic/logic_window.c
M source/blender/editors/space_nla/nla_channels.c
M source/blender/editors/space_nla/nla_draw.c
M source/blender/editors/space_nla/nla_edit.c
M source/blender/editors/space_nla/nla_intern.h
M source/blender/editors/space_nla/nla_ops.c
M source/blender/editors/space_node/drawnode.c
M source/blender/editors/space_node/node_draw.c
M source/blender/editors/space_node/node_edit.c
M source/blender/editors/space_node/node_group.c
M source/blender/editors/space_node/node_intern.h
M source/blender/editors/space_node/node_ops.c
M source/blender/editors/space_node/node_relationships.c
M source/blender/editors/space_node/node_view.c
M source/blender/editors/space_node/space_node.c
M source/blender/editors/space_outliner/outliner_ops.c
M source/blender/editors/space_outliner/outliner_select.c
M source/blender/editors/space_outliner/outliner_tools.c
M source/blender/editors/space_outliner/outliner_tree.c
M source/blender/editors/space_outliner/space_outliner.c
M source/blender/editors/space_sequencer/sequencer_add.c
M source/blender/editors/space_sequencer/sequencer_draw.c
M source/blender/editors/space_sequencer/sequencer_edit.c
M source/blender/editors/space_sequencer/sequencer_intern.h
M source/blender/editors/space_sequencer/sequencer_scopes.c
M source/blender/editors/space_sequencer/sequencer_view.c
M source/blender/editors/space_sequencer/space_sequencer.c
M source/blender/editors/space_text/text_ops.c
M source/blender/editors/space_view3d/drawmesh.c
M source/blender/editors/space_view3d/drawobject.c
M source/blender/editors/space_view3d/drawvolume.c
M source/blender/editors/space_view3d/space_view3d.c
M source/blender/editors/space_view3d/view3d_draw.c
M source/blender/editors/space_view3d/view3d_edit.c
M source/blender/editors/space_view3d/view3d_fly.c
M source/blender/editors/space_view3d/view3d_ops.c
M source/blender/editors/space_view3d/view3d_select.c
M source/blender/editors/space_view3d/view3d_view.c
M source/blender/editors/space_view3d/view3d_walk.c
M source/blender/editors/transform/transform.c
M source/blender/editors/transform/transform.h
M source/blender/editors/transform/transform_constraints.c
M source/blender/editors/transform/transform_conversions.c
M source/blender/editors/transform/transform_generics.c
M source/blender/editors/transform/transform_manipulator.c
M source/blender/editors/util/CMakeLists.txt
M source/blender/editors/util/editmode_undo.c
M source/blender/editors/util/undo.c
M source/blender/editors/util/util_intern.h
M source/blender/editors/uvedit/uvedit_ops.c
M source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
M source/blender/freestyle/intern/python/BPy_Operators.cpp
M source/blender/gpu/CMakeLists.txt
M source/blender/gpu/GPU_draw.h
M source/blender/gpu/GPU_extensions.h
M source/blender/gpu/SConscript
M source/blender/gpu/intern/gpu_draw.c
M source/blender/gpu/intern/gpu_extensions.c
M source/blender/ikplugin/intern/itasc_plugin.cpp
M source/blender/imbuf/CMakeLists.txt
M source/blender/imbuf/IMB_imbuf.h
M source/blender/imbuf/IMB_imbuf_types.h
M source/blender/imbuf/IMB_thumbs.h
M source/blender/imbuf/intern/IMB_anim.h
M source/blender/imbuf/intern/IMB_metadata.h
M source/blender/imbuf/intern/anim_movie.c
M source/blender/imbuf/intern/cineon/logImageCore.h
M source/blender/imbuf/intern/dds/BlockDXT.h
M source/blender/imbuf/intern/dds/ColorBlock.h
M source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
M source/blender/imbuf/intern/dds/DirectDrawSurface.h
M source/blender/imbuf/intern/dds/Stream.h
M source/blender/imbuf/intern/indexer.c
M source/blender/imbuf/intern/metadata.c
M source/blender/imbuf/intern/openexr/openexr_api.cpp
M source/blender/imbuf/intern/openexr/openexr_multi.h
M source/blender/imbuf/intern/openexr/openexr_stub.cpp
M source/blender/imbuf/intern/thumbs.c
M source/blender/imbuf/intern/thumbs_blend.c
M source/blender/imbuf/intern/util.c
M source/blender/imbuf/intern/writeimage.c
M source/blender/makesdna/DNA_anim_types.h
M source/blender/makesdna/DNA_brush_types.h
M source/blender/makesdna/DNA_camera_types.h
M source/blender/makesdna/DNA_image_types.h
M source/blender/makesdna/DNA_lamp_types.h
M source/blender/makesdna/DNA_node_types.h
M source/blender/makesdna/DNA_object_force.h
M source/blender/makesdna/DNA_object_types.h
M source/blender/makesdna/DNA_scene_types.h
M source/blender/makesdna/DNA_screen_types.h
M source/blender/makesdna/DNA_sensor_types.h
M source/blender/makesdna/DNA_sequence_types.h
M source/blender/makesdna/DNA_space_types.h
M source/blender/makesdna/DNA_userdef_types.h
M source/blender/makesdna/DNA_view2d_types.h
M source/blender/makesdna/DNA_view3d_types.h
M source/blender/makesdna/DNA_windowmanager_types.h
M source/blender/makesrna/RNA_access.h
M source/blender/makesrna/RNA_enum_types.h
M source/blender/makesrna/intern/rna_ID.c
M source/blender/makesrna/intern/rna_action.c
M source/blender/makesrna/intern/rna_brush.c
M source/blender/makesrna/intern/rna_camera.c
M source/blender/makesrna/intern/rna_color.c
M source/blender/makesrna/intern/rna_constraint.c
M source/blender/makesrna/intern/rna_gpencil.c
M source/blender/makesrna/intern/rna_image.c
M source/blender/makesrna/intern/rna_image_api.c
M source/blender/makesrna/intern/rna_lamp.c
M source/blender/makesrna/intern/rna_main_api.c
M source/blender/makesrna/intern/rna_mesh.c
M source/blender/makesrna/intern/rna_nodetree.c
M source/blender/makesrna/intern/rna_object.c
M source/blender/makesrna/intern/rna_object_force.c
M source/blender/makesrna/intern/rna_particle.c
M source/blender/makesrna/intern/rna_render.c
M source/blender/makesrna/intern/rna_scene.c
M source/blender/makesrna/intern/rna_scene_api.c
M source/blender/makesrna/intern/rna_sculpt_paint.c
M source/blender/makesrna/intern/rna_sensor.c
M source/blender/makesrna/intern/rna_sequencer.c
M source/blender/makesrna/intern/rna_sequencer_api.c
M source/blender/makesrna/intern/rna_space.c
M source/blender/makesrna/intern/rna_ui_api.c
M source/blender/makesrna/intern/rna_userdef.c
M source/blender/makesrna/intern/rna_wm.c
M source/blender/modifiers/intern/MOD_array.c
M source/blender/modifiers/intern/MOD_build.c
M source/blender/modifiers/intern/MOD_cloth.c
M source/blender/modifiers/intern/MOD_correctivesmooth.c
M source/blender/modifiers/intern/MOD_decimate.c
M source/blender/modifiers/intern/MOD_mirror.c
M source/blender/modifiers/intern/MOD_screw.c
M source/blender/modifiers/intern/MOD_solidify.c
M source/blender/modifiers/intern/MOD_uvproject.c
M source/blender/modifiers/intern/MOD_weightvgmix.c
M source/blender/modifiers/intern/MOD_weightvgproximity.c
M source/blender/nodes/CMakeLists.txt
M source/blender/nodes/NOD_composite.h
M source/blender/nodes/NOD_static_types.h
M source/blender/nodes/composite/node_composite_tree.c
M source/blender/nodes/composite/node_composite_util.c
M source/blender/nodes/composite/nodes/node_composite_image.c
M source/blender/nodes/composite/nodes/node_composite_outputFile.c
M source/blender/nodes/intern/node_exec.c
M source/blender/nodes/intern/node_exec.h
M source/blender/nodes/shader/node_shader_tree.c
M source/blender/nodes/shader/nodes/node_shader_bsdf_anisotropic.c
M source/blender/nodes/shader/nodes/node_shader_bump.c
M source/blender/nodes/texture/node_texture_tree.c
M source/blender/physics/intern/BPH_mass_spring.cpp
M source/blender/python/bmesh/bmesh_py_ops_call.c
M source/blender/python/bmesh/bmesh_py_types.c
M source/blender/python/bmesh/bmesh_py_types.h
M source/blender/python/bmesh/bmesh_py_types_customdata.c
M source/blender/python/bmesh/bmesh_py_types_meshdata.c
M source/blender/python/bmesh/bmesh_py_types_select.c
M source/blender/python/bmesh/bmesh_py_utils.c
M source/blender/python/intern/bpy_app.c
M source/blender/python/intern/bpy_app_translations.c
M source/blender/python/intern/bpy_interface.c
M source/blender/python/intern/bpy_props.c
M source/blender/quicktime/apple/qtkit_export.m
M source/blender/quicktime/quicktime_export.h
M source/blender/render/extern/include/RE_bake.h
M source/blender/render/extern/include/RE_engine.h
M source/blender/render/extern/include/RE_pipeline.h
M source/blender/render/intern/include/render_result.h
M source/blender/render/intern/include/render_types.h
M source/blender/render/intern/source/bake_api.c
M source/blender/render/intern/source/convertblender.c
M source/blender/render/intern/source/envmap.c
M source/blender/render/intern/source/external_engine.c
M source/blender/render/intern/source/initrender.c
M source/blender/render/intern/source/multires_bake.c
M source/blender/render/intern/source/pipeline.c
M source/blender/render/intern/source/render_result.c
M source/blender/render/intern/source/render_texture.c
M source/blender/render/intern/source/rendercore.c
M source/blender/render/intern/source/shadeinput.c
M source/blender/render/intern/source/texture_ocean.c
M source/blender/render/intern/source/zbuf.c
M source/blender/windowmanager/CMakeLists.txt
M source/blender/windowmanager/WM_api.h
M source/blender/windowmanager/WM_types.h
M source/blender/windowmanager/intern/wm_draw.c
M source/blender/windowmanager/intern/wm_event_system.c
M source/blender/windowmanager/intern/wm_files.c
M source/blender/windowmanager/intern/wm_init_exit.c
M source/blender/windowmanager/intern/wm_keymap.c
M source/blender/windowmanager/intern/wm_operators.c
M source/blender/windowmanager/intern/wm_window.c
M source/blender/windowmanager/wm.h
M source/blender/windowmanager/wm_draw.h
M source/blenderplayer/bad_level_call_stubs/stubs.c
M source/creator/CMakeLists.txt
M source/creator/creator.c
M source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
M source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
M source/gameengine/Converter/BL_BlenderDataConversion.cpp
M source/gameengine/Converter/KX_ConvertSensors.cpp
M source/gameengine/Expressions/CMakeLists.txt
M source/gameengine/Expressions/PyObjectPlus.cpp
M source/gameengine/GameLogic/SCA_ISensor.cpp
M source/gameengine/GameLogic/SCA_ISensor.h
M source/gameengine/GameLogic/SCA_RandomSensor.cpp
M source/gameengine/GamePlayer/common/GPC_Canvas.h
M source/gameengine/GamePlayer/ghost/GPG_Canvas.cpp
M source/gameengine/GamePlayer/ghost/GPG_Canvas.h
M source/gameengine/Ketsji/KX_Camera.cpp
M source/gameengine/Ketsji/KX_Camera.h
M source/gameengine/Ketsji/KX_GameObject.cpp
M source/gameengine/Ketsji/KX_GameObject.h
M source/gameengine/Ketsji/KX_KetsjiEngine.cpp
M source/gameengine/Ketsji/KX_Light.cpp
M source/gameengine/Ketsji/KX_Light.h
M source/gameengine/Ketsji/KX_ObjectActuator.cpp
M source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
M source/gameengine/Ketsji/KX_PythonInit.cpp
M source/gameengine/Ketsji/KX_Scene.cpp
M source/gameengine/Ketsji/KX_Scene.h
M source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
M source/gameengine/Physics/Bullet/CcdPhysicsController.h
M source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
M source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
M source/gameengine/Physics/common/PHY_IPhysicsController.h
M source/gameengine/Rasterizer/RAS_ICanvas.h
M source/gameengine/VideoTexture/ImageRender.cpp
M tests/gtests/blenlib/CMakeLists.txt
M tests/python/CMakeLists.txt
M tests/python/bl_load_addons.py
M tests/python/bl_rst_completeness.py
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bdaefb0..68f248a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -359,7 +359,7 @@ option(WITH_CYCLES_STANDALONE "Build cycles standalone application" OFF)
option(WITH_CYCLES_STANDALONE_GUI "Build cycles standalone with GUI" OFF)
option(WITH_CYCLES_OSL "Build Cycles with OSL support" ${_init_CYCLES_OSL})
option(WITH_CYCLES_CUDA_BINARIES "Build cycles CUDA binaries" OFF)
-set(CYCLES_CUDA_BINARIES_ARCH sm_20 sm_21 sm_30 sm_35 sm_50 sm_52 CACHE STRING "CUDA architectures to build binaries for")
+set(CYCLES_CUDA_BINARIES_ARCH sm_20 sm_21 sm_30 sm_35 sm_50 CACHE STRING "CUDA architectures to build binaries for")
mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH)
unset(PLATFORM_DEFAULT)
option(WITH_CYCLES_LOGGING "Build cycles with logging support" ON)
@@ -395,7 +395,6 @@ option(WITH_BOOST "Enable features depending on boost" ON)
# Unit testsing
option(WITH_GTESTS "Enable GTest unit testing" OFF)
-option(WITH_TESTS_PERFORMANCE "Enable performance tests" OFF)
# Documentation
@@ -2524,7 +2523,6 @@ if(CMAKE_COMPILER_IS_GNUCC)
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_MISSING_INCLUDE_DIRS -Wmissing-include-dirs)
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_DIV_BY_ZERO -Wno-div-by-zero)
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_TYPE_LIMITS -Wtype-limits)
- ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_FORMAT_SIGN -Wformat-signedness)
# gcc 4.2 gives annoying warnings on every file with this
if(NOT "${CMAKE_C_COMPILER_VERSION}" VERSION_LESS "4.3")
@@ -2561,7 +2559,6 @@ if(CMAKE_COMPILER_IS_GNUCC)
ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_UNUSED_PARAMETER -Wunused-parameter)
ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_WRITE_STRINGS -Wwrite-strings)
ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_UNDEF -Wundef)
- ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_FORMAT_SIGN -Wformat-signedness)
# gcc 4.2 gives annoying warnings on every file with this
if(NOT "${CMAKE_C_COMPILER_VERSION}" VERSION_LESS "4.3")
diff --git a/SConstruct b/SConstruct
index 6cf3874..7cdc4b3 100644
--- a/SConstruct
+++ b/SConstruct
@@ -758,9 +758,6 @@ if B.targets != ['cudakernels']:
data_to_c_simple("release/datafiles/preview_cycles.blend")
# --- glsl ---
- data_to_c_simple("source/blender/gpu/shaders/gpu_program_smoke_frag.glsl")
- data_to_c_simple("source/blender/gpu/shaders/gpu_program_smoke_color_frag.glsl")
-
data_to_c_simple("source/blender/gpu/shaders/gpu_shader_simple_frag.glsl")
data_to_c_simple("source/blender/gpu/shaders/gpu_shader_simple_vert.glsl")
data_to_c_simple("source/blender/gpu/shaders/gpu_shader_material.glsl")
diff --git a/build_files/buildbot/slave_test.py b/build_files/buildbot/slave_test.py
index 2f233fd..734b226 100644
--- a/build_files/buildbot/slave_test.py
+++ b/build_files/buildbot/slave_test.py
@@ -31,11 +31,10 @@ builder = sys.argv[1]
# we run from build/ directory
blender_dir = '../blender.git'
-if "cmake" in builder:
- # cmake
+#~ if "cmake" in builder:
+ #~ # cmake
#~ retcode = subprocess.call(['ctest', '.' '--output-on-failure'])
#~ sys.exit(retcode)
- pass
-else:
- # scons
- pass
+#~ else:
+ #~ # scons
+ #~ pass
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index 8b2f3f1..e23d2c6 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -516,11 +516,11 @@ macro(SETUP_BLENDER_SORTED_LIBS)
bf_ikplugin
bf_modifiers
bf_bmesh
- bf_gpu
bf_blenkernel
bf_physics
bf_nodes
bf_rna
+ bf_gpu
bf_blenloader
bf_imbuf
bf_blenlib
diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py
index e751be3..dbe1caf 100644
--- a/build_files/scons/tools/Blender.py
+++ b/build_files/scons/tools/Blender.py
@@ -816,8 +816,6 @@ def AppIt(target=None, source=None, env=None):
instname = env['LCGDIR'][1:] # made libiomp5 part of blender libs
cmd = 'ditto --arch %s %s/openmp/lib/libiomp5.dylib %s/%s.app/Contents/Resources/lib/'%(osxarch, instname, installdir, binary) # copy libiomp5
commands.getoutput(cmd)
- cmd = 'cp %s/openmp/LICENSE.txt %s/LICENSE-libiomp5.txt'%(instname, installdir) # copy libiomp5 license
- commands.getoutput(cmd)
# extract copy system python, be sure to update other build systems
# when making changes to the files that are copied.
diff --git a/doc/python_api/examples/bpy.ops.2.py b/doc/python_api/examples/bpy.ops.2.py
index 87a2022..cf6df94 100644
--- a/doc/python_api/examples/bpy.ops.2.py
+++ b/doc/python_api/examples/bpy.ops.2.py
@@ -1,19 +1,16 @@
-.. _operator-execution_context:
-
"""
Execution Context
-----------------
When calling an operator you may want to pass the execution context.
-This determines the context that is given for the operator to run in, and whether
-invoke() is called or only execute().
+This determines the context thats given to the operator to run in, and weather
+invoke() is called or execute().
-'EXEC_DEFAULT' is used by default, running only the execute() method, but you may
-want the operator to take user interaction with 'INVOKE_DEFAULT' which will also
-call invoke() if existing.
+'EXEC_DEFAULT' is used by default but you may want the operator to take user
+interaction with 'INVOKE_DEFAULT'.
-The execution context is one of:
+The execution context is as a non keyword, string argument in:
('INVOKE_DEFAULT', 'INVOKE_REGION_WIN', 'INVOKE_REGION_CHANNELS',
'INVOKE_REGION_PREVIEW', 'INVOKE_AREA', 'INVOKE_SCREEN', 'EXEC_DEFAULT',
'EXEC_REGION_WIN', 'EXEC_REGION_CHANNELS', 'EXEC_REGION_PREVIEW', 'EXEC_AREA',
diff --git a/doc/python_api/examples/bpy.props.2.py b/doc/python_api/examples/bpy.props.2.py
index ec9c838..22fef5d 100644
--- a/doc/python_api/examples/bpy.props.2.py
+++ b/doc/python_api/examples/bpy.props.2.py
@@ -3,7 +3,7 @@ PropertyGroup Example
+++++++++++++++++++++
PropertyGroups can be used for collecting custom settings into one value
-to avoid many individual settings mixed in together.
+to avoid many indervidual settings mixed in together.
"""
import bpy
diff --git a/doc/python_api/examples/bpy.props.py b/doc/python_api/examples/bpy.props.py
index c199bd9..f6bc55d 100644
--- a/doc/python_api/examples/bpy.props.py
+++ b/doc/python_api/examples/bpy.props.py
@@ -6,7 +6,7 @@ Custom properties can be added to any subclass of an :class:`ID`,
:class:`Bone` and :class:`PoseBone`.
These properties can be animated, accessed by the user interface and python
-like Blender's existing properties.
+like blenders existing properties.
"""
import bpy
diff --git a/doc/python_api/examples/bpy.types.Menu.2.py b/doc/python_api/examples/bpy.types.Menu.2.py
index 26409f1..c87b10c 100644
--- a/doc/python_api/examples/bpy.types.Menu.2.py
+++ b/doc/python_api/examples/bpy.types.Menu.2.py
@@ -1,11 +1,12 @@
"""
Extending Menus
+++++++++++++++
-When creating menus for addons you can't reference menus in Blender's default
+When creating menus for addons you can't reference menus in blenders default
scripts.
-Instead, the addon can add menu items to existing menus.
-The function menu_draw acts like :class:`Menu.draw`.
+Instead the addon can add menu items to existing menus.
+
+The function menu_draw acts like Menu.draw
"""
import bpy
diff --git a/doc/python_api/examples/bpy.types.Menu.py b/doc/python_api/examples/bpy.types.Menu.py
index e10e44f..4ca18a6 100644
--- a/doc/python_api/examples/bpy.types.Menu.py
+++ b/doc/python_api/examples/bpy.types.Menu.py
@@ -1,20 +1,21 @@
"""
Basic Menu Example
++++++++++++++++++
-Here is an example of a simple menu. Menus differ from panels in that they must
+This script is a simple menu, menus differ from panels in that they must
reference from a header, panel or another menu.
-Notice the 'CATEGORY_MT_name' in :class:`Menu.bl_idname`, this is a naming
+Notice the 'CATEGORY_MT_name' :class:`Menu.bl_idname`, this is a naming
convention for menus.
.. note::
+
Menu subclasses must be registered before referencing them from blender.
.. note::
- Menus have their :class:`Layout.operator_context` initialized as
- 'EXEC_REGION_WIN' rather than 'INVOKE_DEFAULT' (see :ref:`Execution Context <operator-execution_context>`).
- If the operator context needs to initialize inputs from the
- :class:`Operator.invoke` function, then this needs to be explicitly set.
+ Menu's have their :class:`Layout.operator_context` initialized as
+ 'EXEC_REGION_WIN' rather then 'INVOKE_DEFAULT', so if the operator context
+ needs to initialize inputs from the :class:`Operator.invoke` function
+ then this needs to be explicitly set.
"""
import bpy
diff --git a/doc/python_api/rst/bge.constraints.rst b/doc/python_api/rst/bge.constraints.rst
index 636a662..018be96 100644
--- a/doc/python_api/rst/bge.constraints.rst
+++ b/doc/python_api/rst/bge.constraints.rst
@@ -11,14 +11,14 @@ Physics Constraints (bge.constraints)
.. literalinclude:: ../examples/bge.constraints.py
:lines: 6-
-.. function:: createConstraint(physicsid_1, physicsid_2, constraint_type, pivot_X, pivot_y, pivot_z, axis_x, axis_y, axis_z, flag)
+.. function:: createConstraint(physicsid, physicsid2, constrainttype, [pivotX, pivotY, pivotZ, [axisX, axisY, axisZ, [flag]]]])
Creates a constraint.
- :arg physicsid_1: the physics id of the first object in constraint
+ :arg physicsid: the physics id of the first object in constraint
:type physicsid: int
- :arg physicsid_2: the physics id of the second object in constraint
+ :arg physicsid2: the physics id of the second object in constraint
:type physicsid2: int
:arg constrainttype: the type of the constraint. The constraint types are:
@@ -32,26 +32,26 @@ Physics Constraints (bge.constraints)
:type constrainttype: int
- :arg pivot_X: pivot X position
- :type pivot_X: float (optional)
+ :arg pivotX: pivot X position
+ :type pivotX: float
- :arg pivot_Y: pivot Y position
- :type pivot_Y: float (optional)
+ :arg pivotY: pivot Y position
+ :type pivotY: float
- :arg pivot_Z: pivot Z position
- :type pivot_Z: float (optional)
+ :arg pivotZ: pivot Z
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list