[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42454] branches/ge_harmony: Merge with Trunk r42453

Daniel Stokes kupomail at gmail.com
Tue Dec 6 08:24:57 CET 2011


Revision: 42454
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42454
Author:   kupoman
Date:     2011-12-06 07:24:52 +0000 (Tue, 06 Dec 2011)
Log Message:
-----------
Merge with Trunk r42453

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42453

Modified Paths:
--------------
    branches/ge_harmony/CMakeLists.txt
    branches/ge_harmony/SConstruct
    branches/ge_harmony/build_files/cmake/cmake_qtcreator_project.py
    branches/ge_harmony/build_files/scons/config/darwin-config.py
    branches/ge_harmony/build_files/scons/config/linux-config.py
    branches/ge_harmony/build_files/scons/config/win32-vc-config.py
    branches/ge_harmony/build_files/scons/config/win64-vc-config.py
    branches/ge_harmony/build_files/scons/tools/Blender.py
    branches/ge_harmony/build_files/scons/tools/btools.py
    branches/ge_harmony/doc/python_api/sphinx_doc_gen.py
    branches/ge_harmony/extern/libmv/CMakeLists.txt
    branches/ge_harmony/extern/libmv/bundle.sh
    branches/ge_harmony/extern/libmv/libmv/numeric/numeric.h
    branches/ge_harmony/extern/libmv/libmv/tracking/esm_region_tracker.cc
    branches/ge_harmony/extern/libmv/libmv/tracking/klt_region_tracker.cc
    branches/ge_harmony/extern/libmv/libmv/tracking/lmicklt_region_tracker.cc
    branches/ge_harmony/extern/libmv/libmv/tracking/trklt_region_tracker.cc
    branches/ge_harmony/extern/libmv/libmv-capi.cpp
    branches/ge_harmony/extern/libmv/libmv-capi.h
    branches/ge_harmony/extern/libmv/third_party/glog/src/config.h
    branches/ge_harmony/intern/cycles/CMakeLists.txt
    branches/ge_harmony/intern/cycles/SConscript
    branches/ge_harmony/intern/cycles/app/cycles_xml.cpp
    branches/ge_harmony/intern/cycles/blender/CMakeLists.txt
    branches/ge_harmony/intern/cycles/blender/addon/__init__.py
    branches/ge_harmony/intern/cycles/blender/addon/enums.py
    branches/ge_harmony/intern/cycles/blender/addon/properties.py
    branches/ge_harmony/intern/cycles/blender/addon/ui.py
    branches/ge_harmony/intern/cycles/blender/blender_mesh.cpp
    branches/ge_harmony/intern/cycles/blender/blender_shader.cpp
    branches/ge_harmony/intern/cycles/blender/blender_sync.cpp
    branches/ge_harmony/intern/cycles/blender/blender_sync.h
    branches/ge_harmony/intern/cycles/bvh/bvh_build.cpp
    branches/ge_harmony/intern/cycles/device/device_cuda.cpp
    branches/ge_harmony/intern/cycles/kernel/CMakeLists.txt
    branches/ge_harmony/intern/cycles/kernel/kernel_bvh.h
    branches/ge_harmony/intern/cycles/kernel/osl/nodes/CMakeLists.txt
    branches/ge_harmony/intern/cycles/kernel/osl/nodes/node_color.h
    branches/ge_harmony/intern/cycles/kernel/osl/nodes/node_mix.osl
    branches/ge_harmony/intern/cycles/kernel/svm/svm.h
    branches/ge_harmony/intern/cycles/kernel/svm/svm_mix.h
    branches/ge_harmony/intern/cycles/kernel/svm/svm_types.h
    branches/ge_harmony/intern/cycles/render/mesh.cpp
    branches/ge_harmony/intern/cycles/render/nodes.cpp
    branches/ge_harmony/intern/cycles/render/nodes.h
    branches/ge_harmony/intern/cycles/subd/subd_mesh.cpp
    branches/ge_harmony/intern/cycles/util/util_boundbox.h
    branches/ge_harmony/intern/cycles/util/util_cache.h
    branches/ge_harmony/intern/cycles/util/util_math.h
    branches/ge_harmony/intern/cycles/util/util_md5.cpp
    branches/ge_harmony/intern/cycles/util/util_system.cpp
    branches/ge_harmony/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp
    branches/ge_harmony/release/scripts/modules/bpy_extras/io_utils.py
    branches/ge_harmony/release/scripts/startup/bl_operators/clip.py
    branches/ge_harmony/release/scripts/startup/bl_operators/object_randomize_transform.py
    branches/ge_harmony/release/scripts/startup/bl_ui/properties_render.py
    branches/ge_harmony/release/scripts/startup/bl_ui/properties_texture.py
    branches/ge_harmony/release/scripts/startup/bl_ui/space_clip.py
    branches/ge_harmony/release/scripts/startup/bl_ui/space_info.py
    branches/ge_harmony/release/scripts/startup/bl_ui/space_view3d.py
    branches/ge_harmony/release/scripts/startup/keyingsets_builtins.py
    branches/ge_harmony/release/text/readme.html
    branches/ge_harmony/source/blender/CMakeLists.txt
    branches/ge_harmony/source/blender/blenkernel/BKE_DerivedMesh.h
    branches/ge_harmony/source/blender/blenkernel/BKE_blender.h
    branches/ge_harmony/source/blender/blenkernel/BKE_bmesh.h
    branches/ge_harmony/source/blender/blenkernel/BKE_bmeshCustomData.h
    branches/ge_harmony/source/blender/blenkernel/BKE_customdata.h
    branches/ge_harmony/source/blender/blenkernel/BKE_deform.h
    branches/ge_harmony/source/blender/blenkernel/BKE_effect.h
    branches/ge_harmony/source/blender/blenkernel/BKE_group.h
    branches/ge_harmony/source/blender/blenkernel/BKE_library.h
    branches/ge_harmony/source/blender/blenkernel/BKE_mesh.h
    branches/ge_harmony/source/blender/blenkernel/BKE_node.h
    branches/ge_harmony/source/blender/blenkernel/BKE_object.h
    branches/ge_harmony/source/blender/blenkernel/BKE_sequencer.h
    branches/ge_harmony/source/blender/blenkernel/BKE_utildefines.h
    branches/ge_harmony/source/blender/blenkernel/CMakeLists.txt
    branches/ge_harmony/source/blender/blenkernel/intern/BME_Customdata.c
    branches/ge_harmony/source/blender/blenkernel/intern/DerivedMesh.c
    branches/ge_harmony/source/blender/blenkernel/intern/action.c
    branches/ge_harmony/source/blender/blenkernel/intern/anim.c
    branches/ge_harmony/source/blender/blenkernel/intern/armature.c
    branches/ge_harmony/source/blender/blenkernel/intern/bmesh_private.h
    branches/ge_harmony/source/blender/blenkernel/intern/brush.c
    branches/ge_harmony/source/blender/blenkernel/intern/camera.c
    branches/ge_harmony/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/ge_harmony/source/blender/blenkernel/intern/curve.c
    branches/ge_harmony/source/blender/blenkernel/intern/deform.c
    branches/ge_harmony/source/blender/blenkernel/intern/dynamicpaint.c
    branches/ge_harmony/source/blender/blenkernel/intern/effect.c
    branches/ge_harmony/source/blender/blenkernel/intern/group.c
    branches/ge_harmony/source/blender/blenkernel/intern/image.c
    branches/ge_harmony/source/blender/blenkernel/intern/ipo.c
    branches/ge_harmony/source/blender/blenkernel/intern/lamp.c
    branches/ge_harmony/source/blender/blenkernel/intern/lattice.c
    branches/ge_harmony/source/blender/blenkernel/intern/library.c
    branches/ge_harmony/source/blender/blenkernel/intern/material.c
    branches/ge_harmony/source/blender/blenkernel/intern/mball.c
    branches/ge_harmony/source/blender/blenkernel/intern/mesh.c
    branches/ge_harmony/source/blender/blenkernel/intern/mesh_validate.c
    branches/ge_harmony/source/blender/blenkernel/intern/multires.c
    branches/ge_harmony/source/blender/blenkernel/intern/object.c
    branches/ge_harmony/source/blender/blenkernel/intern/paint.c
    branches/ge_harmony/source/blender/blenkernel/intern/particle.c
    branches/ge_harmony/source/blender/blenkernel/intern/scene.c
    branches/ge_harmony/source/blender/blenkernel/intern/speaker.c
    branches/ge_harmony/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/ge_harmony/source/blender/blenkernel/intern/text.c
    branches/ge_harmony/source/blender/blenkernel/intern/texture.c
    branches/ge_harmony/source/blender/blenkernel/intern/tracking.c
    branches/ge_harmony/source/blender/blenkernel/intern/world.c
    branches/ge_harmony/source/blender/blenlib/BLI_math_geom.h
    branches/ge_harmony/source/blender/blenlib/intern/bpath.c
    branches/ge_harmony/source/blender/blenlib/intern/math_base_inline.c
    branches/ge_harmony/source/blender/blenlib/intern/math_geom.c
    branches/ge_harmony/source/blender/blenlib/intern/math_matrix.c
    branches/ge_harmony/source/blender/blenlib/intern/scanfill.c
    branches/ge_harmony/source/blender/blenloader/intern/readfile.c
    branches/ge_harmony/source/blender/blenloader/intern/writefile.c
    branches/ge_harmony/source/blender/editors/animation/keyframing.c
    branches/ge_harmony/source/blender/editors/armature/meshlaplacian.c
    branches/ge_harmony/source/blender/editors/armature/reeb.c
    branches/ge_harmony/source/blender/editors/gpencil/drawgpencil.c
    branches/ge_harmony/source/blender/editors/gpencil/gpencil_buttons.c
    branches/ge_harmony/source/blender/editors/include/ED_object.h
    branches/ge_harmony/source/blender/editors/include/ED_screen.h
    branches/ge_harmony/source/blender/editors/include/UI_resources.h
    branches/ge_harmony/source/blender/editors/interface/interface_draw.c
    branches/ge_harmony/source/blender/editors/interface/interface_handlers.c
    branches/ge_harmony/source/blender/editors/interface/interface_panel.c
    branches/ge_harmony/source/blender/editors/interface/interface_templates.c
    branches/ge_harmony/source/blender/editors/interface/resources.c
    branches/ge_harmony/source/blender/editors/mesh/editmesh.c
    branches/ge_harmony/source/blender/editors/mesh/editmesh_mods.c
    branches/ge_harmony/source/blender/editors/mesh/editmesh_tools.c
    branches/ge_harmony/source/blender/editors/mesh/mesh_data.c
    branches/ge_harmony/source/blender/editors/mesh/meshtools.c
    branches/ge_harmony/source/blender/editors/metaball/mball_edit.c
    branches/ge_harmony/source/blender/editors/object/object_add.c
    branches/ge_harmony/source/blender/editors/object/object_bake.c
    branches/ge_harmony/source/blender/editors/object/object_constraint.c
    branches/ge_harmony/source/blender/editors/object/object_edit.c
    branches/ge_harmony/source/blender/editors/object/object_modifier.c
    branches/ge_harmony/source/blender/editors/object/object_relations.c
    branches/ge_harmony/source/blender/editors/object/object_transform.c
    branches/ge_harmony/source/blender/editors/object/object_vgroup.c
    branches/ge_harmony/source/blender/editors/physics/physics_intern.h
    branches/ge_harmony/source/blender/editors/render/render_opengl.c
    branches/ge_harmony/source/blender/editors/screen/area.c
    branches/ge_harmony/source/blender/editors/screen/screendump.c
    branches/ge_harmony/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/ge_harmony/source/blender/editors/space_clip/clip_draw.c
    branches/ge_harmony/source/blender/editors/space_clip/clip_ops.c
    branches/ge_harmony/source/blender/editors/space_clip/tracking_ops.c
    branches/ge_harmony/source/blender/editors/space_file/filelist.h
    branches/ge_harmony/source/blender/editors/space_image/image_draw.c
    branches/ge_harmony/source/blender/editors/space_node/drawnode.c
    branches/ge_harmony/source/blender/editors/space_node/node_edit.c
    branches/ge_harmony/source/blender/editors/space_outliner/outliner_draw.c
    branches/ge_harmony/source/blender/editors/space_outliner/outliner_select.c
    branches/ge_harmony/source/blender/editors/space_outliner/outliner_tools.c
    branches/ge_harmony/source/blender/editors/space_sequencer/space_sequencer.c
    branches/ge_harmony/source/blender/editors/space_text/text_draw.c
    branches/ge_harmony/source/blender/editors/space_time/space_time.c
    branches/ge_harmony/source/blender/editors/space_view3d/drawmesh.c
    branches/ge_harmony/source/blender/editors/space_view3d/drawobject.c
    branches/ge_harmony/source/blender/editors/space_view3d/view3d_draw.c
    branches/ge_harmony/source/blender/editors/space_view3d/view3d_header.c
    branches/ge_harmony/source/blender/editors/transform/transform.h
    branches/ge_harmony/source/blender/editors/transform/transform_conversions.c
    branches/ge_harmony/source/blender/editors/transform/transform_generics.c
    branches/ge_harmony/source/blender/editors/transform/transform_input.c
    branches/ge_harmony/source/blender/editors/util/undo.c
    branches/ge_harmony/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/ge_harmony/source/blender/gpu/GPU_buffers.h
    branches/ge_harmony/source/blender/gpu/GPU_draw.h
    branches/ge_harmony/source/blender/gpu/GPU_extensions.h
    branches/ge_harmony/source/blender/gpu/GPU_material.h
    branches/ge_harmony/source/blender/gpu/intern/gpu_buffers.c
    branches/ge_harmony/source/blender/gpu/intern/gpu_codegen.c
    branches/ge_harmony/source/blender/gpu/intern/gpu_codegen.h
    branches/ge_harmony/source/blender/gpu/intern/gpu_draw.c
    branches/ge_harmony/source/blender/gpu/intern/gpu_extensions.c
    branches/ge_harmony/source/blender/gpu/intern/gpu_shader_material.glsl
    branches/ge_harmony/source/blender/gpu/intern/gpu_shader_material.glsl.c
    branches/ge_harmony/source/blender/imbuf/intern/allocimbuf.c
    branches/ge_harmony/source/blender/imbuf/intern/thumbs.c
    branches/ge_harmony/source/blender/makesdna/DNA_action_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_camera_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_constraint_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_curve_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_key_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_lamp_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_lattice_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_material_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_mesh_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_meshdata_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_meta_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_modifier_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_node_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_object_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_particle_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_scene_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_sequence_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_space_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_texture_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_tracking_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_userdef_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_view3d_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_world_types.h
    branches/ge_harmony/source/blender/makesdna/intern/dna_genfile.c
    branches/ge_harmony/source/blender/makesdna/intern/makesdna.c
    branches/ge_harmony/source/blender/makesrna/RNA_access.h
    branches/ge_harmony/source/blender/makesrna/intern/makesrna.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_access.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_brush.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_define.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_internal_types.h
    branches/ge_harmony/source/blender/makesrna/intern/rna_lamp.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_material.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_nodetree.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_nodetree_types.h
    branches/ge_harmony/source/blender/makesrna/intern/rna_object.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_object_api.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_particle.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_rna.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_sculpt_paint.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_sensor.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_sequencer.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_space.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_tracking.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_userdef.c
    branches/ge_harmony/source/blender/modifiers/MOD_modifiertypes.h
    branches/ge_harmony/source/blender/modifiers/intern/MOD_mirror.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_none.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_util.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_util.h
    branches/ge_harmony/source/blender/modifiers/intern/MOD_weightvg_util.c
    branches/ge_harmony/source/blender/nodes/NOD_composite.h
    branches/ge_harmony/source/blender/nodes/NOD_shader.h
    branches/ge_harmony/source/blender/nodes/NOD_texture.h
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_camera.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_hueSatVal.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_invert.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_sepcombRGB.c
    branches/ge_harmony/source/blender/python/generic/CMakeLists.txt
    branches/ge_harmony/source/blender/python/intern/bpy_driver.c
    branches/ge_harmony/source/blender/python/intern/bpy_interface.c
    branches/ge_harmony/source/blender/python/intern/bpy_library.c
    branches/ge_harmony/source/blender/python/intern/bpy_props.c
    branches/ge_harmony/source/blender/python/intern/bpy_rna.c
    branches/ge_harmony/source/blender/python/intern/gpu.h
    branches/ge_harmony/source/blender/python/mathutils/CMakeLists.txt
    branches/ge_harmony/source/blender/python/mathutils/mathutils.c
    branches/ge_harmony/source/blender/python/mathutils/mathutils.h
    branches/ge_harmony/source/blender/python/mathutils/mathutils_Color.h
    branches/ge_harmony/source/blender/python/mathutils/mathutils_Euler.c
    branches/ge_harmony/source/blender/python/mathutils/mathutils_Euler.h
    branches/ge_harmony/source/blender/python/mathutils/mathutils_Matrix.c
    branches/ge_harmony/source/blender/python/mathutils/mathutils_Matrix.h
    branches/ge_harmony/source/blender/python/mathutils/mathutils_Quaternion.c
    branches/ge_harmony/source/blender/python/mathutils/mathutils_Quaternion.h
    branches/ge_harmony/source/blender/python/mathutils/mathutils_Vector.c
    branches/ge_harmony/source/blender/python/mathutils/mathutils_Vector.h
    branches/ge_harmony/source/blender/quicktime/apple/qtkit_export.m
    branches/ge_harmony/source/blender/quicktime/apple/quicktime_export.c
    branches/ge_harmony/source/blender/render/intern/include/render_types.h
    branches/ge_harmony/source/blender/render/intern/source/convertblender.c
    branches/ge_harmony/source/blender/render/intern/source/pipeline.c
    branches/ge_harmony/source/blender/render/intern/source/rayshade.c
    branches/ge_harmony/source/blender/render/intern/source/render_texture.c
    branches/ge_harmony/source/blender/render/intern/source/shadeinput.c
    branches/ge_harmony/source/blender/windowmanager/WM_api.h
    branches/ge_harmony/source/blender/windowmanager/intern/wm_draw.c
    branches/ge_harmony/source/blender/windowmanager/intern/wm_event_system.c
    branches/ge_harmony/source/blender/windowmanager/intern/wm_jobs.c
    branches/ge_harmony/source/blender/windowmanager/intern/wm_operators.c
    branches/ge_harmony/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/ge_harmony/source/gameengine/GamePlayer/xembed/CMakeLists.txt
    branches/ge_harmony/source/gameengine/Ketsji/KX_ObstacleSimulation.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_ObstacleSimulation.h
    branches/ge_harmony/source/gameengine/Ketsji/KX_ParentActuator.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_ParentActuator.h
    branches/ge_harmony/source/gameengine/Ketsji/KX_SteeringActuator.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_SteeringActuator.h
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp

Added Paths:
-----------
    branches/ge_harmony/extern/libmv/libmv/tracking/brute_region_tracker.cc
    branches/ge_harmony/extern/libmv/libmv/tracking/brute_region_tracker.h
    branches/ge_harmony/extern/libmv/libmv/tracking/hybrid_region_tracker.cc
    branches/ge_harmony/extern/libmv/libmv/tracking/hybrid_region_tracker.h
    branches/ge_harmony/extern/libmv/third_party/glog/src/config_freebsd.h
    branches/ge_harmony/intern/cycles/kernel/SConscript
    branches/ge_harmony/intern/cycles/kernel/osl/nodes/node_camera.osl
    branches/ge_harmony/intern/cycles/kernel/osl/nodes/node_hsv.osl
    branches/ge_harmony/intern/cycles/kernel/osl/nodes/node_invert.osl
    branches/ge_harmony/intern/cycles/kernel/osl/nodes/node_sepcomb_rgb.osl
    branches/ge_harmony/intern/cycles/kernel/svm/svm_camera.h
    branches/ge_harmony/intern/cycles/kernel/svm/svm_hsv.h
    branches/ge_harmony/intern/cycles/kernel/svm/svm_invert.h
    branches/ge_harmony/intern/cycles/kernel/svm/svm_sepcomb_rgb.h
    branches/ge_harmony/source/blender/blenkernel/intern/editderivedmesh.c
    branches/ge_harmony/source/blender/makesdna/DNA_defs.h
    branches/ge_harmony/source/blender/python/mathutils/mathutils_noise.c
    branches/ge_harmony/source/blender/python/mathutils/mathutils_noise.h

Removed Paths:
-------------
    branches/ge_harmony/intern/cycles/blender/addon/xml.py
    branches/ge_harmony/source/blender/python/generic/noise_py_api.c
    branches/ge_harmony/source/blender/python/generic/noise_py_api.h

Property Changed:
----------------
    branches/ge_harmony/
    branches/ge_harmony/intern/cycles/kernel/osl/nodes/node_add_closure.osl
    branches/ge_harmony/intern/cycles/kernel/osl/nodes/node_attribute.osl
    branches/ge_harmony/intern/cycles/kernel/osl/nodes/node_background.osl
    branches/ge_harmony/intern/cycles/kernel/osl/nodes/node_blend_texture.osl
    branches/ge_harmony/intern/cycles/kernel/osl/nodes/node_blend_weight.osl
    branches/ge_harmony/intern/cycles/kernel/osl/nodes/node_bump.osl
    branches/ge_harmony/intern/cycles/kernel/osl/nodes/node_clouds_texture.osl
    branches/ge_harmony/intern/cycles/kernel/osl/nodes/node_convert_from_color.osl
    branches/ge_harmony/intern/cycles/kernel/osl/nodes/node_convert_from_float.osl
    branches/ge_harmony/intern/cycles/kernel/osl/nodes/node_convert_from_normal.osl
    branches/ge_harmony/intern/cycles/kernel/osl/nodes/node_convert_from_point.osl
    branches/ge_harmony/intern/cycles/kernel/osl/nodes/node_convert_from_vector.osl
    branches/ge_harmony/intern/cycles/kernel/osl/nodes/node_diffuse_bsdf.osl
    branches/ge_harmony/intern/cycles/kernel/osl/nodes/node_distorted_noise_texture.osl
    branches/ge_harmony/intern/cycles/kernel/osl/nodes/node_emission.osl
    branches/ge_harmony/intern/cycles/kernel/osl/nodes/node_environment_texture.osl
    branches/ge_harmony/intern/cycles/kernel/osl/nodes/node_fresnel.osl
    branches/ge_harmony/intern/cycles/kernel/osl/nodes/node_geometry.osl
    branches/ge_harmony/intern/cycles/kernel/osl/nodes/node_glass_bsdf.osl
    branches/ge_harmony/intern/cycles/kernel/osl/nodes/node_glossy_bsdf.osl
    branches/ge_harmony/intern/cycles/kernel/osl/nodes/node_holdout.osl
    branches/ge_harmony/intern/cycles/kernel/osl/nodes/node_image_texture.osl
    branches/ge_harmony/intern/cycles/kernel/osl/nodes/node_light_path.osl
    branches/ge_harmony/intern/cycles/kernel/osl/nodes/node_magic_texture.osl
    branches/ge_harmony/intern/cycles/kernel/osl/nodes/node_mapping.osl
    branches/ge_harmony/intern/cycles/kernel/osl/nodes/node_marble_texture.osl
    branches/ge_harmony/intern/cycles/kernel/osl/nodes/node_math.osl
    branches/ge_harmony/intern/cycles/kernel/osl/nodes/node_mix.osl
    branches/ge_harmony/intern/cycles/kernel/osl/nodes/node_mix_closure.osl
    branches/ge_harmony/intern/cycles/kernel/osl/nodes/node_musgrave_texture.osl
    branches/ge_harmony/intern/cycles/kernel/osl/nodes/node_noise_texture.osl
    branches/ge_harmony/intern/cycles/kernel/osl/nodes/node_output_displacement.osl
    branches/ge_harmony/intern/cycles/kernel/osl/nodes/node_output_surface.osl
    branches/ge_harmony/intern/cycles/kernel/osl/nodes/node_output_volume.osl
    branches/ge_harmony/intern/cycles/kernel/osl/nodes/node_sky_texture.osl
    branches/ge_harmony/intern/cycles/kernel/osl/nodes/node_stucci_texture.osl
    branches/ge_harmony/intern/cycles/kernel/osl/nodes/node_texture_coordinate.osl
    branches/ge_harmony/intern/cycles/kernel/osl/nodes/node_translucent_bsdf.osl
    branches/ge_harmony/intern/cycles/kernel/osl/nodes/node_transparent_bsdf.osl
    branches/ge_harmony/intern/cycles/kernel/osl/nodes/node_value.osl
    branches/ge_harmony/intern/cycles/kernel/osl/nodes/node_vector_math.osl
    branches/ge_harmony/intern/cycles/kernel/osl/nodes/node_velvet_bsdf.osl
    branches/ge_harmony/intern/cycles/kernel/osl/nodes/node_voronoi_texture.osl
    branches/ge_harmony/intern/cycles/kernel/osl/nodes/node_ward_bsdf.osl
    branches/ge_harmony/intern/cycles/kernel/osl/nodes/node_wood_texture.osl
    branches/ge_harmony/source/blender/editors/space_outliner/


Property changes on: branches/ge_harmony
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2011-cucumber:37517
   + /branches/soc-2011-cucumber:37517
/branches/soc-2011-tomato:42376,42378-42379
/trunk/blender:42243-42453

Modified: branches/ge_harmony/CMakeLists.txt
===================================================================
--- branches/ge_harmony/CMakeLists.txt	2011-12-06 05:59:43 UTC (rev 42453)
+++ branches/ge_harmony/CMakeLists.txt	2011-12-06 07:24:52 UTC (rev 42454)
@@ -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/ge_harmony/SConstruct
===================================================================
--- branches/ge_harmony/SConstruct	2011-12-06 05:59:43 UTC (rev 42453)
+++ branches/ge_harmony/SConstruct	2011-12-06 07:24:52 UTC (rev 42454)
@@ -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/ge_harmony/build_files/cmake/cmake_qtcreator_project.py
===================================================================
--- branches/ge_harmony/build_files/cmake/cmake_qtcreator_project.py	2011-12-06 05:59:43 UTC (rev 42453)
+++ branches/ge_harmony/build_files/cmake/cmake_qtcreator_project.py	2011-12-06 07:24:52 UTC (rev 42454)
@@ -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/ge_harmony/build_files/scons/config/darwin-config.py
===================================================================
--- branches/ge_harmony/build_files/scons/config/darwin-config.py	2011-12-06 05:59:43 UTC (rev 42453)
+++ branches/ge_harmony/build_files/scons/config/darwin-config.py	2011-12-06 07:24:52 UTC (rev 42454)
@@ -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/ge_harmony/build_files/scons/config/linux-config.py
===================================================================
--- branches/ge_harmony/build_files/scons/config/linux-config.py	2011-12-06 05:59:43 UTC (rev 42453)
+++ branches/ge_harmony/build_files/scons/config/linux-config.py	2011-12-06 07:24:52 UTC (rev 42454)
@@ -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/ge_harmony/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/ge_harmony/build_files/scons/config/win32-vc-config.py	2011-12-06 05:59:43 UTC (rev 42453)
+++ branches/ge_harmony/build_files/scons/config/win32-vc-config.py	2011-12-06 07:24:52 UTC (rev 42454)
@@ -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/ge_harmony/build_files/scons/config/win64-vc-config.py
===================================================================
--- branches/ge_harmony/build_files/scons/config/win64-vc-config.py	2011-12-06 05:59:43 UTC (rev 42453)
+++ branches/ge_harmony/build_files/scons/config/win64-vc-config.py	2011-12-06 07:24:52 UTC (rev 42454)
@@ -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/ge_harmony/build_files/scons/tools/Blender.py
===================================================================
--- branches/ge_harmony/build_files/scons/tools/Blender.py	2011-12-06 05:59:43 UTC (rev 42453)
+++ branches/ge_harmony/build_files/scons/tools/Blender.py	2011-12-06 07:24:52 UTC (rev 42454)
@@ -291,7 +291,7 @@
 
     syslibs += Split(lenv['BF_JPEG_LIB'])
     syslibs += Split(lenv['BF_PNG_LIB'])
-	
+
     syslibs += lenv['LLIBS']
 
     return syslibs
@@ -588,6 +588,8 @@
             commands.getoutput(cmd)
             cmd = 'mkdir %s/kernel' % (cinstalldir)
             commands.getoutput(cmd)
+            cmd = 'mkdir %s/lib' % (cinstalldir)
+            commands.getoutput(cmd)
             cmd = 'cp -R %s/blender/addon/*.py %s/' % (croot, cinstalldir)
             commands.getoutput(cmd)
             cmd = 'cp -R %s/doc/license %s/license' % (croot, cinstalldir)
@@ -596,6 +598,8 @@
             commands.getoutput(cmd)
             cmd = 'cp -R %s/kernel/svm %s/util/util_color.h %s/util/util_math.h %s/util/util_transform.h %s/util/util_types.h %s/kernel/' % (croot, croot, croot, croot, croot, cinstalldir)
             commands.getoutput(cmd)
+            cmd = 'cp -R %s/../intern/cycles/kernel/*.cubin %s/lib/' % (builddir, cinstalldir)
+            commands.getoutput(cmd)
 
     if env['WITH_OSX_STATICPYTHON']:
         cmd = 'mkdir %s/%s.app/Contents/MacOS/%s/python/'%(installdir,binary, VERSION)

Modified: branches/ge_harmony/build_files/scons/tools/btools.py
===================================================================
--- branches/ge_harmony/build_files/scons/tools/btools.py	2011-12-06 05:59:43 UTC (rev 42453)
+++ branches/ge_harmony/build_files/scons/tools/btools.py	2011-12-06 07:24:52 UTC (rev 42454)
@@ -157,7 +157,7 @@
             'WITH_BF_JEMALLOC', 'WITH_BF_STATICJEMALLOC', 'BF_JEMALLOC', 'BF_JEMALLOC_INC', 'BF_JEMALLOC_LIBPATH', 'BF_JEMALLOC_LIB', 'BF_JEMALLOC_LIB_STATIC',
             'BUILDBOT_BRANCH',
             'WITH_BF_3DMOUSE', 'WITH_BF_STATIC3DMOUSE', 'BF_3DMOUSE', 'BF_3DMOUSE_INC', 'BF_3DMOUSE_LIB', 'BF_3DMOUSE_LIBPATH', 'BF_3DMOUSE_LIB_STATIC',
-            'WITH_BF_CYCLES', 'WITH_BF_CYCLES_BINARIES' 'BF_CYCLES_BINARIES_ARCH',
+            'WITH_BF_CYCLES', 'WITH_BF_CYCLES_CUDA_BINARIES' 'BF_CYCLES_CUDA_NVCC', 'BF_CYCLES_CUDA_NVCC',
             'WITH_BF_OIIO', 'WITH_BF_STATICOIIO', 'BF_OIIO', 'BF_OIIO_INC', 'BF_OIIO_LIB', 'BF_OIIO_LIB_STATIC', 'BF_OIIO_LIBPATH',
             'WITH_BF_BOOST', 'WITH_BF_STATICBOOST', 'BF_BOOST', 'BF_BOOST_INC', 'BF_BOOST_LIB', 'BF_BOOST_LIB_STATIC', 'BF_BOOST_LIBPATH'
             ]
@@ -544,7 +544,9 @@
 
     localopts.AddVariables(

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list