[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53732] branches/soc-2008-mxcurioni: Merged changes in the trunk up to revision 53729.
Tamito Kajiyama
rd6t-kjym at asahi-net.or.jp
Sat Jan 12 03:02:58 CET 2013
Revision: 53732
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53732
Author: kjym3
Date: 2013-01-12 02:02:53 +0000 (Sat, 12 Jan 2013)
Log Message:
-----------
Merged changes in the trunk up to revision 53729.
Conflicts resolved:
release/datafiles/startup.blend
source/blender/blenloader/intern/readfile.c
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53729
Modified Paths:
--------------
branches/soc-2008-mxcurioni/SConstruct
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-glibc211-i686.py
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-glibc211-x86_64.py
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-glibc211-i686.py
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-glibc211-x86_64.py
branches/soc-2008-mxcurioni/build_files/buildbot/master.cfg
branches/soc-2008-mxcurioni/build_files/buildbot/slave_compile.py
branches/soc-2008-mxcurioni/build_files/buildbot/slave_pack.py
branches/soc-2008-mxcurioni/build_files/cmake/cmake_netbeans_project.py
branches/soc-2008-mxcurioni/build_files/cmake/cmake_qtcreator_project.py
branches/soc-2008-mxcurioni/build_files/cmake/project_info.py
branches/soc-2008-mxcurioni/build_files/scons/tools/btools.py
branches/soc-2008-mxcurioni/intern/cycles/blender/addon/properties.py
branches/soc-2008-mxcurioni/intern/cycles/blender/addon/ui.py
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_curves.cpp
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_object.cpp
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_session.cpp
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_sync.cpp
branches/soc-2008-mxcurioni/intern/cycles/device/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_camera.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_emission.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_light.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_path.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_types.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/osl_services.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/osl_shader.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/shaders/node_musgrave_texture.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/shaders/node_texture.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_noise.h
branches/soc-2008-mxcurioni/intern/cycles/render/light.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/session.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/session.h
branches/soc-2008-mxcurioni/intern/cycles/render/tile.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/tile.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_math.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemX11.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowWin32.h
branches/soc-2008-mxcurioni/intern/opencolorio/fallback_impl.cc
branches/soc-2008-mxcurioni/intern/opencolorio/ocio_capi.cc
branches/soc-2008-mxcurioni/intern/opencolorio/ocio_capi.h
branches/soc-2008-mxcurioni/intern/opencolorio/ocio_impl.cc
branches/soc-2008-mxcurioni/release/datafiles/startup.blend
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/uvcalc_follow_active.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/wm.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_object.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_texture.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2008-mxcurioni/source/blender/blenfont/intern/blf_glyph.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_DerivedMesh.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_blender.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_cdderivedmesh.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_customdata.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_main.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_mesh.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_report.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/curve.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/customdata.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/displist.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/editderivedmesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/fmodifier.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/image.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/modifiers_bmesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle_system.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/pointcache.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/report.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/scene.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/screen.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/seqeffects.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sequencer.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_geom.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_rect.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_scanfill.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_utildefines.h
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_geom.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/rct.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/string.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/runtime.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/writefile.c
branches/soc-2008-mxcurioni/source/blender/bmesh/bmesh_class.h
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_interp.c
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_log.c
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_mesh_conv.c
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_mesh_conv.h
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_polygon.c
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_walkers_impl.c
branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_triangulate.c
branches/soc-2008-mxcurioni/source/blender/bmesh/tools/bmesh_bevel.c
branches/soc-2008-mxcurioni/source/blender/bmesh/tools/bmesh_decimate_collapse.c
branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_Node.h
branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_ImageNode.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_PixelateNode.cpp
branches/soc-2008-mxcurioni/source/blender/editors/animation/fmodifier_ui.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/meshlaplacian.c
branches/soc-2008-mxcurioni/source/blender/editors/include/BIF_glutil.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_view3d.h
branches/soc-2008-mxcurioni/source/blender/editors/include/UI_interface.h
branches/soc-2008-mxcurioni/source/blender/editors/include/UI_resources.h
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_handlers.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_icons.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_layout.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_regions.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_widgets.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/resources.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/view2d.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/view2d_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_knife.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_select.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_utils.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_data.c
branches/soc-2008-mxcurioni/source/blender/editors/physics/physics_fluid.c
branches/soc-2008-mxcurioni/source/blender/editors/render/render_opengl.c
branches/soc-2008-mxcurioni/source/blender/editors/render/render_preview.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/area.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/glutil.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_image_2d.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_editor.c
branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_clip/space_clip.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/file_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_info/textview.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/drawnode.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_view.c
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawanimviz.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawobject.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_fly.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_conversions.c
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_smart_stitch.c
branches/soc-2008-mxcurioni/source/blender/imbuf/IMB_imbuf.h
branches/soc-2008-mxcurioni/source/blender/imbuf/IMB_thumbs.h
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/colormanagement.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/dds/ColorBlock.h
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/dds/DirectDrawSurface.h
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/divers.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/imageprocess.c
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_mesh_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_meshdata_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_object_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_access.h
branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_define.h
branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/makesrna.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_ID.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_access.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_animation.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_color.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_define.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_internal_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_particle.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_render.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sequencer_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_tracking.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_ui.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_wm.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_world.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_screw.c
branches/soc-2008-mxcurioni/source/blender/python/BPY_extern.h
branches/soc-2008-mxcurioni/source/blender/python/bmesh/bmesh_py_ops_call.c
branches/soc-2008-mxcurioni/source/blender/python/bmesh/bmesh_py_types.c
branches/soc-2008-mxcurioni/source/blender/python/bmesh/bmesh_py_types_customdata.c
branches/soc-2008-mxcurioni/source/blender/python/generic/bpy_internal_import.h
branches/soc-2008-mxcurioni/source/blender/python/generic/py_capi_utils.c
branches/soc-2008-mxcurioni/source/blender/python/generic/py_capi_utils.h
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_app.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_app_ffmpeg.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_driver.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_interface.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_interface_atexit.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_library.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_operator.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_operator_wrap.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_path.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_props.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.h
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna_anim.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna_callback.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_util.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_util.h
branches/soc-2008-mxcurioni/source/blender/quicktime/apple/qtkit_export.m
branches/soc-2008-mxcurioni/source/blender/quicktime/quicktime_export.h
branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_octree.cpp
branches/soc-2008-mxcurioni/source/blender/render/intern/source/multires_bake.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/render_result.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/zbuf.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/WM_api.h
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_files.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_window.c
branches/soc-2008-mxcurioni/source/creator/creator.c
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2008-mxcurioni/source/tools/check_style_c.py
Added Paths:
-----------
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-cuda-glibc211-i686.py
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-cuda-glibc211-x86_64.py
branches/soc-2008-mxcurioni/doc/python_api/examples/bpy.props.5.py
Removed Paths:
-------------
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-glibc27-i686.py
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-glibc27-x86_64.py
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-glibc27-i686.py
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-glibc27-x86_64.py
Property Changed:
----------------
branches/soc-2008-mxcurioni/
branches/soc-2008-mxcurioni/doc/python_api/examples/bpy.types.UIList.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_texture.py
branches/soc-2008-mxcurioni/release/scripts/templates_py/ui_list.py
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface.c
Property changes on: branches/soc-2008-mxcurioni
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126
/trunk/blender:34011-39896,39898-40096,40098-44221,44223-44419,44421-47664,47667-51853,51855-53584
+ /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
/trunk/blender:34011-39896,39898-40096,40098-44221,44223-44419,44421-47664,47667-51853,51855-53729
Modified: branches/soc-2008-mxcurioni/SConstruct
===================================================================
--- branches/soc-2008-mxcurioni/SConstruct 2013-01-11 15:19:47 UTC (rev 53731)
+++ branches/soc-2008-mxcurioni/SConstruct 2013-01-12 02:02:53 UTC (rev 53732)
@@ -276,6 +276,11 @@
if k not in B.arguments:
env[k] = v
+if 'cudakernels' in B.targets:
+ env['WITH_BF_CYCLES'] = True
+ env['WITH_BF_CYCLES_CUDA_BINARIES'] = True
+ env['WITH_BF_PYTHON'] = False
+
# Extended OSX_SDK and 3D_CONNEXION_CLIENT_LIBRARY and JAckOSX detection for OSX
if env['OURPLATFORM']=='darwin':
print B.bc.OKGREEN + "Detected Xcode version: -- " + B.bc.ENDC + env['XCODE_CUR_VER'] + " --"
@@ -652,6 +657,7 @@
datafilestargetlist = []
dottargetlist = []
scriptinstall = []
+cubininstall = []
if env['OURPLATFORM']!='darwin':
dotblenderinstall = []
@@ -745,29 +751,30 @@
source=['intern/cycles/doc/license/'+s for s in source]
scriptinstall.append(env.Install(dir=dir,source=source))
- # cuda binaries
- if env['WITH_BF_CYCLES_CUDA_BINARIES']:
- dir=os.path.join(env['BF_INSTALLDIR'], VERSION, 'scripts', 'addons','cycles', 'lib')
- for arch in env['BF_CYCLES_CUDA_BINARIES_ARCH']:
- kernel_build_dir = os.path.join(B.root_build_dir, 'intern/cycles/kernel')
- cubin_file = os.path.join(kernel_build_dir, "kernel_%s.cubin" % arch)
- scriptinstall.append(env.Install(dir=dir,source=cubin_file))
+ if env['WITH_BF_CYCLES']:
+ # cuda binaries
+ if env['WITH_BF_CYCLES_CUDA_BINARIES']:
+ dir=os.path.join(env['BF_INSTALLDIR'], VERSION, 'scripts', 'addons','cycles', 'lib')
+ for arch in env['BF_CYCLES_CUDA_BINARIES_ARCH']:
+ kernel_build_dir = os.path.join(B.root_build_dir, 'intern/cycles/kernel')
+ cubin_file = os.path.join(kernel_build_dir, "kernel_%s.cubin" % arch)
+ cubininstall.append(env.Install(dir=dir,source=cubin_file))
- # osl shaders
- if env['WITH_BF_CYCLES_OSL']:
- dir=os.path.join(env['BF_INSTALLDIR'], VERSION, 'scripts', 'addons','cycles', 'shader')
+ # osl shaders
+ if env['WITH_BF_CYCLES_OSL']:
+ dir=os.path.join(env['BF_INSTALLDIR'], VERSION, 'scripts', 'addons','cycles', 'shader')
- osl_source_dir = Dir('./intern/cycles/kernel/shaders').srcnode().path
- oso_build_dir = os.path.join(B.root_build_dir, 'intern/cycles/kernel/shaders')
+ osl_source_dir = Dir('./intern/cycles/kernel/shaders').srcnode().path
+ oso_build_dir = os.path.join(B.root_build_dir, 'intern/cycles/kernel/shaders')
- headers='node_color.h node_fresnel.h node_texture.h oslutil.h stdosl.h'.split()
- source=['intern/cycles/kernel/shaders/'+s for s in headers]
- scriptinstall.append(env.Install(dir=dir,source=source))
+ headers='node_color.h node_fresnel.h node_texture.h oslutil.h stdosl.h'.split()
+ source=['intern/cycles/kernel/shaders/'+s for s in headers]
+ scriptinstall.append(env.Install(dir=dir,source=source))
- for f in os.listdir(osl_source_dir):
- if f.endswith('.osl'):
- oso_file = os.path.join(oso_build_dir, f.replace('.osl', '.oso'))
- scriptinstall.append(env.Install(dir=dir,source=oso_file))
+ for f in os.listdir(osl_source_dir):
+ if f.endswith('.osl'):
+ oso_file = os.path.join(oso_build_dir, f.replace('.osl', '.oso'))
+ scriptinstall.append(env.Install(dir=dir,source=oso_file))
if env['WITH_BF_OCIO']:
colormanagement = os.path.join('release', 'datafiles', 'colormanagement')
@@ -862,9 +869,9 @@
if env['OURPLATFORM']=='darwin':
allinstall = [blenderinstall, textinstall]
elif env['OURPLATFORM']=='linux':
- allinstall = [blenderinstall, dotblenderinstall, scriptinstall, textinstall, iconinstall]
+ allinstall = [blenderinstall, dotblenderinstall, scriptinstall, textinstall, iconinstall, cubininstall]
else:
- allinstall = [blenderinstall, dotblenderinstall, scriptinstall, textinstall]
+ allinstall = [blenderinstall, dotblenderinstall, scriptinstall, textinstall, cubininstall]
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc', 'linuxcross'):
dllsources = []
@@ -994,6 +1001,20 @@
Depends(buildslave_cmd, allinstall)
+cudakernels_action = env.Action(btools.cudakernels, btools.cudakernels_print)
+cudakernels_cmd = env.Command('cudakernels_exec', None, cudakernels_action)
+cudakernels_alias = env.Alias('cudakernels', cudakernels_cmd)
+
+cudakernel_dir = os.path.join(os.path.abspath(os.path.normpath(B.root_build_dir)), 'intern/cycles/kernel')
+cuda_kernels = []
+
+for x in env['BF_CYCLES_CUDA_BINARIES_ARCH']:
+ cubin = os.path.join(cudakernel_dir, 'kernel_' + x + '.cubin')
+ cuda_kernels.append(cubin)
+
+Depends(cudakernels_cmd, cuda_kernels)
+Depends(cudakernels_cmd, cubininstall)
+
Default(B.program_list)
if not env['WITHOUT_BF_INSTALL']:
Copied: branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-cuda-glibc211-i686.py (from rev 53729, trunk/blender/build_files/buildbot/config/user-config-cuda-glibc211-i686.py)
===================================================================
--- branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-cuda-glibc211-i686.py (rev 0)
+++ branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-cuda-glibc211-i686.py 2013-01-12 02:02:53 UTC (rev 53732)
@@ -0,0 +1,5 @@
+BF_BUILDDIR = '../blender-build/linux-glibc211-i686'
+BF_INSTALLDIR = '../blender-install/linux-glibc211-i686'
+BF_NUMJOBS = 1
+
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21', 'sm_30']
Copied: branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-cuda-glibc211-x86_64.py (from rev 53729, trunk/blender/build_files/buildbot/config/user-config-cuda-glibc211-x86_64.py)
===================================================================
--- branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-cuda-glibc211-x86_64.py (rev 0)
+++ branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-cuda-glibc211-x86_64.py 2013-01-12 02:02:53 UTC (rev 53732)
@@ -0,0 +1,5 @@
+BF_BUILDDIR = '../blender-build/linux-glibc211-x86_64'
+BF_INSTALLDIR = '../blender-install/linux-glibc211-x86_64'
+BF_NUMJOBS = 1
+
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21', 'sm_30']
Modified: branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-glibc211-i686.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-glibc211-i686.py 2013-01-11 15:19:47 UTC (rev 53731)
+++ branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-glibc211-i686.py 2013-01-12 02:02:53 UTC (rev 53732)
@@ -1,6 +1,7 @@
BF_BUILDDIR = '../blender-build/linux-glibc211-i686'
BF_INSTALLDIR = '../blender-install/linux-glibc211-i686'
-BF_NUMJOBS = 2
+BF_NUMJOBS = 4
+WITHOUT_BF_OVERWRITE_INSTALL = True
# Python configuration
BF_PYTHON_VERSION = '3.3'
@@ -109,8 +110,7 @@
# Cycles
WITH_BF_CYCLES = True
-WITH_BF_CYCLES_CUDA_BINARIES = True
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21', 'sm_30']
+WITH_BF_CYCLES_CUDA_BINARIES = False
WITH_BF_OIIO = True
WITH_BF_STATICOIIO = True
Modified: branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-glibc211-x86_64.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-glibc211-x86_64.py 2013-01-11 15:19:47 UTC (rev 53731)
+++ branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-glibc211-x86_64.py 2013-01-12 02:02:53 UTC (rev 53732)
@@ -1,6 +1,7 @@
BF_BUILDDIR = '../blender-build/linux-glibc211-x86_64'
BF_INSTALLDIR = '../blender-install/linux-glibc211-x86_64'
-BF_NUMJOBS = 2
+BF_NUMJOBS = 4
+WITHOUT_BF_OVERWRITE_INSTALL = True
# Python configuration
BF_PYTHON_VERSION = '3.3'
@@ -109,8 +110,7 @@
# Cycles
WITH_BF_CYCLES = True
-WITH_BF_CYCLES_CUDA_BINARIES = True
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21', 'sm_30']
+WITH_BF_CYCLES_CUDA_BINARIES = False
WITH_BF_OIIO = True
WITH_BF_STATICOIIO = True
Deleted: branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-glibc27-i686.py
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list