[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57870] branches/soc-2013-bge: Merged revisions 57538-57869 from trunk/blender
Daniel Stokes
kupomail at gmail.com
Sat Jun 29 09:00:39 CEST 2013
Revision: 57870
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57870
Author: kupoman
Date: 2013-06-29 07:00:38 +0000 (Sat, 29 Jun 2013)
Log Message:
-----------
Merged revisions 57538-57869 from trunk/blender
Modified Paths:
--------------
branches/soc-2013-bge/CMakeLists.txt
branches/soc-2013-bge/SConstruct
branches/soc-2013-bge/build_files/build_environment/install_deps.sh
branches/soc-2013-bge/build_files/buildbot/config/user-config-cuda-glibc211-i686.py
branches/soc-2013-bge/build_files/buildbot/config/user-config-cuda-glibc211-x86_64.py
branches/soc-2013-bge/build_files/buildbot/config/user-config-glibc211-i686.py
branches/soc-2013-bge/build_files/buildbot/config/user-config-glibc211-x86_64.py
branches/soc-2013-bge/build_files/buildbot/config/user-config-mac-i386.py
branches/soc-2013-bge/build_files/buildbot/config/user-config-mac-x86_64.py
branches/soc-2013-bge/build_files/buildbot/config/user-config-player-glibc211-i686.py
branches/soc-2013-bge/build_files/buildbot/config/user-config-player-glibc211-x86_64.py
branches/soc-2013-bge/build_files/buildbot/slave_compile.py
branches/soc-2013-bge/build_files/buildbot/slave_pack.py
branches/soc-2013-bge/build_files/buildbot/slave_test.py
branches/soc-2013-bge/build_files/cmake/macros.cmake
branches/soc-2013-bge/build_files/scons/config/darwin-config.py
branches/soc-2013-bge/build_files/scons/config/linux-config.py
branches/soc-2013-bge/build_files/scons/config/win32-mingw-config.py
branches/soc-2013-bge/build_files/scons/config/win32-vc-config.py
branches/soc-2013-bge/build_files/scons/config/win64-mingw-config.py
branches/soc-2013-bge/build_files/scons/config/win64-vc-config.py
branches/soc-2013-bge/build_files/scons/tools/Blender.py
branches/soc-2013-bge/build_files/scons/tools/btools.py
branches/soc-2013-bge/doc/python_api/examples/bpy.app.translations.py
branches/soc-2013-bge/doc/python_api/examples/bpy.types.WindowManager.popup_menu.py
branches/soc-2013-bge/doc/python_api/examples/mathutils.Vector.py
branches/soc-2013-bge/intern/audaspace/intern/AUD_Sequencer.cpp
branches/soc-2013-bge/intern/audaspace/intern/AUD_SequencerReader.cpp
branches/soc-2013-bge/intern/cycles/CMakeLists.txt
branches/soc-2013-bge/intern/cycles/SConscript
branches/soc-2013-bge/intern/cycles/blender/addon/__init__.py
branches/soc-2013-bge/intern/cycles/blender/addon/properties.py
branches/soc-2013-bge/intern/cycles/blender/addon/ui.py
branches/soc-2013-bge/intern/cycles/blender/blender_curves.cpp
branches/soc-2013-bge/intern/cycles/blender/blender_session.cpp
branches/soc-2013-bge/intern/cycles/blender/blender_shader.cpp
branches/soc-2013-bge/intern/cycles/bvh/bvh.cpp
branches/soc-2013-bge/intern/cycles/device/device_cuda.cpp
branches/soc-2013-bge/intern/cycles/device/device_opencl.cpp
branches/soc-2013-bge/intern/cycles/kernel/CMakeLists.txt
branches/soc-2013-bge/intern/cycles/kernel/SConscript
branches/soc-2013-bge/intern/cycles/kernel/closure/bsdf_diffuse_ramp.h
branches/soc-2013-bge/intern/cycles/kernel/closure/bsdf_phong_ramp.h
branches/soc-2013-bge/intern/cycles/kernel/kernel.cl
branches/soc-2013-bge/intern/cycles/kernel/kernel_bvh.h
branches/soc-2013-bge/intern/cycles/kernel/kernel_bvh_traversal.h
branches/soc-2013-bge/intern/cycles/kernel/kernel_compat_opencl.h
branches/soc-2013-bge/intern/cycles/kernel/kernel_displace.h
branches/soc-2013-bge/intern/cycles/kernel/kernel_emission.h
branches/soc-2013-bge/intern/cycles/kernel/kernel_jitter.h
branches/soc-2013-bge/intern/cycles/kernel/kernel_path.h
branches/soc-2013-bge/intern/cycles/kernel/kernel_random.h
branches/soc-2013-bge/intern/cycles/kernel/kernel_shader.h
branches/soc-2013-bge/intern/cycles/kernel/kernel_sse2.cpp
branches/soc-2013-bge/intern/cycles/kernel/kernel_sse3.cpp
branches/soc-2013-bge/intern/cycles/kernel/kernel_types.h
branches/soc-2013-bge/intern/cycles/kernel/osl/osl_services.cpp
branches/soc-2013-bge/intern/cycles/kernel/osl/osl_services.h
branches/soc-2013-bge/intern/cycles/kernel/osl/osl_shader.cpp
branches/soc-2013-bge/intern/cycles/kernel/shaders/CMakeLists.txt
branches/soc-2013-bge/intern/cycles/kernel/shaders/SConscript
branches/soc-2013-bge/intern/cycles/kernel/shaders/node_brick_texture.osl
branches/soc-2013-bge/intern/cycles/kernel/shaders/node_bump.osl
branches/soc-2013-bge/intern/cycles/kernel/shaders/node_color.h
branches/soc-2013-bge/intern/cycles/kernel/shaders/node_environment_texture.osl
branches/soc-2013-bge/intern/cycles/kernel/shaders/node_image_texture.osl
branches/soc-2013-bge/intern/cycles/kernel/shaders/node_texture.h
branches/soc-2013-bge/intern/cycles/kernel/shaders/node_toon_bsdf.osl
branches/soc-2013-bge/intern/cycles/kernel/shaders/node_wavelength.osl
branches/soc-2013-bge/intern/cycles/kernel/shaders/node_wireframe.osl
branches/soc-2013-bge/intern/cycles/kernel/svm/svm_brick.h
branches/soc-2013-bge/intern/cycles/kernel/svm/svm_wavelength.h
branches/soc-2013-bge/intern/cycles/kernel/svm/svm_wireframe.h
branches/soc-2013-bge/intern/cycles/render/background.cpp
branches/soc-2013-bge/intern/cycles/render/background.h
branches/soc-2013-bge/intern/cycles/render/graph.cpp
branches/soc-2013-bge/intern/cycles/render/graph.h
branches/soc-2013-bge/intern/cycles/render/light.cpp
branches/soc-2013-bge/intern/cycles/render/nodes.cpp
branches/soc-2013-bge/intern/cycles/render/nodes.h
branches/soc-2013-bge/intern/cycles/render/object.cpp
branches/soc-2013-bge/intern/cycles/render/osl.cpp
branches/soc-2013-bge/intern/cycles/render/scene.h
branches/soc-2013-bge/intern/cycles/render/session.cpp
branches/soc-2013-bge/intern/cycles/render/shader.cpp
branches/soc-2013-bge/intern/cycles/render/shader.h
branches/soc-2013-bge/intern/cycles/render/svm.cpp
branches/soc-2013-bge/intern/cycles/util/util_cuda.cpp
branches/soc-2013-bge/intern/cycles/util/util_cuda.h
branches/soc-2013-bge/intern/cycles/util/util_math.h
branches/soc-2013-bge/intern/cycles/util/util_system.cpp
branches/soc-2013-bge/intern/cycles/util/util_types.h
branches/soc-2013-bge/intern/cycles/util/util_vector.h
branches/soc-2013-bge/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2013-bge/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/soc-2013-bge/intern/locale/boost_locale_wrapper.cpp
branches/soc-2013-bge/release/datafiles/startup.blend
branches/soc-2013-bge/release/scripts/modules/addon_utils.py
branches/soc-2013-bge/release/scripts/modules/bl_i18n_utils/utils_languages_menu.py
branches/soc-2013-bge/release/scripts/modules/bpy/utils.py
branches/soc-2013-bge/release/scripts/modules/console/complete_namespace.py
branches/soc-2013-bge/release/scripts/modules/nodeitems_utils.py
branches/soc-2013-bge/release/scripts/startup/bl_operators/anim.py
branches/soc-2013-bge/release/scripts/startup/bl_operators/node.py
branches/soc-2013-bge/release/scripts/startup/bl_operators/presets.py
branches/soc-2013-bge/release/scripts/startup/bl_operators/vertexpaint_dirt.py
branches/soc-2013-bge/release/scripts/startup/bl_operators/view3d.py
branches/soc-2013-bge/release/scripts/startup/bl_operators/wm.py
branches/soc-2013-bge/release/scripts/startup/bl_ui/__init__.py
branches/soc-2013-bge/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/soc-2013-bge/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2013-bge/release/scripts/startup/bl_ui/properties_freestyle.py
branches/soc-2013-bge/release/scripts/startup/bl_ui/properties_game.py
branches/soc-2013-bge/release/scripts/startup/bl_ui/properties_mask_common.py
branches/soc-2013-bge/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/soc-2013-bge/release/scripts/startup/bl_ui/properties_render.py
branches/soc-2013-bge/release/scripts/startup/bl_ui/space_clip.py
branches/soc-2013-bge/release/scripts/startup/bl_ui/space_image.py
branches/soc-2013-bge/release/scripts/startup/bl_ui/space_info.py
branches/soc-2013-bge/release/scripts/startup/bl_ui/space_node.py
branches/soc-2013-bge/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2013-bge/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2013-bge/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2013-bge/release/scripts/startup/nodeitems_builtins.py
branches/soc-2013-bge/release/scripts/templates_osl/ramp_closure.osl
branches/soc-2013-bge/release/scripts/templates_osl/temperature_to_rgb.osl
branches/soc-2013-bge/release/scripts/templates_osl/wavelength_to_rgb.osl
branches/soc-2013-bge/release/scripts/templates_osl/westin_closure.osl
branches/soc-2013-bge/release/text/readme.html
branches/soc-2013-bge/source/blender/blenfont/intern/blf.c
branches/soc-2013-bge/source/blender/blenfont/intern/blf_dir.c
branches/soc-2013-bge/source/blender/blenfont/intern/blf_font.c
branches/soc-2013-bge/source/blender/blenfont/intern/blf_glyph.c
branches/soc-2013-bge/source/blender/blenfont/intern/blf_internal_types.h
branches/soc-2013-bge/source/blender/blenfont/intern/blf_lang.c
branches/soc-2013-bge/source/blender/blenkernel/BKE_DerivedMesh.h
branches/soc-2013-bge/source/blender/blenkernel/BKE_blender.h
branches/soc-2013-bge/source/blender/blenkernel/BKE_bpath.h
branches/soc-2013-bge/source/blender/blenkernel/BKE_deform.h
branches/soc-2013-bge/source/blender/blenkernel/BKE_global.h
branches/soc-2013-bge/source/blender/blenkernel/BKE_lattice.h
branches/soc-2013-bge/source/blender/blenkernel/BKE_mball.h
branches/soc-2013-bge/source/blender/blenkernel/BKE_mesh.h
branches/soc-2013-bge/source/blender/blenkernel/BKE_modifier.h
branches/soc-2013-bge/source/blender/blenkernel/BKE_particle.h
branches/soc-2013-bge/source/blender/blenkernel/BKE_screen.h
branches/soc-2013-bge/source/blender/blenkernel/CMakeLists.txt
branches/soc-2013-bge/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2013-bge/source/blender/blenkernel/intern/anim.c
branches/soc-2013-bge/source/blender/blenkernel/intern/armature.c
branches/soc-2013-bge/source/blender/blenkernel/intern/blender.c
branches/soc-2013-bge/source/blender/blenkernel/intern/bpath.c
branches/soc-2013-bge/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2013-bge/source/blender/blenkernel/intern/colortools.c
branches/soc-2013-bge/source/blender/blenkernel/intern/deform.c
branches/soc-2013-bge/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2013-bge/source/blender/blenkernel/intern/displist.c
branches/soc-2013-bge/source/blender/blenkernel/intern/editmesh_bvh.c
branches/soc-2013-bge/source/blender/blenkernel/intern/effect.c
branches/soc-2013-bge/source/blender/blenkernel/intern/image_gen.c
branches/soc-2013-bge/source/blender/blenkernel/intern/key.c
branches/soc-2013-bge/source/blender/blenkernel/intern/lattice.c
branches/soc-2013-bge/source/blender/blenkernel/intern/mask_rasterize.c
branches/soc-2013-bge/source/blender/blenkernel/intern/mball.c
branches/soc-2013-bge/source/blender/blenkernel/intern/mesh.c
branches/soc-2013-bge/source/blender/blenkernel/intern/modifier.c
branches/soc-2013-bge/source/blender/blenkernel/intern/node.c
branches/soc-2013-bge/source/blender/blenkernel/intern/object.c
branches/soc-2013-bge/source/blender/blenkernel/intern/packedFile.c
branches/soc-2013-bge/source/blender/blenkernel/intern/paint.c
branches/soc-2013-bge/source/blender/blenkernel/intern/particle.c
branches/soc-2013-bge/source/blender/blenkernel/intern/particle_system.c
branches/soc-2013-bge/source/blender/blenkernel/intern/sequencer.c
branches/soc-2013-bge/source/blender/blenkernel/intern/tracking.c
branches/soc-2013-bge/source/blender/blenlib/BLI_ghash.h
branches/soc-2013-bge/source/blender/blenlib/BLI_math_rotation.h
branches/soc-2013-bge/source/blender/blenlib/BLI_path_util.h
branches/soc-2013-bge/source/blender/blenlib/BLI_scanfill.h
branches/soc-2013-bge/source/blender/blenlib/BLI_smallhash.h
branches/soc-2013-bge/source/blender/blenlib/intern/BLI_ghash.c
branches/soc-2013-bge/source/blender/blenlib/intern/BLI_heap.c
branches/soc-2013-bge/source/blender/blenlib/intern/BLI_memarena.c
branches/soc-2013-bge/source/blender/blenlib/intern/BLI_mempool.c
branches/soc-2013-bge/source/blender/blenlib/intern/edgehash.c
branches/soc-2013-bge/source/blender/blenlib/intern/fileops.c
branches/soc-2013-bge/source/blender/blenlib/intern/graph.c
branches/soc-2013-bge/source/blender/blenlib/intern/math_color_inline.c
branches/soc-2013-bge/source/blender/blenlib/intern/math_geom.c
branches/soc-2013-bge/source/blender/blenlib/intern/math_rotation.c
branches/soc-2013-bge/source/blender/blenlib/intern/path_util.c
branches/soc-2013-bge/source/blender/blenlib/intern/scanfill.c
branches/soc-2013-bge/source/blender/blenlib/intern/smallhash.c
branches/soc-2013-bge/source/blender/blenlib/intern/string.c
branches/soc-2013-bge/source/blender/blenlib/intern/winstuff.c
branches/soc-2013-bge/source/blender/blenloader/intern/readfile.c
branches/soc-2013-bge/source/blender/blenloader/intern/writefile.c
branches/soc-2013-bge/source/blender/bmesh/CMakeLists.txt
branches/soc-2013-bge/source/blender/bmesh/bmesh_class.h
branches/soc-2013-bge/source/blender/bmesh/intern/bmesh_edgeloop.c
branches/soc-2013-bge/source/blender/bmesh/intern/bmesh_iterators.h
branches/soc-2013-bge/source/blender/bmesh/intern/bmesh_marking.c
branches/soc-2013-bge/source/blender/bmesh/intern/bmesh_marking.h
branches/soc-2013-bge/source/blender/bmesh/intern/bmesh_mesh.c
branches/soc-2013-bge/source/blender/bmesh/intern/bmesh_mesh_conv.c
branches/soc-2013-bge/source/blender/bmesh/intern/bmesh_mesh_conv.h
branches/soc-2013-bge/source/blender/bmesh/intern/bmesh_opdefines.c
branches/soc-2013-bge/source/blender/bmesh/intern/bmesh_operators_private.h
branches/soc-2013-bge/source/blender/bmesh/intern/bmesh_polygon.c
branches/soc-2013-bge/source/blender/bmesh/intern/bmesh_polygon.h
branches/soc-2013-bge/source/blender/bmesh/intern/bmesh_walkers.c
branches/soc-2013-bge/source/blender/bmesh/operators/bmo_beautify.c
branches/soc-2013-bge/source/blender/bmesh/operators/bmo_bridge.c
branches/soc-2013-bge/source/blender/bmesh/operators/bmo_connect.c
branches/soc-2013-bge/source/blender/bmesh/operators/bmo_dupe.c
branches/soc-2013-bge/source/blender/bmesh/operators/bmo_mirror.c
branches/soc-2013-bge/source/blender/bmesh/operators/bmo_poke.c
branches/soc-2013-bge/source/blender/bmesh/operators/bmo_subdivide.c
branches/soc-2013-bge/source/blender/bmesh/operators/bmo_wireframe.c
branches/soc-2013-bge/source/blender/bmesh/tools/bmesh_bevel.c
branches/soc-2013-bge/source/blender/bmesh/tools/bmesh_decimate_collapse.c
branches/soc-2013-bge/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c
branches/soc-2013-bge/source/blender/bmesh/tools/bmesh_path.c
branches/soc-2013-bge/source/blender/collada/AnimationExporter.cpp
branches/soc-2013-bge/source/blender/collada/AnimationExporter.h
branches/soc-2013-bge/source/blender/collada/SkinInfo.cpp
branches/soc-2013-bge/source/blender/compositor/SConscript
branches/soc-2013-bge/source/blender/editors/animation/fmodifier_ui.c
branches/soc-2013-bge/source/blender/editors/armature/armature_relations.c
branches/soc-2013-bge/source/blender/editors/armature/armature_skinning.c
branches/soc-2013-bge/source/blender/editors/armature/meshlaplacian.c
branches/soc-2013-bge/source/blender/editors/curve/curve_ops.c
branches/soc-2013-bge/source/blender/editors/curve/editcurve.c
branches/soc-2013-bge/source/blender/editors/curve/editfont.c
branches/soc-2013-bge/source/blender/editors/curve/lorem.c
branches/soc-2013-bge/source/blender/editors/include/ED_mesh.h
branches/soc-2013-bge/source/blender/editors/include/ED_object.h
branches/soc-2013-bge/source/blender/editors/include/ED_screen.h
branches/soc-2013-bge/source/blender/editors/include/UI_interface.h
branches/soc-2013-bge/source/blender/editors/interface/interface.c
branches/soc-2013-bge/source/blender/editors/interface/interface_handlers.c
branches/soc-2013-bge/source/blender/editors/interface/interface_intern.h
branches/soc-2013-bge/source/blender/editors/interface/interface_layout.c
branches/soc-2013-bge/source/blender/editors/interface/interface_panel.c
branches/soc-2013-bge/source/blender/editors/interface/interface_regions.c
branches/soc-2013-bge/source/blender/editors/interface/interface_style.c
branches/soc-2013-bge/source/blender/editors/interface/interface_templates.c
branches/soc-2013-bge/source/blender/editors/interface/interface_widgets.c
branches/soc-2013-bge/source/blender/editors/interface/resources.c
branches/soc-2013-bge/source/blender/editors/mask/mask_ops.c
branches/soc-2013-bge/source/blender/editors/mesh/editface.c
branches/soc-2013-bge/source/blender/editors/mesh/editmesh_add.c
branches/soc-2013-bge/source/blender/editors/mesh/editmesh_bevel.c
branches/soc-2013-bge/source/blender/editors/mesh/editmesh_inset.c
branches/soc-2013-bge/source/blender/editors/mesh/editmesh_path.c
branches/soc-2013-bge/source/blender/editors/mesh/editmesh_select.c
branches/soc-2013-bge/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2013-bge/source/blender/editors/mesh/editmesh_utils.c
branches/soc-2013-bge/source/blender/editors/mesh/mesh_intern.h
branches/soc-2013-bge/source/blender/editors/mesh/mesh_navmesh.c
branches/soc-2013-bge/source/blender/editors/mesh/mesh_ops.c
branches/soc-2013-bge/source/blender/editors/mesh/meshtools.c
branches/soc-2013-bge/source/blender/editors/metaball/mball_ops.c
branches/soc-2013-bge/source/blender/editors/object/object_add.c
branches/soc-2013-bge/source/blender/editors/object/object_hook.c
branches/soc-2013-bge/source/blender/editors/object/object_intern.h
branches/soc-2013-bge/source/blender/editors/object/object_lattice.c
branches/soc-2013-bge/source/blender/editors/object/object_ops.c
branches/soc-2013-bge/source/blender/editors/object/object_relations.c
branches/soc-2013-bge/source/blender/editors/object/object_shapekey.c
branches/soc-2013-bge/source/blender/editors/object/object_vgroup.c
branches/soc-2013-bge/source/blender/editors/physics/physics_ops.c
branches/soc-2013-bge/source/blender/editors/render/render_internal.c
branches/soc-2013-bge/source/blender/editors/render/render_opengl.c
branches/soc-2013-bge/source/blender/editors/screen/area.c
branches/soc-2013-bge/source/blender/editors/screen/screen_edit.c
branches/soc-2013-bge/source/blender/editors/screen/screen_ops.c
branches/soc-2013-bge/source/blender/editors/screen/screendump.c
branches/soc-2013-bge/source/blender/editors/sculpt_paint/CMakeLists.txt
branches/soc-2013-bge/source/blender/editors/sculpt_paint/paint_hide.c
branches/soc-2013-bge/source/blender/editors/sculpt_paint/paint_image_proj.c
branches/soc-2013-bge/source/blender/editors/sculpt_paint/paint_intern.h
branches/soc-2013-bge/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2013-bge/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2013-bge/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2013-bge/source/blender/editors/sound/sound_ops.c
branches/soc-2013-bge/source/blender/editors/space_action/space_action.c
branches/soc-2013-bge/source/blender/editors/space_api/spacetypes.c
branches/soc-2013-bge/source/blender/editors/space_buttons/CMakeLists.txt
branches/soc-2013-bge/source/blender/editors/space_buttons/buttons_intern.h
branches/soc-2013-bge/source/blender/editors/space_buttons/space_buttons.c
branches/soc-2013-bge/source/blender/editors/space_clip/clip_buttons.c
branches/soc-2013-bge/source/blender/editors/space_clip/clip_dopesheet_draw.c
branches/soc-2013-bge/source/blender/editors/space_clip/space_clip.c
branches/soc-2013-bge/source/blender/editors/space_console/space_console.c
branches/soc-2013-bge/source/blender/editors/space_file/file_intern.h
branches/soc-2013-bge/source/blender/editors/space_file/filesel.c
branches/soc-2013-bge/source/blender/editors/space_file/space_file.c
branches/soc-2013-bge/source/blender/editors/space_graph/graph_buttons.c
branches/soc-2013-bge/source/blender/editors/space_graph/space_graph.c
branches/soc-2013-bge/source/blender/editors/space_image/image_ops.c
branches/soc-2013-bge/source/blender/editors/space_image/space_image.c
branches/soc-2013-bge/source/blender/editors/space_info/info_ops.c
branches/soc-2013-bge/source/blender/editors/space_info/space_info.c
branches/soc-2013-bge/source/blender/editors/space_logic/logic_ops.c
branches/soc-2013-bge/source/blender/editors/space_logic/space_logic.c
branches/soc-2013-bge/source/blender/editors/space_nla/space_nla.c
branches/soc-2013-bge/source/blender/editors/space_node/node_draw.c
branches/soc-2013-bge/source/blender/editors/space_node/node_edit.c
branches/soc-2013-bge/source/blender/editors/space_node/space_node.c
branches/soc-2013-bge/source/blender/editors/space_outliner/space_outliner.c
branches/soc-2013-bge/source/blender/editors/space_script/script_edit.c
branches/soc-2013-bge/source/blender/editors/space_script/space_script.c
branches/soc-2013-bge/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2013-bge/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2013-bge/source/blender/editors/space_sequencer/space_sequencer.c
branches/soc-2013-bge/source/blender/editors/space_text/space_text.c
branches/soc-2013-bge/source/blender/editors/space_text/text_ops.c
branches/soc-2013-bge/source/blender/editors/space_time/space_time.c
branches/soc-2013-bge/source/blender/editors/space_userpref/space_userpref.c
branches/soc-2013-bge/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2013-bge/source/blender/editors/space_view3d/drawobject.c
branches/soc-2013-bge/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2013-bge/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2013-bge/source/blender/editors/space_view3d/view3d_fly.c
branches/soc-2013-bge/source/blender/editors/space_view3d/view3d_iterators.c
branches/soc-2013-bge/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2013-bge/source/blender/editors/transform/transform.c
branches/soc-2013-bge/source/blender/editors/transform/transform.h
branches/soc-2013-bge/source/blender/editors/transform/transform_conversions.c
branches/soc-2013-bge/source/blender/editors/transform/transform_generics.c
branches/soc-2013-bge/source/blender/editors/transform/transform_manipulator.c
branches/soc-2013-bge/source/blender/editors/transform/transform_ops.c
branches/soc-2013-bge/source/blender/editors/transform/transform_snap.c
branches/soc-2013-bge/source/blender/editors/util/undo.c
branches/soc-2013-bge/source/blender/editors/uvedit/uvedit_draw.c
branches/soc-2013-bge/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2013-bge/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2013-bge/source/blender/freestyle/SConscript
branches/soc-2013-bge/source/blender/freestyle/intern/stroke/StrokeRep.cpp
branches/soc-2013-bge/source/blender/freestyle/intern/view_map/SteerableViewMap.h
branches/soc-2013-bge/source/blender/gpu/intern/gpu_codegen.c
branches/soc-2013-bge/source/blender/gpu/intern/gpu_draw.c
branches/soc-2013-bge/source/blender/gpu/shaders/gpu_shader_material.glsl
branches/soc-2013-bge/source/blender/ikplugin/intern/ikplugin_api.c
branches/soc-2013-bge/source/blender/imbuf/IMB_imbuf_types.h
branches/soc-2013-bge/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
branches/soc-2013-bge/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/soc-2013-bge/source/blender/imbuf/intern/thumbs.c
branches/soc-2013-bge/source/blender/imbuf/intern/util.c
branches/soc-2013-bge/source/blender/makesdna/DNA_key_types.h
branches/soc-2013-bge/source/blender/makesdna/DNA_lattice_types.h
branches/soc-2013-bge/source/blender/makesdna/DNA_scene_types.h
branches/soc-2013-bge/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2013-bge/source/blender/makesrna/intern/makesrna.c
branches/soc-2013-bge/source/blender/makesrna/intern/rna_brush.c
branches/soc-2013-bge/source/blender/makesrna/intern/rna_key.c
branches/soc-2013-bge/source/blender/makesrna/intern/rna_lamp.c
branches/soc-2013-bge/source/blender/makesrna/intern/rna_lattice.c
branches/soc-2013-bge/source/blender/makesrna/intern/rna_material.c
branches/soc-2013-bge/source/blender/makesrna/intern/rna_scene.c
branches/soc-2013-bge/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/soc-2013-bge/source/blender/makesrna/intern/rna_space.c
branches/soc-2013-bge/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2013-bge/source/blender/makesrna/intern/rna_wm.c
branches/soc-2013-bge/source/blender/modifiers/intern/MOD_edgesplit.c
branches/soc-2013-bge/source/blender/modifiers/intern/MOD_multires.c
branches/soc-2013-bge/source/blender/nodes/intern/node_socket.c
branches/soc-2013-bge/source/blender/nodes/shader/nodes/node_shader_bsdf_toon.c
branches/soc-2013-bge/source/blender/nodes/shader/nodes/node_shader_wavelength.c
branches/soc-2013-bge/source/blender/nodes/shader/nodes/node_shader_wireframe.c
branches/soc-2013-bge/source/blender/python/bmesh/bmesh_py_api.c
branches/soc-2013-bge/source/blender/python/bmesh/bmesh_py_types.c
branches/soc-2013-bge/source/blender/python/intern/bpy.c
branches/soc-2013-bge/source/blender/python/intern/bpy_rna_array.c
branches/soc-2013-bge/source/blender/render/extern/include/RE_pipeline.h
branches/soc-2013-bge/source/blender/render/intern/source/convertblender.c
branches/soc-2013-bge/source/blender/render/intern/source/envmap.c
branches/soc-2013-bge/source/blender/render/intern/source/initrender.c
branches/soc-2013-bge/source/blender/render/intern/source/pipeline.c
branches/soc-2013-bge/source/blender/render/intern/source/shadeinput.c
branches/soc-2013-bge/source/blender/render/intern/source/shadeoutput.c
branches/soc-2013-bge/source/blender/render/intern/source/voxeldata.c
branches/soc-2013-bge/source/blender/render/intern/source/zbuf.c
branches/soc-2013-bge/source/blender/windowmanager/WM_api.h
branches/soc-2013-bge/source/blender/windowmanager/WM_types.h
branches/soc-2013-bge/source/blender/windowmanager/intern/wm_cursors.c
branches/soc-2013-bge/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2013-bge/source/blender/windowmanager/intern/wm_files.c
branches/soc-2013-bge/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2013-bge/source/blender/windowmanager/intern/wm_keymap.c
branches/soc-2013-bge/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2013-bge/source/creator/creator.c
branches/soc-2013-bge/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
branches/soc-2013-bge/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2013-bge/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/soc-2013-bge/source/gameengine/GameLogic/SCA_IInputDevice.h
branches/soc-2013-bge/source/gameengine/GamePlayer/common/GPC_Canvas.cpp
branches/soc-2013-bge/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
branches/soc-2013-bge/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/soc-2013-bge/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.cpp
branches/soc-2013-bge/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2013-bge/source/gameengine/Ketsji/BL_Action.cpp
branches/soc-2013-bge/source/gameengine/Ketsji/BL_Shader.cpp
branches/soc-2013-bge/source/gameengine/Ketsji/KX_Dome.cpp
branches/soc-2013-bge/source/gameengine/Ketsji/KX_IPO_SGController.cpp
branches/soc-2013-bge/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/soc-2013-bge/source/gameengine/Ketsji/KX_KetsjiEngine.h
branches/soc-2013-bge/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2013-bge/source/gameengine/Ketsji/KX_Scene.cpp
branches/soc-2013-bge/source/gameengine/Ketsji/KX_Scene.h
branches/soc-2013-bge/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
branches/soc-2013-bge/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
branches/soc-2013-bge/source/gameengine/VideoTexture/ImageRender.cpp
branches/soc-2013-bge/source/gameengine/VideoTexture/VideoFFmpeg.cpp
branches/soc-2013-bge/source/tests/bl_run_operators.py
branches/soc-2013-bge/source/tools/spell_check_source.py
Added Paths:
-----------
branches/soc-2013-bge/release/scripts/startup/bl_ui/space_properties.py
branches/soc-2013-bge/source/blender/blenkernel/BKE_autoexec.h
branches/soc-2013-bge/source/blender/blenkernel/intern/autoexec.c
branches/soc-2013-bge/source/blender/bmesh/operators/bmo_connect_pair.c
branches/soc-2013-bge/source/blender/editors/sculpt_paint/paint_vertex_proj.c
Removed Paths:
-------------
branches/soc-2013-bge/source/blender/blenkernel/intern/script.c
branches/soc-2013-bge/source/blender/editors/space_buttons/buttons_header.c
Property Changed:
----------------
branches/soc-2013-bge/
branches/soc-2013-bge/extern/carve/include/carve/aabb.hpp
branches/soc-2013-bge/extern/carve/include/carve/aabb_impl.hpp
branches/soc-2013-bge/extern/carve/include/carve/carve.hpp
branches/soc-2013-bge/extern/carve/include/carve/classification.hpp
branches/soc-2013-bge/extern/carve/include/carve/collection/unordered/boost_impl.hpp
branches/soc-2013-bge/extern/carve/include/carve/collection/unordered/fallback_impl.hpp
branches/soc-2013-bge/extern/carve/include/carve/collection/unordered/libstdcpp_impl.hpp
branches/soc-2013-bge/extern/carve/include/carve/collection/unordered/std_impl.hpp
branches/soc-2013-bge/extern/carve/include/carve/collection/unordered/tr1_impl.hpp
branches/soc-2013-bge/extern/carve/include/carve/collection/unordered/vcpp_impl.hpp
branches/soc-2013-bge/extern/carve/include/carve/collection/unordered.hpp
branches/soc-2013-bge/extern/carve/include/carve/collection.hpp
branches/soc-2013-bge/extern/carve/include/carve/collection_types.hpp
branches/soc-2013-bge/extern/carve/include/carve/colour.hpp
branches/soc-2013-bge/extern/carve/include/carve/convex_hull.hpp
branches/soc-2013-bge/extern/carve/include/carve/csg.hpp
branches/soc-2013-bge/extern/carve/include/carve/csg_triangulator.hpp
branches/soc-2013-bge/extern/carve/include/carve/debug_hooks.hpp
branches/soc-2013-bge/extern/carve/include/carve/djset.hpp
branches/soc-2013-bge/extern/carve/include/carve/edge_decl.hpp
branches/soc-2013-bge/extern/carve/include/carve/edge_impl.hpp
branches/soc-2013-bge/extern/carve/include/carve/exact.hpp
branches/soc-2013-bge/extern/carve/include/carve/external/boost/random.hpp
branches/soc-2013-bge/extern/carve/include/carve/face_decl.hpp
branches/soc-2013-bge/extern/carve/include/carve/face_impl.hpp
branches/soc-2013-bge/extern/carve/include/carve/faceloop.hpp
branches/soc-2013-bge/extern/carve/include/carve/geom.hpp
branches/soc-2013-bge/extern/carve/include/carve/geom2d.hpp
branches/soc-2013-bge/extern/carve/include/carve/geom3d.hpp
branches/soc-2013-bge/extern/carve/include/carve/geom_impl.hpp
branches/soc-2013-bge/extern/carve/include/carve/heap.hpp
branches/soc-2013-bge/extern/carve/include/carve/input.hpp
branches/soc-2013-bge/extern/carve/include/carve/interpolator.hpp
branches/soc-2013-bge/extern/carve/include/carve/intersection.hpp
branches/soc-2013-bge/extern/carve/include/carve/iobj.hpp
branches/soc-2013-bge/extern/carve/include/carve/kd_node.hpp
branches/soc-2013-bge/extern/carve/include/carve/math.hpp
branches/soc-2013-bge/extern/carve/include/carve/math_constants.hpp
branches/soc-2013-bge/extern/carve/include/carve/matrix.hpp
branches/soc-2013-bge/extern/carve/include/carve/mesh.hpp
branches/soc-2013-bge/extern/carve/include/carve/mesh_impl.hpp
branches/soc-2013-bge/extern/carve/include/carve/mesh_ops.hpp
branches/soc-2013-bge/extern/carve/include/carve/mesh_simplify.hpp
branches/soc-2013-bge/extern/carve/include/carve/octree_decl.hpp
branches/soc-2013-bge/extern/carve/include/carve/octree_impl.hpp
branches/soc-2013-bge/extern/carve/include/carve/pointset.hpp
branches/soc-2013-bge/extern/carve/include/carve/pointset_decl.hpp
branches/soc-2013-bge/extern/carve/include/carve/pointset_impl.hpp
branches/soc-2013-bge/extern/carve/include/carve/pointset_iter.hpp
branches/soc-2013-bge/extern/carve/include/carve/poly.hpp
branches/soc-2013-bge/extern/carve/include/carve/poly_decl.hpp
branches/soc-2013-bge/extern/carve/include/carve/poly_impl.hpp
branches/soc-2013-bge/extern/carve/include/carve/polyhedron_base.hpp
branches/soc-2013-bge/extern/carve/include/carve/polyhedron_decl.hpp
branches/soc-2013-bge/extern/carve/include/carve/polyhedron_impl.hpp
branches/soc-2013-bge/extern/carve/include/carve/polyline.hpp
branches/soc-2013-bge/extern/carve/include/carve/polyline_decl.hpp
branches/soc-2013-bge/extern/carve/include/carve/polyline_impl.hpp
branches/soc-2013-bge/extern/carve/include/carve/polyline_iter.hpp
branches/soc-2013-bge/extern/carve/include/carve/rescale.hpp
branches/soc-2013-bge/extern/carve/include/carve/rtree.hpp
branches/soc-2013-bge/extern/carve/include/carve/spacetree.hpp
branches/soc-2013-bge/extern/carve/include/carve/tag.hpp
branches/soc-2013-bge/extern/carve/include/carve/timing.hpp
branches/soc-2013-bge/extern/carve/include/carve/tree.hpp
branches/soc-2013-bge/extern/carve/include/carve/triangulator.hpp
branches/soc-2013-bge/extern/carve/include/carve/triangulator_impl.hpp
branches/soc-2013-bge/extern/carve/include/carve/util.hpp
branches/soc-2013-bge/extern/carve/include/carve/vector.hpp
branches/soc-2013-bge/extern/carve/include/carve/vertex_decl.hpp
branches/soc-2013-bge/extern/carve/include/carve/vertex_impl.hpp
branches/soc-2013-bge/extern/carve/lib/csg_collector.hpp
branches/soc-2013-bge/extern/carve/lib/csg_data.hpp
branches/soc-2013-bge/extern/carve/lib/csg_detail.hpp
branches/soc-2013-bge/extern/carve/lib/intersect_classify_common.hpp
branches/soc-2013-bge/extern/carve/lib/intersect_classify_common_impl.hpp
branches/soc-2013-bge/extern/carve/lib/intersect_common.hpp
branches/soc-2013-bge/extern/carve/lib/intersect_debug.hpp
branches/soc-2013-bge/extern/carve/patches/files/random.hpp
branches/soc-2013-bge/extern/libmv/libmv/simple_pipeline/keyframe_selection.cc
branches/soc-2013-bge/extern/libmv/libmv/simple_pipeline/keyframe_selection.h
branches/soc-2013-bge/extern/libmv/libmv/simple_pipeline/reconstruction_scale.cc
branches/soc-2013-bge/extern/libmv/libmv/simple_pipeline/reconstruction_scale.h
branches/soc-2013-bge/extern/libmv/third_party/ceres/include/ceres/autodiff_local_parameterization.h
branches/soc-2013-bge/extern/libmv/third_party/ceres/include/ceres/internal/numeric_diff.h
branches/soc-2013-bge/intern/cycles/kernel/kernel.cl
branches/soc-2013-bge/intern/cycles/kernel/kernel.cu
branches/soc-2013-bge/intern/cycles/kernel/kernel_bvh_traversal.h
branches/soc-2013-bge/intern/cycles/kernel/kernel_jitter.h
branches/soc-2013-bge/intern/cycles/kernel/shaders/node_toon_bsdf.osl
branches/soc-2013-bge/intern/cycles/kernel/shaders/node_wavelength.osl
branches/soc-2013-bge/intern/cycles/kernel/shaders/node_wireframe.osl
branches/soc-2013-bge/intern/cycles/kernel/svm/svm_wavelength.h
branches/soc-2013-bge/intern/cycles/kernel/svm/svm_wireframe.h
branches/soc-2013-bge/release/scripts/modules/nodeitems_utils.py
branches/soc-2013-bge/release/scripts/startup/nodeitems_builtins.py
branches/soc-2013-bge/release/scripts/templates_osl/ramp_closure.osl
branches/soc-2013-bge/release/scripts/templates_osl/temperature_to_rgb.osl
branches/soc-2013-bge/release/scripts/templates_osl/wavelength_to_rgb.osl
branches/soc-2013-bge/release/scripts/templates_osl/westin_closure.osl
branches/soc-2013-bge/source/blender/blenlib/BLI_math_color_blend.h
branches/soc-2013-bge/source/blender/blenlib/intern/math_color_blend_inline.c
branches/soc-2013-bge/source/blender/compositor/operations/COM_OpenCLKernels.cl
branches/soc-2013-bge/source/blender/editors/include/ED_buttons.h
branches/soc-2013-bge/source/blender/editors/interface/interface.c
branches/soc-2013-bge/source/blender/editors/space_outliner/
branches/soc-2013-bge/source/blender/nodes/shader/nodes/node_shader_bsdf_toon.c
branches/soc-2013-bge/source/blender/nodes/shader/nodes/node_shader_wavelength.c
branches/soc-2013-bge/source/blender/nodes/shader/nodes/node_shader_wireframe.c
Property changes on: branches/soc-2013-bge
___________________________________________________________________
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
/branches/soc-2013-depsgraph_mt:57516
/tags/blender-2.67b-release/blender:57122
+ /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
/branches/soc-2013-depsgraph_mt:57516
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57538-57869
Modified: branches/soc-2013-bge/CMakeLists.txt
===================================================================
--- branches/soc-2013-bge/CMakeLists.txt 2013-06-29 02:34:19 UTC (rev 57869)
+++ branches/soc-2013-bge/CMakeLists.txt 2013-06-29 07:00:38 UTC (rev 57870)
@@ -264,7 +264,7 @@
option(WITH_CYCLES_TEST "Build cycles test application" OFF)
option(WITH_CYCLES_OSL "Build Cycles with OSL support" OFF)
option(WITH_CYCLES_CUDA_BINARIES "Build cycles CUDA binaries" OFF)
-set(CYCLES_CUDA_BINARIES_ARCH sm_20 sm_21 sm_30 CACHE STRING "CUDA architectures to build binaries for")
+set(CYCLES_CUDA_BINARIES_ARCH sm_20 sm_21 sm_30 sm_35 CACHE STRING "CUDA architectures to build binaries for")
mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH)
unset(PLATFORM_DEFAULT)
@@ -562,12 +562,12 @@
if(UNIX AND NOT APPLE)
macro(find_package_wrapper)
string(TOUPPER ${ARGV0} _NAME_UPPER)
- if(${WITH_STATIC_LIBS})
+ if(WITH_STATIC_LIBS)
set(_cmake_find_library_suffixes_back ${CMAKE_FIND_LIBRARY_SUFFIXES})
set(CMAKE_FIND_LIBRARY_SUFFIXES .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
endif()
find_package(${ARGV})
- if(${WITH_STATIC_LIBS})
+ if(WITH_STATIC_LIBS)
set(CMAKE_FIND_LIBRARY_SUFFIXES ${_cmake_find_library_suffixes_back})
unset(_cmake_find_library_suffixes_back)
endif()
@@ -707,7 +707,7 @@
if(WITH_BOOST)
# uses in build instructions to override include and library variables
if(NOT BOOST_CUSTOM)
- if(${WITH_STATIC_LIBS})
+ if(WITH_STATIC_LIBS)
set(Boost_USE_STATIC_LIBS ON)
endif()
set(Boost_USE_MULTITHREADED ON)
Modified: branches/soc-2013-bge/SConstruct
===================================================================
--- branches/soc-2013-bge/SConstruct 2013-06-29 02:34:19 UTC (rev 57869)
+++ branches/soc-2013-bge/SConstruct 2013-06-29 07:00:38 UTC (rev 57870)
@@ -137,6 +137,8 @@
B.quickie=[]
toolset = B.arguments.get('BF_TOOLSET', None)
+vcver = B.arguments.get('MSVS_VERSION', '9.0')
+
if toolset:
print "Using " + toolset
if toolset=='mstoolkit':
@@ -148,9 +150,9 @@
btools.SetupSpawn(env)
else:
if bitness==64 and platform=='win32':
- env = BlenderEnvironment(ENV = os.environ, MSVS_ARCH='amd64', TARGET_ARCH='x86_64')
+ env = BlenderEnvironment(ENV = os.environ, MSVS_ARCH='amd64', TARGET_ARCH='x86_64', MSVC_VERSION=vcver)
else:
- env = BlenderEnvironment(ENV = os.environ, TARGET_ARCH='x86')
+ env = BlenderEnvironment(ENV = os.environ, TARGET_ARCH='x86', MSVC_VERSION=vcver)
if not env:
print "Could not create a build environment"
@@ -384,6 +386,8 @@
env['CPPFLAGS'].append('-DWITH_AUDASPACE')
env['CPPFLAGS'].append('-DWITH_AVI')
env['CPPFLAGS'].append('-DWITH_BOOL_COMPAT')
+if env['OURPLATFORM'] in ('win32-vc', 'win64-vc') and env['MSVC_VERSION'] == '11.0':
+ env['CPPFLAGS'].append('-D_ALLOW_KEYWORD_MACROS')
if env['OURPLATFORM'] not in ('win32-vc', 'win64-vc'):
env['CPPFLAGS'].append('-DHAVE_STDBOOL_H')
@@ -940,7 +944,10 @@
if env['WITH_BF_OPENAL']:
dllsources.append('${LCGDIR}/openal/lib/OpenAL32.dll')
- dllsources.append('${LCGDIR}/openal/lib/wrap_oal.dll')
+ if env['OURPLATFORM'] in ('win32-vc', 'win64-vc') and env['MSVC_VERSION'] == '11.0':
+ pass
+ else:
+ dllsources.append('${LCGDIR}/openal/lib/wrap_oal.dll')
if env['WITH_BF_SNDFILE']:
dllsources.append('${LCGDIR}/sndfile/lib/libsndfile-1.dll')
Modified: branches/soc-2013-bge/build_files/build_environment/install_deps.sh
===================================================================
--- branches/soc-2013-bge/build_files/build_environment/install_deps.sh 2013-06-29 02:34:19 UTC (rev 57869)
+++ branches/soc-2013-bge/build_files/build_environment/install_deps.sh 2013-06-29 07:00:38 UTC (rev 57870)
@@ -229,7 +229,7 @@
LLVM_SKIP=false
# OSL needs to be compiled for now!
-OSL_VERSION="1.3.0"
+OSL_VERSION="1.3.2"
OSL_SOURCE="https://github.com/imageworks/OpenShadingLanguage/archive/Release-$OSL_VERSION.tar.gz"
OSL_FORCE_REBUILD=false
OSL_SKIP=false
@@ -1527,7 +1527,7 @@
compile_OSL() {
# To be changed each time we make edits that would modify the compiled result!
- osl_magic=9
+ osl_magic=10
_init_osl
# Clean install if needed!
@@ -1550,7 +1550,7 @@
tar -C $SRC --transform "s,(.*/?)OpenShadingLanguage-[^/]*(.*),\1OpenShadingLanguage-$OSL_VERSION\2,x" \
-xf $_src.tar.gz
cd $_src
- git checkout blender-fixes
+ #git checkout blender-fixes
cd $CWD
fi
@@ -2278,8 +2278,18 @@
fi
_suse_rel="`grep VERSION /etc/SuSE-release | gawk '{print $3}'`"
- sudo zypper ar -f http://packman.inode.at/suse/openSUSE_$_suse_rel/ packman
+ INFO ""
+ INFO "About to add 'packman' repository from http://packman.inode.at/suse/openSUSE_$_suse_rel/"
+ INFO "This is only needed if you do not already have a packman repository enabled..."
+ read -p "Do you want to add this repo (Y/n)?"
+ if [ "$(echo ${REPLY:=Y} | tr [:upper:] [:lower:])" == "y" ]; then
+ INFO " Installing packman..."
+ sudo zypper ar --refresh --name 'Packman Repository' http://ftp.gwdg.de/pub/linux/packman/suse/openSUSE_$_suse_rel/ ftp.gwdg.de-suse
+ INFO " Done."
+ else
+ INFO " Skipping packman installation."
+ fi
sudo zypper --non-interactive --gpg-auto-import-keys update --auto-agree-with-licenses
fi
Modified: branches/soc-2013-bge/build_files/buildbot/config/user-config-cuda-glibc211-i686.py
===================================================================
--- branches/soc-2013-bge/build_files/buildbot/config/user-config-cuda-glibc211-i686.py 2013-06-29 02:34:19 UTC (rev 57869)
+++ branches/soc-2013-bge/build_files/buildbot/config/user-config-cuda-glibc211-i686.py 2013-06-29 07:00:38 UTC (rev 57870)
@@ -2,4 +2,4 @@
BF_INSTALLDIR = '../blender-install/linux-glibc211-i686'
BF_NUMJOBS = 1
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30']
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30', 'sm_35']
Modified: branches/soc-2013-bge/build_files/buildbot/config/user-config-cuda-glibc211-x86_64.py
===================================================================
--- branches/soc-2013-bge/build_files/buildbot/config/user-config-cuda-glibc211-x86_64.py 2013-06-29 02:34:19 UTC (rev 57869)
+++ branches/soc-2013-bge/build_files/buildbot/config/user-config-cuda-glibc211-x86_64.py 2013-06-29 07:00:38 UTC (rev 57870)
@@ -2,4 +2,4 @@
BF_INSTALLDIR = '../blender-install/linux-glibc211-x86_64'
BF_NUMJOBS = 1
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30']
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30', 'sm_35']
Modified: branches/soc-2013-bge/build_files/buildbot/config/user-config-glibc211-i686.py
===================================================================
--- branches/soc-2013-bge/build_files/buildbot/config/user-config-glibc211-i686.py 2013-06-29 02:34:19 UTC (rev 57869)
+++ branches/soc-2013-bge/build_files/buildbot/config/user-config-glibc211-i686.py 2013-06-29 07:00:38 UTC (rev 57870)
@@ -55,6 +55,8 @@
WITH_BF_FREETYPE_STATIC = False
WITH_BF_OPENEXR = True
+BF_OPENEXR = '/opt/lib/openexr'
+BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR ${BF_OPENEXR}/include'
WITH_BF_STATICOPENEXR = True
WITH_BF_TIFF = True
Modified: branches/soc-2013-bge/build_files/buildbot/config/user-config-glibc211-x86_64.py
===================================================================
--- branches/soc-2013-bge/build_files/buildbot/config/user-config-glibc211-x86_64.py 2013-06-29 02:34:19 UTC (rev 57869)
+++ branches/soc-2013-bge/build_files/buildbot/config/user-config-glibc211-x86_64.py 2013-06-29 07:00:38 UTC (rev 57870)
@@ -55,6 +55,8 @@
WITH_BF_FREETYPE_STATIC = False
WITH_BF_OPENEXR = True
+BF_OPENEXR = '/opt/lib/openexr'
+BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR ${BF_OPENEXR}/include'
WITH_BF_STATICOPENEXR = True
WITH_BF_TIFF = True
Modified: branches/soc-2013-bge/build_files/buildbot/config/user-config-mac-i386.py
===================================================================
--- branches/soc-2013-bge/build_files/buildbot/config/user-config-mac-i386.py 2013-06-29 02:34:19 UTC (rev 57869)
+++ branches/soc-2013-bge/build_files/buildbot/config/user-config-mac-i386.py 2013-06-29 07:00:38 UTC (rev 57870)
@@ -315,7 +315,7 @@
WITH_BF_CYCLES_CUDA_BINARIES = True
BF_CYCLES_CUDA_NVCC = '/usr/local/cuda/bin/nvcc'
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30']
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30', 'sm_35']
#Freestyle
WITH_BF_FREESTYLE = True
Modified: branches/soc-2013-bge/build_files/buildbot/config/user-config-mac-x86_64.py
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list