[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42605] branches/soc-2011-onion-uv-tools: merge with trunk 42603
Antony Riakiotakis
kalast at gmail.com
Tue Dec 13 14:03:40 CET 2011
Revision: 42605
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42605
Author: psy-fi
Date: 2011-12-13 13:03:28 +0000 (Tue, 13 Dec 2011)
Log Message:
-----------
merge with trunk 42603
Modified Paths:
--------------
branches/soc-2011-onion-uv-tools/CMakeLists.txt
branches/soc-2011-onion-uv-tools/SConstruct
branches/soc-2011-onion-uv-tools/build_files/buildbot/config/user-config-i686.py
branches/soc-2011-onion-uv-tools/build_files/buildbot/config/user-config-player-x86_64.py
branches/soc-2011-onion-uv-tools/build_files/buildbot/config/user-config-x86_64.py
branches/soc-2011-onion-uv-tools/build_files/cmake/cmake_qtcreator_project.py
branches/soc-2011-onion-uv-tools/build_files/scons/config/darwin-config.py
branches/soc-2011-onion-uv-tools/build_files/scons/config/win32-vc-config.py
branches/soc-2011-onion-uv-tools/build_files/scons/config/win64-vc-config.py
branches/soc-2011-onion-uv-tools/build_files/scons/tools/Blender.py
branches/soc-2011-onion-uv-tools/build_files/scons/tools/btools.py
branches/soc-2011-onion-uv-tools/doc/manpage/blender.1
branches/soc-2011-onion-uv-tools/doc/python_api/sphinx_doc_gen.py
branches/soc-2011-onion-uv-tools/extern/libmv/CMakeLists.txt
branches/soc-2011-onion-uv-tools/extern/libmv/libmv/numeric/numeric.h
branches/soc-2011-onion-uv-tools/extern/libmv/libmv/tracking/esm_region_tracker.cc
branches/soc-2011-onion-uv-tools/extern/libmv/libmv/tracking/esm_region_tracker.h
branches/soc-2011-onion-uv-tools/extern/libmv/libmv-capi.cpp
branches/soc-2011-onion-uv-tools/extern/libmv/libmv-capi.h
branches/soc-2011-onion-uv-tools/extern/libmv/third_party/glog/src/config.h
branches/soc-2011-onion-uv-tools/intern/audaspace/jack/AUD_JackDevice.h
branches/soc-2011-onion-uv-tools/intern/cycles/app/cycles_xml.cpp
branches/soc-2011-onion-uv-tools/intern/cycles/blender/addon/ui.py
branches/soc-2011-onion-uv-tools/intern/cycles/blender/blender_mesh.cpp
branches/soc-2011-onion-uv-tools/intern/cycles/blender/blender_object.cpp
branches/soc-2011-onion-uv-tools/intern/cycles/blender/blender_shader.cpp
branches/soc-2011-onion-uv-tools/intern/cycles/blender/blender_sync.cpp
branches/soc-2011-onion-uv-tools/intern/cycles/blender/blender_sync.h
branches/soc-2011-onion-uv-tools/intern/cycles/bvh/bvh_build.cpp
branches/soc-2011-onion-uv-tools/intern/cycles/device/device.h
branches/soc-2011-onion-uv-tools/intern/cycles/device/device_cuda.cpp
branches/soc-2011-onion-uv-tools/intern/cycles/device/device_multi.cpp
branches/soc-2011-onion-uv-tools/intern/cycles/device/device_opencl.cpp
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/CMakeLists.txt
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/SConscript
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/CMakeLists.txt
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/node_color.h
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/node_mix.osl
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/svm/svm.h
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/svm/svm_mix.h
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/svm/svm_types.h
branches/soc-2011-onion-uv-tools/intern/cycles/render/mesh.cpp
branches/soc-2011-onion-uv-tools/intern/cycles/render/nodes.cpp
branches/soc-2011-onion-uv-tools/intern/cycles/render/nodes.h
branches/soc-2011-onion-uv-tools/intern/cycles/render/session.cpp
branches/soc-2011-onion-uv-tools/intern/cycles/render/session.h
branches/soc-2011-onion-uv-tools/intern/cycles/render/sobol.cpp
branches/soc-2011-onion-uv-tools/intern/cycles/render/sobol.h
branches/soc-2011-onion-uv-tools/intern/cycles/util/util_boundbox.h
branches/soc-2011-onion-uv-tools/intern/cycles/util/util_math.h
branches/soc-2011-onion-uv-tools/intern/cycles/util/util_md5.cpp
branches/soc-2011-onion-uv-tools/intern/cycles/util/util_transform.h
branches/soc-2011-onion-uv-tools/release/scripts/modules/bpy/path.py
branches/soc-2011-onion-uv-tools/release/scripts/modules/bpy_extras/image_utils.py
branches/soc-2011-onion-uv-tools/release/scripts/modules/bpy_extras/io_utils.py
branches/soc-2011-onion-uv-tools/release/scripts/presets/tracking_settings/default.py
branches/soc-2011-onion-uv-tools/release/scripts/presets/tracking_settings/fast_motion.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_operators/anim.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_operators/clip.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_operators/image.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_operators/object_randomize_transform.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_operators/wm.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_render.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_texture.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_clip.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2011-onion-uv-tools/source/blender/CMakeLists.txt
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_DerivedMesh.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_blender.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_customdata.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_deform.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_effect.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_group.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_mesh.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_object.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_utildefines.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/armature.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/brush.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/deform.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/dynamicpaint.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/editderivedmesh.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/effect.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/group.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/ipo.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/lattice.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/library.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/mesh.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/mesh_validate.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/multires.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/object.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/paint.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/particle.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/scene.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/seqeffects.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/text.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/tracking.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/unit.c
branches/soc-2011-onion-uv-tools/source/blender/blenlib/BLI_fileops.h
branches/soc-2011-onion-uv-tools/source/blender/blenlib/BLI_math_geom.h
branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/bpath.c
branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/math_base_inline.c
branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/math_geom.c
branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/math_matrix.c
branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/scanfill.c
branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/storage.c
branches/soc-2011-onion-uv-tools/source/blender/blenloader/intern/readfile.c
branches/soc-2011-onion-uv-tools/source/blender/blenloader/intern/writefile.c
branches/soc-2011-onion-uv-tools/source/blender/editors/animation/anim_ipo_utils.c
branches/soc-2011-onion-uv-tools/source/blender/editors/animation/keyframing.c
branches/soc-2011-onion-uv-tools/source/blender/editors/animation/keyingsets.c
branches/soc-2011-onion-uv-tools/source/blender/editors/armature/editarmature.c
branches/soc-2011-onion-uv-tools/source/blender/editors/armature/meshlaplacian.c
branches/soc-2011-onion-uv-tools/source/blender/editors/armature/poseobject.c
branches/soc-2011-onion-uv-tools/source/blender/editors/gpencil/drawgpencil.c
branches/soc-2011-onion-uv-tools/source/blender/editors/gpencil/gpencil_buttons.c
branches/soc-2011-onion-uv-tools/source/blender/editors/include/ED_object.h
branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface_draw.c
branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface_handlers.c
branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface_ops.c
branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface_regions.c
branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface_templates.c
branches/soc-2011-onion-uv-tools/source/blender/editors/interface/resources.c
branches/soc-2011-onion-uv-tools/source/blender/editors/mesh/editmesh.c
branches/soc-2011-onion-uv-tools/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2011-onion-uv-tools/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2011-onion-uv-tools/source/blender/editors/mesh/mesh_data.c
branches/soc-2011-onion-uv-tools/source/blender/editors/mesh/meshtools.c
branches/soc-2011-onion-uv-tools/source/blender/editors/metaball/mball_edit.c
branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_add.c
branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_bake.c
branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_edit.c
branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_hook.c
branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_modifier.c
branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_ops.c
branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_relations.c
branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_select.c
branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_transform.c
branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_vgroup.c
branches/soc-2011-onion-uv-tools/source/blender/editors/render/render_internal.c
branches/soc-2011-onion-uv-tools/source/blender/editors/screen/screendump.c
branches/soc-2011-onion-uv-tools/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2011-onion-uv-tools/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_clip/clip_graph_draw.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_clip/clip_ops.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_clip/clip_toolbar.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_file/file_ops.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_node/node_draw.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_node/node_edit.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_outliner/outliner_select.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_outliner/outliner_tree.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_sequencer/space_sequencer.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_time/space_time.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/view3d_toolbar.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2011-onion-uv-tools/source/blender/editors/transform/transform.h
branches/soc-2011-onion-uv-tools/source/blender/editors/transform/transform_conversions.c
branches/soc-2011-onion-uv-tools/source/blender/editors/transform/transform_generics.c
branches/soc-2011-onion-uv-tools/source/blender/editors/transform/transform_input.c
branches/soc-2011-onion-uv-tools/source/blender/editors/util/undo.c
branches/soc-2011-onion-uv-tools/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2011-onion-uv-tools/source/blender/gpu/GPU_draw.h
branches/soc-2011-onion-uv-tools/source/blender/gpu/GPU_material.h
branches/soc-2011-onion-uv-tools/source/blender/gpu/intern/gpu_codegen.c
branches/soc-2011-onion-uv-tools/source/blender/gpu/intern/gpu_draw.c
branches/soc-2011-onion-uv-tools/source/blender/gpu/intern/gpu_material.c
branches/soc-2011-onion-uv-tools/source/blender/imbuf/intern/allocimbuf.c
branches/soc-2011-onion-uv-tools/source/blender/imbuf/intern/thumbs.c
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_action_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_camera_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_constraint_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_curve_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_key_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_lamp_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_lattice_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_material_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_mesh_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_meshdata_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_meta_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_node_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_object_force.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_object_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_particle_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_scene_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_sequence_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_space_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_texture_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_tracking_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_view3d_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_world_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/intern/makesdna.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_access.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_actuator.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_brush.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_curve.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_lamp.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_material.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_object.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_object_api.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_particle.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_sensor.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_tracking.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_hook.c
branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_mask.c
branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_mirror.c
branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_weightvg_util.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_camera.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_hueSatVal.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_invert.c
branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_driver.c
branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_rna.c
branches/soc-2011-onion-uv-tools/source/blender/python/intern/gpu.c
branches/soc-2011-onion-uv-tools/source/blender/quicktime/apple/qtkit_export.m
branches/soc-2011-onion-uv-tools/source/blender/quicktime/apple/quicktime_export.c
branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/convertblender.c
branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/pipeline.c
branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/rayshade.c
branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/render_texture.c
branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/shadeinput.c
branches/soc-2011-onion-uv-tools/source/blender/windowmanager/WM_api.h
branches/soc-2011-onion-uv-tools/source/blender/windowmanager/intern/wm_draw.c
branches/soc-2011-onion-uv-tools/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2011-onion-uv-tools/source/blender/windowmanager/intern/wm_gesture.c
branches/soc-2011-onion-uv-tools/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2011-onion-uv-tools/source/gameengine/Converter/BL_SkinDeformer.cpp
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/BL_BlenderShader.cpp
Added Paths:
-----------
branches/soc-2011-onion-uv-tools/extern/libmv/libmv/tracking/brute_region_tracker.cc
branches/soc-2011-onion-uv-tools/extern/libmv/libmv/tracking/brute_region_tracker.h
branches/soc-2011-onion-uv-tools/extern/libmv/libmv/tracking/hybrid_region_tracker.cc
branches/soc-2011-onion-uv-tools/extern/libmv/libmv/tracking/hybrid_region_tracker.h
branches/soc-2011-onion-uv-tools/extern/libmv/third_party/glog/src/config_freebsd.h
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/node_camera.osl
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/node_hsv.osl
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/node_invert.osl
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/svm/svm_camera.h
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/svm/svm_hsv.h
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/svm/svm_invert.h
branches/soc-2011-onion-uv-tools/release/scripts/presets/tracking_settings/blurry_footage.py
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_defs.h
Removed Paths:
-------------
branches/soc-2011-onion-uv-tools/release/scripts/presets/tracking_settings/blurry_movie.py
Property Changed:
----------------
branches/soc-2011-onion-uv-tools/
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/node_add_closure.osl
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/node_attribute.osl
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/node_background.osl
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/node_blend_texture.osl
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/node_blend_weight.osl
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/node_bump.osl
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/node_clouds_texture.osl
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/node_convert_from_color.osl
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/node_convert_from_float.osl
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/node_convert_from_normal.osl
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/node_convert_from_point.osl
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/node_convert_from_vector.osl
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/node_diffuse_bsdf.osl
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/node_distorted_noise_texture.osl
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/node_emission.osl
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/node_environment_texture.osl
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/node_fresnel.osl
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/node_geometry.osl
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/node_glass_bsdf.osl
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/node_glossy_bsdf.osl
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/node_holdout.osl
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/node_image_texture.osl
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/node_light_path.osl
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/node_magic_texture.osl
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/node_mapping.osl
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/node_marble_texture.osl
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/node_math.osl
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/node_mix.osl
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/node_mix_closure.osl
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/node_musgrave_texture.osl
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/node_noise_texture.osl
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/node_output_displacement.osl
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/node_output_surface.osl
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/node_output_volume.osl
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/node_sky_texture.osl
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/node_stucci_texture.osl
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/node_texture_coordinate.osl
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/node_translucent_bsdf.osl
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/node_transparent_bsdf.osl
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/node_value.osl
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/node_vector_math.osl
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/node_velvet_bsdf.osl
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/node_voronoi_texture.osl
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/node_ward_bsdf.osl
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/node_wood_texture.osl
branches/soc-2011-onion-uv-tools/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-onion-uv-tools
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber:37517
/trunk/blender:39665-42340
+ /branches/soc-2011-cucumber:37517
/branches/soc-2011-tomato:42376,42378-42379,42397,42400
/trunk/blender:39665-42603
Modified: branches/soc-2011-onion-uv-tools/CMakeLists.txt
===================================================================
--- branches/soc-2011-onion-uv-tools/CMakeLists.txt 2011-12-13 12:51:40 UTC (rev 42604)
+++ branches/soc-2011-onion-uv-tools/CMakeLists.txt 2011-12-13 13:03:28 UTC (rev 42605)
@@ -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-2011-onion-uv-tools/SConstruct
===================================================================
--- branches/soc-2011-onion-uv-tools/SConstruct 2011-12-13 12:51:40 UTC (rev 42604)
+++ branches/soc-2011-onion-uv-tools/SConstruct 2011-12-13 13:03:28 UTC (rev 42605)
@@ -119,6 +119,12 @@
if tempbitness in (32, 64): # only set if 32 or 64 has been given
bitness = int(tempbitness)
+if bitness:
+ B.bitness = bitness
+else:
+ B.bitness = tempbitness
+
+
# first check cmdline for toolset and we create env to work on
quickie = B.arguments.get('BF_QUICK', None)
quickdebug = B.arguments.get('BF_QUICKDEBUG', None)
@@ -266,7 +272,7 @@
if k not in B.arguments:
env[k] = v
-# Extended OSX_SDK and 3D_CONNEXION_CLIENT_LIBRARY detection for OSX
+# 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'][:9] + " --"
print "Available " + env['MACOSX_SDK_CHECK']
@@ -285,6 +291,16 @@
else:
env.Append(LINKFLAGS=['-Xlinker','-weak_framework','-Xlinker','3DconnexionClient'])
+ # for now, Mac builders must download and install the JackOSX framework
+ # necessary header file lives here when installed:
+ # /Library/Frameworks/Jackmp.framework/Versions/A/Headers/jack.h
+ if env['WITH_BF_JACK'] == 1:
+ if not os.path.exists('/Library/Frameworks/Jackmp.framework'):
+ print "JackOSX install not found, disabling WITH_BF_JACK" # avoid build errors !
+ env['WITH_BF_JACK'] = 0
+ else:
+ env.Append(LINKFLAGS=['-Xlinker','-weak_framework','-Xlinker','Jackmp'])
+
if env['WITH_BF_OPENMP'] == 1:
if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
env['CCFLAGS'].append('/openmp')
Modified: branches/soc-2011-onion-uv-tools/build_files/buildbot/config/user-config-i686.py
===================================================================
--- branches/soc-2011-onion-uv-tools/build_files/buildbot/config/user-config-i686.py 2011-12-13 12:51:40 UTC (rev 42604)
+++ branches/soc-2011-onion-uv-tools/build_files/buildbot/config/user-config-i686.py 2011-12-13 13:03:28 UTC (rev 42605)
@@ -96,6 +96,7 @@
# Cycles
WITH_BF_CYCLES = True
+WITH_BF_CYCLES_CUDA_BINARIES = True
WITH_BF_OIIO = True
WITH_BF_STATICOIIO = True
Modified: branches/soc-2011-onion-uv-tools/build_files/buildbot/config/user-config-player-x86_64.py
===================================================================
--- branches/soc-2011-onion-uv-tools/build_files/buildbot/config/user-config-player-x86_64.py 2011-12-13 12:51:40 UTC (rev 42604)
+++ branches/soc-2011-onion-uv-tools/build_files/buildbot/config/user-config-player-x86_64.py 2011-12-13 13:03:28 UTC (rev 42605)
@@ -95,5 +95,5 @@
# Compilation and optimization
BF_DEBUG = False
-REL_CCFLAGS = ['-O2'] # C & C++
+REL_CCFLAGS = ['-O2', '-msse', '-msse2'] # C & C++
PLATFORM_LINKFLAGS = ['-L/home/sources/staticlibs/lib64']
Modified: branches/soc-2011-onion-uv-tools/build_files/buildbot/config/user-config-x86_64.py
===================================================================
--- branches/soc-2011-onion-uv-tools/build_files/buildbot/config/user-config-x86_64.py 2011-12-13 12:51:40 UTC (rev 42604)
+++ branches/soc-2011-onion-uv-tools/build_files/buildbot/config/user-config-x86_64.py 2011-12-13 13:03:28 UTC (rev 42605)
@@ -96,6 +96,7 @@
# Cycles
WITH_BF_CYCLES = True
+WITH_BF_CYCLES_CUDA_BINARIES = True
WITH_BF_OIIO = True
WITH_BF_STATICOIIO = True
@@ -116,5 +117,5 @@
# Compilation and optimization
BF_DEBUG = False
-REL_CCFLAGS = ['-O2'] # C & C++
+REL_CCFLAGS = ['-O2', '-msse', '-msse2'] # C & C++
PLATFORM_LINKFLAGS = ['-L/home/sources/staticlibs/lib64']
Modified: branches/soc-2011-onion-uv-tools/build_files/cmake/cmake_qtcreator_project.py
===================================================================
--- branches/soc-2011-onion-uv-tools/build_files/cmake/cmake_qtcreator_project.py 2011-12-13 12:51:40 UTC (rev 42604)
+++ branches/soc-2011-onion-uv-tools/build_files/cmake/cmake_qtcreator_project.py 2011-12-13 13:03:28 UTC (rev 42605)
@@ -47,6 +47,13 @@
import sys
+def quote_define(define):
+ if " " in define.strip():
+ return '"%s"' % define
+ else:
+ return define
+
+
def create_qtc_project_main():
files = list(source_list(SOURCE_DIR, filename_check=is_project_file))
files_rel = [os.path.relpath(f, start=PROJECT_DIR) for f in files]
@@ -99,7 +106,7 @@
qtc_cfg = os.path.join(PROJECT_DIR, "%s.config" % FILE_NAME)
f = open(qtc_cfg, 'w')
f.write("// ADD PREDEFINED MACROS HERE!\n")
- defines_final = [("#define %s %s" % item) for item in defines]
+ defines_final = [("#define %s %s" % (item[0], quote_define(item[1]))) for item in defines]
if sys.platform != "win32":
defines_final += cmake_compiler_defines()
f.write("\n".join(defines_final))
Modified: branches/soc-2011-onion-uv-tools/build_files/scons/config/darwin-config.py
===================================================================
--- branches/soc-2011-onion-uv-tools/build_files/scons/config/darwin-config.py 2011-12-13 12:51:40 UTC (rev 42604)
+++ branches/soc-2011-onion-uv-tools/build_files/scons/config/darwin-config.py 2011-12-13 13:03:28 UTC (rev 42605)
@@ -148,12 +148,12 @@
WITH_BF_STATICCXX = False
BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
-# TODO - set proper paths here (add precompiled to lib/ ? )
-WITH_BF_JACK = False
-BF_JACK = '/usr'
-BF_JACK_INC = '${BF_JACK}/include/jack'
+# we use simply jack framework
+WITH_BF_JACK = True
+BF_JACK = '/Library/Frameworks/Jackmp.framework'
+BF_JACK_INC = '${BF_JACK}/headers'
BF_JACK_LIB = 'jack'
-BF_JACK_LIBPATH = '${BF_JACK}/lib'
+BF_JACK_LIBPATH = '${BF_JACK}'
WITH_BF_SNDFILE = True
BF_SNDFILE = LIBDIR + '/sndfile'
Modified: branches/soc-2011-onion-uv-tools/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/soc-2011-onion-uv-tools/build_files/scons/config/win32-vc-config.py 2011-12-13 12:51:40 UTC (rev 42604)
+++ branches/soc-2011-onion-uv-tools/build_files/scons/config/win32-vc-config.py 2011-12-13 13:03:28 UTC (rev 42605)
@@ -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-2011-onion-uv-tools/build_files/scons/config/win64-vc-config.py
===================================================================
--- branches/soc-2011-onion-uv-tools/build_files/scons/config/win64-vc-config.py 2011-12-13 12:51:40 UTC (rev 42604)
+++ branches/soc-2011-onion-uv-tools/build_files/scons/config/win64-vc-config.py 2011-12-13 13:03:28 UTC (rev 42605)
@@ -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-2011-onion-uv-tools/build_files/scons/tools/Blender.py
===================================================================
--- branches/soc-2011-onion-uv-tools/build_files/scons/tools/Blender.py 2011-12-13 12:51:40 UTC (rev 42604)
+++ branches/soc-2011-onion-uv-tools/build_files/scons/tools/Blender.py 2011-12-13 13:03:28 UTC (rev 42605)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list