[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42429] branches/soc-2008-mxcurioni: Merged changes in the trunk up to revision 42425.
Tamito Kajiyama
rd6t-kjym at asahi-net.or.jp
Mon Dec 5 03:12:53 CET 2011
Revision: 42429
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42429
Author: kjym3
Date: 2011-12-05 02:12:49 +0000 (Mon, 05 Dec 2011)
Log Message:
-----------
Merged changes in the trunk up to revision 42425.
Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/mesh/editmesh.c
source/blender/editors/space_view3d/drawobject.c
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42425
Modified Paths:
--------------
branches/soc-2008-mxcurioni/CMakeLists.txt
branches/soc-2008-mxcurioni/SConstruct
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-i686.py
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-i686.py
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-x86_64.py
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-x86_64.py
branches/soc-2008-mxcurioni/build_files/scons/config/darwin-config.py
branches/soc-2008-mxcurioni/build_files/scons/config/linux-config.py
branches/soc-2008-mxcurioni/build_files/scons/config/win32-vc-config.py
branches/soc-2008-mxcurioni/build_files/scons/config/win64-vc-config.py
branches/soc-2008-mxcurioni/build_files/scons/tools/Blender.py
branches/soc-2008-mxcurioni/build_files/scons/tools/btools.py
branches/soc-2008-mxcurioni/doc/python_api/rst/info_best_practice.rst
branches/soc-2008-mxcurioni/doc/python_api/sphinx_doc_gen.py
branches/soc-2008-mxcurioni/extern/libmv/CMakeLists.txt
branches/soc-2008-mxcurioni/extern/libmv/bundle.sh
branches/soc-2008-mxcurioni/extern/libmv/libmv/simple_pipeline/pipeline.cc
branches/soc-2008-mxcurioni/extern/libmv/libmv/simple_pipeline/pipeline.h
branches/soc-2008-mxcurioni/extern/libmv/libmv/tracking/esm_region_tracker.cc
branches/soc-2008-mxcurioni/extern/libmv/libmv/tracking/klt_region_tracker.cc
branches/soc-2008-mxcurioni/extern/libmv/libmv/tracking/lmicklt_region_tracker.cc
branches/soc-2008-mxcurioni/extern/libmv/libmv/tracking/sad.cc
branches/soc-2008-mxcurioni/extern/libmv/libmv/tracking/trklt_region_tracker.cc
branches/soc-2008-mxcurioni/extern/libmv/libmv-capi.cpp
branches/soc-2008-mxcurioni/extern/libmv/libmv-capi.h
branches/soc-2008-mxcurioni/intern/cycles/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/cycles/SConscript
branches/soc-2008-mxcurioni/intern/cycles/app/cycles_xml.cpp
branches/soc-2008-mxcurioni/intern/cycles/blender/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/cycles/blender/addon/__init__.py
branches/soc-2008-mxcurioni/intern/cycles/blender/addon/engine.py
branches/soc-2008-mxcurioni/intern/cycles/blender/addon/enums.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_mesh.cpp
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_shader.cpp
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_sync.cpp
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_sync.h
branches/soc-2008-mxcurioni/intern/cycles/bvh/bvh_build.cpp
branches/soc-2008-mxcurioni/intern/cycles/device/device_cuda.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_bvh.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_color.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_mix.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_mix.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_types.h
branches/soc-2008-mxcurioni/intern/cycles/render/mesh.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/nodes.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/nodes.h
branches/soc-2008-mxcurioni/intern/cycles/subd/subd_mesh.cpp
branches/soc-2008-mxcurioni/intern/cycles/util/util_boundbox.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_cache.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_math.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_system.cpp
branches/soc-2008-mxcurioni/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp
branches/soc-2008-mxcurioni/release/scripts/modules/addon_utils.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/clip.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/object_randomize_transform.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/presets.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_texture.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_clip.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_info.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2008-mxcurioni/release/scripts/startup/keyingsets_builtins.py
branches/soc-2008-mxcurioni/release/text/readme.html
branches/soc-2008-mxcurioni/source/blender/CMakeLists.txt
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_bmesh.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_bmeshCustomData.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_customdata.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_deform.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_depsgraph.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_effect.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_group.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_library.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_mesh.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_node.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_object.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_scene.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_tracking.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_utildefines.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/BME_Customdata.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/BME_tools.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/action.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/armature.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/bmesh_private.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/brush.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/camera.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/curve.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/deform.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/dynamicpaint.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/effect.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/group.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/image.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/ipo.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/lamp.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/lattice.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/library.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/material.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mball.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mesh_validate.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/movieclip.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/multires.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/object.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/paint.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/scene.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/speaker.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/text.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/texture.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/tracking.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/world.c
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_geom.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_mempool.h
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_mempool.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/bpath.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_base_inline.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_geom.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_matrix.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/scanfill.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/writefile.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframing.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/meshlaplacian.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/reeb.c
branches/soc-2008-mxcurioni/source/blender/editors/gpencil/drawgpencil.c
branches/soc-2008-mxcurioni/source/blender/editors/gpencil/gpencil_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_object.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_render.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_screen.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_view3d.h
branches/soc-2008-mxcurioni/source/blender/editors/include/UI_resources.h
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_handlers.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_panel.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_templates.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/resources.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_data.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/meshtools.c
branches/soc-2008-mxcurioni/source/blender/editors/metaball/mball_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_add.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_bake.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_constraint.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_modifier.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_relations.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_transform.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_vgroup.c
branches/soc-2008-mxcurioni/source/blender/editors/physics/physics_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/render/render_opengl.c
branches/soc-2008-mxcurioni/source/blender/editors/render/render_update.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/area.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/filelist.h
branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/drawnode.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_select.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_tools.c
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/space_sequencer.c
branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_time/space_time.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawobject.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform.h
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_conversions.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_generics.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_input.c
branches/soc-2008-mxcurioni/source/blender/editors/util/undo.c
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2008-mxcurioni/source/blender/gpu/GPU_buffers.h
branches/soc-2008-mxcurioni/source/blender/gpu/GPU_draw.h
branches/soc-2008-mxcurioni/source/blender/gpu/GPU_extensions.h
branches/soc-2008-mxcurioni/source/blender/gpu/GPU_material.h
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_buffers.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_codegen.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_codegen.h
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_draw.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_shader_material.glsl
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_shader_material.glsl.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/allocimbuf.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/thumbs.c
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_action_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_camera_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_constraint_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_curve_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_key_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_lamp_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_lattice_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_material_types.h
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_meta_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_node_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_object_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_particle_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_scene_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_sequence_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_space_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_texture_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_tracking_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_view3d_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_world_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/intern/dna_genfile.c
branches/soc-2008-mxcurioni/source/blender/makesdna/intern/makesdna.c
branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_access.h
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/makesrna.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_access.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_brush.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_lamp.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_material.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nodetree_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_particle.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_rna.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sensor.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_space.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_tracking.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2008-mxcurioni/source/blender/modifiers/MOD_modifiertypes.h
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_fluidsim_util.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_mirror.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_none.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_util.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_util.h
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_weightvg_util.c
branches/soc-2008-mxcurioni/source/blender/nodes/NOD_composite.h
branches/soc-2008-mxcurioni/source/blender/nodes/NOD_shader.h
branches/soc-2008-mxcurioni/source/blender/nodes/NOD_texture.h
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_camera.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_hueSatVal.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_invert.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_sepcombRGB.c
branches/soc-2008-mxcurioni/source/blender/python/generic/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/python/generic/idprop_py_api.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_app.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_driver.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_interface.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_props.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna_anim.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna_array.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_traceback.c
branches/soc-2008-mxcurioni/source/blender/python/intern/gpu.h
branches/soc-2008-mxcurioni/source/blender/python/mathutils/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils.c
branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils.h
branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils_Color.h
branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils_Euler.c
branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils_Euler.h
branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils_Matrix.c
branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils_Matrix.h
branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils_Quaternion.c
branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils_Quaternion.h
branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils_Vector.c
branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils_Vector.h
branches/soc-2008-mxcurioni/source/blender/quicktime/apple/qtkit_export.m
branches/soc-2008-mxcurioni/source/blender/quicktime/apple/quicktime_export.c
branches/soc-2008-mxcurioni/source/blender/render/extern/include/RE_engine.h
branches/soc-2008-mxcurioni/source/blender/render/intern/include/render_types.h
branches/soc-2008-mxcurioni/source/blender/render/intern/source/convertblender.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/external_engine.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/rayshade.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/render_texture.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/rendercore.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/shadeinput.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/CMakeLists.txt
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_init_exit.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_jobs.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2008-mxcurioni/source/blenderplayer/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/xembed/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ObstacleSimulation.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ObstacleSimulation.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ParentActuator.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ParentActuator.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SteeringActuator.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SteeringActuator.h
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/CMakeLists.txt
Added Paths:
-----------
branches/soc-2008-mxcurioni/extern/libmv/libmv/simple_pipeline/callbacks.cc
branches/soc-2008-mxcurioni/extern/libmv/libmv/simple_pipeline/callbacks.h
branches/soc-2008-mxcurioni/extern/libmv/libmv/tracking/brute_region_tracker.cc
branches/soc-2008-mxcurioni/extern/libmv/libmv/tracking/brute_region_tracker.h
branches/soc-2008-mxcurioni/extern/libmv/libmv/tracking/hybrid_region_tracker.cc
branches/soc-2008-mxcurioni/extern/libmv/libmv/tracking/hybrid_region_tracker.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/SConscript
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_camera.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_hsv.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_invert.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_sepcomb_rgb.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_camera.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_hsv.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_invert.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_sepcomb_rgb.h
branches/soc-2008-mxcurioni/release/scripts/presets/tracking_settings/
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/editderivedmesh.c
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_defs.h
branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils_noise.c
branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils_noise.h
Removed Paths:
-------------
branches/soc-2008-mxcurioni/intern/cycles/blender/addon/xml.py
branches/soc-2008-mxcurioni/source/blender/python/generic/noise_py_api.c
branches/soc-2008-mxcurioni/source/blender/python/generic/noise_py_api.h
Property Changed:
----------------
branches/soc-2008-mxcurioni/
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_add_closure.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_attribute.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_background.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_blend_texture.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_blend_weight.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_bump.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_clouds_texture.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_convert_from_color.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_convert_from_float.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_convert_from_normal.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_convert_from_point.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_convert_from_vector.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_diffuse_bsdf.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_distorted_noise_texture.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_emission.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_environment_texture.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_fresnel.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_geometry.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_glass_bsdf.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_glossy_bsdf.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_holdout.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_image_texture.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_light_path.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_magic_texture.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_mapping.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_marble_texture.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_math.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_mix.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_mix_closure.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_musgrave_texture.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_noise_texture.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_output_displacement.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_output_surface.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_output_volume.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_sky_texture.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_stucci_texture.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_texture_coordinate.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_translucent_bsdf.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_transparent_bsdf.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_value.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_vector_math.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_velvet_bsdf.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_voronoi_texture.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_ward_bsdf.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_wood_texture.osl
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_texture.py
branches/soc-2008-mxcurioni/source/blender/editors/render/render_update.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/
Property changes on: branches/soc-2008-mxcurioni
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber:37517
/trunk/blender:34011-39896,39898-40096,40098-42170
+ /branches/soc-2011-cucumber:37517
/branches/soc-2011-tomato:42376,42378-42379
/trunk/blender:34011-39896,39898-40096,40098-42425
Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt 2011-12-05 01:58:24 UTC (rev 42428)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt 2011-12-05 02:12:49 UTC (rev 42429)
@@ -857,14 +857,23 @@
if(WITH_BOOST)
set(BOOST ${LIBDIR}/boost)
set(BOOST_INCLUDE_DIR ${BOOST}/include)
- set(BOOST_POSTFIX "vc90-mt-s-1_47.lib")
- set(BOOST_DEBUG_POSTFIX "vc90-mt-sgd-1_47.lib")
+ if(MSVC10)
+ set(BOOST_POSTFIX "vc100-mt-s-1_47.lib")
+ set(BOOST_DEBUG_POSTFIX "vc100-mt-sgd-1_47.lib")
+ else()
+ set(BOOST_POSTFIX "vc90-mt-s-1_47.lib")
+ set(BOOST_DEBUG_POSTFIX "vc90-mt-sgd-1_47.lib")
+ endif()
set(BOOST_LIBRARIES
- optimized libboost_date_time-${BOOST_POSTFIX} libboost_filesystem-${BOOST_POSTFIX}
- libboost_regex-${BOOST_POSTFIX} libboost_system-${BOOST_POSTFIX} libboost_thread-${BOOST_POSTFIX}
- debug libboost_date_time-${BOOST_DEBUG_POSTFIX} libboost_filesystem-${BOOST_DEBUG_POSTFIX}
- libboost_regex-${BOOST_DEBUG_POSTFIX} libboost_system-${BOOST_DEBUG_POSTFIX} libboost_thread-${BOOST_DEBUG_POSTFIX})
- set(BOOST_LIBPATH ${BOOST}/lib)
+ optimized libboost_date_time-${BOOST_POSTFIX} optimized libboost_filesystem-${BOOST_POSTFIX}
+ optimized libboost_regex-${BOOST_POSTFIX} optimized libboost_system-${BOOST_POSTFIX} optimized libboost_thread-${BOOST_POSTFIX}
+ debug libboost_date_time-${BOOST_DEBUG_POSTFIX} debug libboost_filesystem-${BOOST_DEBUG_POSTFIX}
+ debug libboost_regex-${BOOST_DEBUG_POSTFIX} debug libboost_system-${BOOST_DEBUG_POSTFIX} debug libboost_thread-${BOOST_DEBUG_POSTFIX})
+ if(MSVC10)
+ set(BOOST_LIBPATH ${BOOST}/lib/vc_10)
+ else()
+ set(BOOST_LIBPATH ${BOOST}/lib)
+ endif()
set(BOOST_DEFINITIONS "-DBOOST_ALL_NO_LIB")
endif()
Modified: branches/soc-2008-mxcurioni/SConstruct
===================================================================
--- branches/soc-2008-mxcurioni/SConstruct 2011-12-05 01:58:24 UTC (rev 42428)
+++ branches/soc-2008-mxcurioni/SConstruct 2011-12-05 02:12:49 UTC (rev 42429)
@@ -581,6 +581,14 @@
source.remove('CMakeLists.txt')
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_INTERNATIONAL']:
internationalpaths=['release' + os.sep + 'datafiles']
Modified: branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-i686.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-i686.py 2011-12-05 01:58:24 UTC (rev 42428)
+++ branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-i686.py 2011-12-05 02:12:49 UTC (rev 42429)
@@ -58,6 +58,8 @@
BF_PNG_LIB = 'libpng'
BF_PNG_LIBPATH = '/home/sources/staticlibs/lib32'
+WITH_BF_STATICLIBSAMPLERATE = True
+
WITH_BF_ZLIB = True
WITH_BF_STATICZLIB = True
BF_ZLIB_LIB_STATIC = '${BF_ZLIB}/lib/libz.a'
@@ -114,5 +116,5 @@
# Compilation and optimization
BF_DEBUG = False
-REL_CCFLAGS = ['-O2', '-msse', '-msse2'] # C & C++
+REL_CCFLAGS = ['-O2'] # C & C++
PLATFORM_LINKFLAGS = ['-L/home/sources/staticlibs/lib32']
Modified: branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-i686.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-i686.py 2011-12-05 01:58:24 UTC (rev 42428)
+++ branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-i686.py 2011-12-05 02:12:49 UTC (rev 42429)
@@ -52,6 +52,8 @@
BF_PNG_LIB = 'libpng'
BF_PNG_LIBPATH = '/home/sources/staticlibs/lib32'
+WITH_BF_STATICLIBSAMPLERATE = True
+
WITH_BF_ZLIB = True
WITH_BF_STATICZLIB = True
BF_ZLIB_LIB_STATIC = '${BF_ZLIB}/lib/libz.a'
@@ -93,5 +95,5 @@
# Compilation and optimization
BF_DEBUG = False
-REL_CCFLAGS = ['-O2', '-msse', '-msse2'] # C & C++
+REL_CCFLAGS = ['-O2'] # C & C++
PLATFORM_LINKFLAGS = ['-L/home/sources/staticlibs/lib32']
Modified: branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-x86_64.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-x86_64.py 2011-12-05 01:58:24 UTC (rev 42428)
+++ branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-x86_64.py 2011-12-05 02:12:49 UTC (rev 42429)
@@ -48,6 +48,8 @@
BF_JPEG_LIB = 'libjpeg'
BF_JPEG_LIBPATH = '/home/sources/staticlibs/lib64'
+WITH_BF_STATICLIBSAMPLERATE = True
+
WITH_BF_PNG = True
BF_PNG_LIB = 'libpng'
BF_PNG_LIBPATH = '/home/sources/staticlibs/lib64'
@@ -93,5 +95,5 @@
# Compilation and optimization
BF_DEBUG = False
-REL_CCFLAGS = ['-O2', '-msse', '-msse2'] # C & C++
+REL_CCFLAGS = ['-O2'] # C & C++
PLATFORM_LINKFLAGS = ['-L/home/sources/staticlibs/lib64']
Modified: branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-x86_64.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-x86_64.py 2011-12-05 01:58:24 UTC (rev 42428)
+++ branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-x86_64.py 2011-12-05 02:12:49 UTC (rev 42429)
@@ -58,6 +58,8 @@
BF_PNG_LIB = 'libpng'
BF_PNG_LIBPATH = '/home/sources/staticlibs/lib64'
+WITH_BF_STATICLIBSAMPLERATE = True
+
WITH_BF_ZLIB = True
WITH_BF_STATICZLIB = True
BF_ZLIB_LIB_STATIC = '${BF_ZLIB}/lib/libz.a'
@@ -114,5 +116,5 @@
# Compilation and optimization
BF_DEBUG = False
-REL_CCFLAGS = ['-O2', '-msse', '-msse2'] # C & C++
+REL_CCFLAGS = ['-O2'] # C & C++
PLATFORM_LINKFLAGS = ['-L/home/sources/staticlibs/lib64']
Modified: branches/soc-2008-mxcurioni/build_files/scons/config/darwin-config.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/config/darwin-config.py 2011-12-05 01:58:24 UTC (rev 42428)
+++ branches/soc-2008-mxcurioni/build_files/scons/config/darwin-config.py 2011-12-05 02:12:49 UTC (rev 42429)
@@ -283,7 +283,7 @@
#BF_EXPAT_LIB = 'expat'
#BF_EXPAT_LIBPATH = '/usr/lib'
-#Cycles
+# Cycles
WITH_BF_CYCLES = True
WITH_BF_OIIO = True
@@ -298,6 +298,10 @@
BF_BOOST_LIB = 'boost_date_time-mt boost_filesystem-mt boost_regex-mt boost_system-mt boost_thread-mt'
BF_BOOST_LIBPATH = BF_BOOST + '/lib'
+WITH_BF_CYCLES_CUDA_BINARIES = False
+BF_CYCLES_CUDA_NVCC = '/usr/local/cuda/bin/nvcc'
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21']
+
#Ray trace optimization
if MACOSX_ARCHITECTURE == 'x86_64' or MACOSX_ARCHITECTURE == 'i386':
WITH_BF_RAYOPTIMIZATION = True
Modified: branches/soc-2008-mxcurioni/build_files/scons/config/linux-config.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/config/linux-config.py 2011-12-05 01:58:24 UTC (rev 42428)
+++ branches/soc-2008-mxcurioni/build_files/scons/config/linux-config.py 2011-12-05 02:12:49 UTC (rev 42429)
@@ -219,6 +219,10 @@
WITH_BF_CYCLES = WITH_BF_OIIO and WITH_BF_BOOST
+WITH_BF_CYCLES_CUDA_BINARIES = False
+BF_CYCLES_CUDA_NVCC = '/usr/local/cuda/bin/nvcc'
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21']
+
WITH_BF_OPENMP = True
#Ray trace optimization
Modified: branches/soc-2008-mxcurioni/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/config/win32-vc-config.py 2011-12-05 01:58:24 UTC (rev 42428)
+++ branches/soc-2008-mxcurioni/build_files/scons/config/win32-vc-config.py 2011-12-05 02:12:49 UTC (rev 42429)
@@ -165,6 +165,11 @@
BF_BOOST_LIB = 'libboost_date_time-vc90-mt-s-1_47 libboost_filesystem-vc90-mt-s-1_47 libboost_regex-vc90-mt-s-1_47 libboost_system-vc90-mt-s-1_47 libboost_thread-vc90-mt-s-1_47'
BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
+#CUDA
+WITH_BF_CYCLES_CUDA_BINARIES = False
+#BF_CYCLES_CUDA_NVCC = "" # Path to the nvidia compiler
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21']
+
#Ray trace optimization
WITH_BF_RAYOPTIMIZATION = True
BF_RAYOPTIMIZATION_SSE_FLAGS = ['/arch:SSE']
Modified: branches/soc-2008-mxcurioni/build_files/scons/config/win64-vc-config.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/config/win64-vc-config.py 2011-12-05 01:58:24 UTC (rev 42428)
+++ branches/soc-2008-mxcurioni/build_files/scons/config/win64-vc-config.py 2011-12-05 02:12:49 UTC (rev 42429)
@@ -154,6 +154,7 @@
WITH_BF_OPENMP = True
+#Cycles
WITH_BF_CYCLES = True
WITH_BF_OIIO = True
@@ -169,6 +170,11 @@
BF_BOOST_LIB = 'libboost_date_time-vc90-mt-s-1_47 libboost_filesystem-vc90-mt-s-1_47 libboost_regex-vc90-mt-s-1_47 libboost_system-vc90-mt-s-1_47 libboost_thread-vc90-mt-s-1_47'
BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
+#CUDA
+WITH_BF_CYCLES_CUDA_BINARIES = False
+#BF_CYCLES_CUDA_NVCC = "" # Path to the nvidia compiler
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21']
+
#Ray trace optimization
WITH_BF_RAYOPTIMIZATION = True
BF_RAYOPTIMIZATION_SSE_FLAGS = ['/arch:SSE','/arch:SSE2']
Modified: branches/soc-2008-mxcurioni/build_files/scons/tools/Blender.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/tools/Blender.py 2011-12-05 01:58:24 UTC (rev 42428)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list