[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57535] branches/ge_harmony: Merged revisions 56959-57511 from trunk/blender
Daniel Stokes
kupomail at gmail.com
Tue Jun 18 05:51:45 CEST 2013
Revision: 57535
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57535
Author: kupoman
Date: 2013-06-18 03:51:43 +0000 (Tue, 18 Jun 2013)
Log Message:
-----------
Merged revisions 56959-57511 from trunk/blender
Modified Paths:
--------------
branches/ge_harmony/CMakeLists.txt
branches/ge_harmony/SConstruct
branches/ge_harmony/build_files/build_environment/install_deps.sh
branches/ge_harmony/build_files/buildbot/master.cfg
branches/ge_harmony/build_files/buildbot/slave_compile.py
branches/ge_harmony/build_files/cmake/Modules/FindOpenEXR.cmake
branches/ge_harmony/build_files/scons/config/Modules/FindPython.py
branches/ge_harmony/build_files/scons/config/linux-config.py
branches/ge_harmony/build_files/scons/config/linuxcross-config.py
branches/ge_harmony/build_files/scons/config/win32-mingw-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/guides/interface_API.txt
branches/ge_harmony/doc/manpage/blender.1.py
branches/ge_harmony/doc/python_api/rst/info_gotcha.rst
branches/ge_harmony/extern/carve/include/carve/win32.h
branches/ge_harmony/extern/libmv/CMakeLists.txt
branches/ge_harmony/extern/libmv/ChangeLog
branches/ge_harmony/extern/libmv/files.txt
branches/ge_harmony/extern/libmv/libmv/tracking/track_region.h
branches/ge_harmony/extern/libmv/libmv-capi.cc
branches/ge_harmony/extern/libmv/libmv-capi.h
branches/ge_harmony/extern/libmv/libmv-capi_stub.cc
branches/ge_harmony/intern/container/CTR_TaggedIndex.h
branches/ge_harmony/intern/cycles/blender/CMakeLists.txt
branches/ge_harmony/intern/cycles/blender/addon/__init__.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_object.cpp
branches/ge_harmony/intern/cycles/blender/blender_python.cpp
branches/ge_harmony/intern/cycles/blender/blender_session.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/device/device_opencl.cpp
branches/ge_harmony/intern/cycles/kernel/CMakeLists.txt
branches/ge_harmony/intern/cycles/kernel/closure/bsdf.h
branches/ge_harmony/intern/cycles/kernel/closure/bsdf_diffuse_ramp.h
branches/ge_harmony/intern/cycles/kernel/closure/bsdf_phong_ramp.h
branches/ge_harmony/intern/cycles/kernel/closure/bsdf_reflection.h
branches/ge_harmony/intern/cycles/kernel/closure/bsdf_toon.h
branches/ge_harmony/intern/cycles/kernel/closure/bsdf_util.h
branches/ge_harmony/intern/cycles/kernel/closure/bssrdf.h
branches/ge_harmony/intern/cycles/kernel/kernel_accumulate.h
branches/ge_harmony/intern/cycles/kernel/kernel_bvh.h
branches/ge_harmony/intern/cycles/kernel/kernel_camera.h
branches/ge_harmony/intern/cycles/kernel/kernel_compat_cpu.h
branches/ge_harmony/intern/cycles/kernel/kernel_compat_opencl.h
branches/ge_harmony/intern/cycles/kernel/kernel_curve.h
branches/ge_harmony/intern/cycles/kernel/kernel_displace.h
branches/ge_harmony/intern/cycles/kernel/kernel_emission.h
branches/ge_harmony/intern/cycles/kernel/kernel_globals.h
branches/ge_harmony/intern/cycles/kernel/kernel_light.h
branches/ge_harmony/intern/cycles/kernel/kernel_montecarlo.h
branches/ge_harmony/intern/cycles/kernel/kernel_object.h
branches/ge_harmony/intern/cycles/kernel/kernel_passes.h
branches/ge_harmony/intern/cycles/kernel/kernel_path.h
branches/ge_harmony/intern/cycles/kernel/kernel_projection.h
branches/ge_harmony/intern/cycles/kernel/kernel_random.h
branches/ge_harmony/intern/cycles/kernel/kernel_shader.h
branches/ge_harmony/intern/cycles/kernel/kernel_types.h
branches/ge_harmony/intern/cycles/kernel/osl/CMakeLists.txt
branches/ge_harmony/intern/cycles/kernel/osl/osl_closures.cpp
branches/ge_harmony/intern/cycles/kernel/osl/osl_closures.h
branches/ge_harmony/intern/cycles/kernel/osl/osl_services.cpp
branches/ge_harmony/intern/cycles/kernel/shaders/CMakeLists.txt
branches/ge_harmony/intern/cycles/kernel/shaders/node_color.h
branches/ge_harmony/intern/cycles/kernel/shaders/node_fresnel.h
branches/ge_harmony/intern/cycles/kernel/shaders/node_fresnel.osl
branches/ge_harmony/intern/cycles/kernel/shaders/node_glass_bsdf.osl
branches/ge_harmony/intern/cycles/kernel/shaders/node_layer_weight.osl
branches/ge_harmony/intern/cycles/kernel/shaders/node_normal_map.osl
branches/ge_harmony/intern/cycles/kernel/shaders/node_sky_texture.osl
branches/ge_harmony/intern/cycles/kernel/shaders/node_texture_coordinate.osl
branches/ge_harmony/intern/cycles/kernel/shaders/stdosl.h
branches/ge_harmony/intern/cycles/kernel/svm/svm.h
branches/ge_harmony/intern/cycles/kernel/svm/svm_brick.h
branches/ge_harmony/intern/cycles/kernel/svm/svm_checker.h
branches/ge_harmony/intern/cycles/kernel/svm/svm_closure.h
branches/ge_harmony/intern/cycles/kernel/svm/svm_convert.h
branches/ge_harmony/intern/cycles/kernel/svm/svm_fresnel.h
branches/ge_harmony/intern/cycles/kernel/svm/svm_hsv.h
branches/ge_harmony/intern/cycles/kernel/svm/svm_image.h
branches/ge_harmony/intern/cycles/kernel/svm/svm_mix.h
branches/ge_harmony/intern/cycles/kernel/svm/svm_musgrave.h
branches/ge_harmony/intern/cycles/kernel/svm/svm_noise.h
branches/ge_harmony/intern/cycles/kernel/svm/svm_ramp.h
branches/ge_harmony/intern/cycles/kernel/svm/svm_sky.h
branches/ge_harmony/intern/cycles/kernel/svm/svm_tex_coord.h
branches/ge_harmony/intern/cycles/kernel/svm/svm_texture.h
branches/ge_harmony/intern/cycles/kernel/svm/svm_types.h
branches/ge_harmony/intern/cycles/kernel/svm/svm_value.h
branches/ge_harmony/intern/cycles/kernel/svm/svm_wireframe.h
branches/ge_harmony/intern/cycles/render/background.cpp
branches/ge_harmony/intern/cycles/render/background.h
branches/ge_harmony/intern/cycles/render/film.cpp
branches/ge_harmony/intern/cycles/render/film.h
branches/ge_harmony/intern/cycles/render/graph.cpp
branches/ge_harmony/intern/cycles/render/integrator.cpp
branches/ge_harmony/intern/cycles/render/integrator.h
branches/ge_harmony/intern/cycles/render/light.cpp
branches/ge_harmony/intern/cycles/render/light.h
branches/ge_harmony/intern/cycles/render/nodes.cpp
branches/ge_harmony/intern/cycles/render/nodes.h
branches/ge_harmony/intern/cycles/render/session.cpp
branches/ge_harmony/intern/cycles/util/util_color.h
branches/ge_harmony/intern/cycles/util/util_math.h
branches/ge_harmony/intern/cycles/util/util_opencl.cpp
branches/ge_harmony/intern/cycles/util/util_path.cpp
branches/ge_harmony/intern/cycles/util/util_path.h
branches/ge_harmony/intern/cycles/util/util_system.cpp
branches/ge_harmony/intern/cycles/util/util_task.cpp
branches/ge_harmony/intern/cycles/util/util_time.cpp
branches/ge_harmony/intern/cycles/util/util_types.h
branches/ge_harmony/intern/ghost/CMakeLists.txt
branches/ge_harmony/intern/ghost/SConscript
branches/ge_harmony/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/ge_harmony/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/ge_harmony/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/ge_harmony/intern/ghost/intern/GHOST_WindowWin32.h
branches/ge_harmony/intern/ghost/test/CMakeLists.txt
branches/ge_harmony/intern/guardedalloc/CMakeLists.txt
branches/ge_harmony/intern/guardedalloc/MEM_guardedalloc.h
branches/ge_harmony/intern/guardedalloc/intern/mallocn.c
branches/ge_harmony/intern/guardedalloc/mmap_win.h
branches/ge_harmony/intern/guardedalloc/test/simpletest/memtest.c
branches/ge_harmony/intern/memutil/MEM_Allocator.h
branches/ge_harmony/intern/opennl/CMakeLists.txt
branches/ge_harmony/intern/opennl/superlu/smemory.c
branches/ge_harmony/release/datafiles/blender_icons.svg
branches/ge_harmony/release/datafiles/splash.png
branches/ge_harmony/release/scripts/freestyle/style_modules/parameter_editor.py
branches/ge_harmony/release/scripts/modules/addon_utils.py
branches/ge_harmony/release/scripts/modules/bpy/utils.py
branches/ge_harmony/release/scripts/modules/bpy_extras/object_utils.py
branches/ge_harmony/release/scripts/modules/bpy_types.py
branches/ge_harmony/release/scripts/modules/console_python.py
branches/ge_harmony/release/scripts/modules/nodeitems_utils.py
branches/ge_harmony/release/scripts/presets/interface_theme/back_to_black.xml
branches/ge_harmony/release/scripts/presets/interface_theme/blender_24x.xml
branches/ge_harmony/release/scripts/presets/interface_theme/elsyiun.xml
branches/ge_harmony/release/scripts/presets/interface_theme/hexagon.xml
branches/ge_harmony/release/scripts/presets/interface_theme/ubuntu_ambiance.xml
branches/ge_harmony/release/scripts/presets/keyconfig/3dsmax.py
branches/ge_harmony/release/scripts/presets/keyconfig/maya.py
branches/ge_harmony/release/scripts/startup/bl_operators/add_mesh_torus.py
branches/ge_harmony/release/scripts/startup/bl_operators/console.py
branches/ge_harmony/release/scripts/startup/bl_operators/freestyle.py
branches/ge_harmony/release/scripts/startup/bl_operators/mesh.py
branches/ge_harmony/release/scripts/startup/bl_operators/node.py
branches/ge_harmony/release/scripts/startup/bl_operators/view3d.py
branches/ge_harmony/release/scripts/startup/bl_operators/wm.py
branches/ge_harmony/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/ge_harmony/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/ge_harmony/release/scripts/startup/bl_ui/properties_freestyle.py
branches/ge_harmony/release/scripts/startup/bl_ui/properties_paint_common.py
branches/ge_harmony/release/scripts/startup/bl_ui/properties_particle.py
branches/ge_harmony/release/scripts/startup/bl_ui/properties_render.py
branches/ge_harmony/release/scripts/startup/bl_ui/space_clip.py
branches/ge_harmony/release/scripts/startup/bl_ui/space_dopesheet.py
branches/ge_harmony/release/scripts/startup/bl_ui/space_image.py
branches/ge_harmony/release/scripts/startup/bl_ui/space_info.py
branches/ge_harmony/release/scripts/startup/bl_ui/space_node.py
branches/ge_harmony/release/scripts/startup/bl_ui/space_userpref.py
branches/ge_harmony/release/scripts/startup/bl_ui/space_view3d.py
branches/ge_harmony/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/ge_harmony/release/scripts/startup/nodeitems_builtins.py
branches/ge_harmony/release/scripts/templates_py/custom_nodes.py
branches/ge_harmony/scons/scons-time.py
branches/ge_harmony/scons/scons.py
branches/ge_harmony/scons/sconsign.py
branches/ge_harmony/source/blender/avi/AVI_avi.h
branches/ge_harmony/source/blender/avi/intern/avi.c
branches/ge_harmony/source/blender/blenfont/CMakeLists.txt
branches/ge_harmony/source/blender/blenfont/SConscript
branches/ge_harmony/source/blender/blenfont/intern/blf_glyph.c
branches/ge_harmony/source/blender/blenfont/intern/blf_internal.h
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_cdderivedmesh.h
branches/ge_harmony/source/blender/blenkernel/BKE_cloth.h
branches/ge_harmony/source/blender/blenkernel/BKE_customdata.h
branches/ge_harmony/source/blender/blenkernel/BKE_displist.h
branches/ge_harmony/source/blender/blenkernel/BKE_global.h
branches/ge_harmony/source/blender/blenkernel/BKE_image.h
branches/ge_harmony/source/blender/blenkernel/BKE_lattice.h
branches/ge_harmony/source/blender/blenkernel/BKE_mask.h
branches/ge_harmony/source/blender/blenkernel/BKE_mesh.h
branches/ge_harmony/source/blender/blenkernel/BKE_modifier.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_pbvh.h
branches/ge_harmony/source/blender/blenkernel/BKE_scene.h
branches/ge_harmony/source/blender/blenkernel/BKE_sequencer.h
branches/ge_harmony/source/blender/blenkernel/BKE_text.h
branches/ge_harmony/source/blender/blenkernel/BKE_texture.h
branches/ge_harmony/source/blender/blenkernel/BKE_tracking.h
branches/ge_harmony/source/blender/blenkernel/intern/CCGSubSurf.c
branches/ge_harmony/source/blender/blenkernel/intern/DerivedMesh.c
branches/ge_harmony/source/blender/blenkernel/intern/anim.c
branches/ge_harmony/source/blender/blenkernel/intern/anim_sys.c
branches/ge_harmony/source/blender/blenkernel/intern/armature.c
branches/ge_harmony/source/blender/blenkernel/intern/blender.c
branches/ge_harmony/source/blender/blenkernel/intern/bmfont.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/constraint.c
branches/ge_harmony/source/blender/blenkernel/intern/context.c
branches/ge_harmony/source/blender/blenkernel/intern/customdata.c
branches/ge_harmony/source/blender/blenkernel/intern/displist.c
branches/ge_harmony/source/blender/blenkernel/intern/dynamicpaint.c
branches/ge_harmony/source/blender/blenkernel/intern/editderivedmesh.c
branches/ge_harmony/source/blender/blenkernel/intern/fcurve.c
branches/ge_harmony/source/blender/blenkernel/intern/icons.c
branches/ge_harmony/source/blender/blenkernel/intern/image.c
branches/ge_harmony/source/blender/blenkernel/intern/key.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/mask.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/modifier.c
branches/ge_harmony/source/blender/blenkernel/intern/modifiers_bmesh.c
branches/ge_harmony/source/blender/blenkernel/intern/multires.c
branches/ge_harmony/source/blender/blenkernel/intern/nla.c
branches/ge_harmony/source/blender/blenkernel/intern/node.c
branches/ge_harmony/source/blender/blenkernel/intern/object.c
branches/ge_harmony/source/blender/blenkernel/intern/object_deform.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/particle_system.c
branches/ge_harmony/source/blender/blenkernel/intern/pbvh.c
branches/ge_harmony/source/blender/blenkernel/intern/rigidbody.c
branches/ge_harmony/source/blender/blenkernel/intern/scene.c
branches/ge_harmony/source/blender/blenkernel/intern/seqcache.c
branches/ge_harmony/source/blender/blenkernel/intern/smoke.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/unit.c
branches/ge_harmony/source/blender/blenkernel/intern/writeffmpeg.c
branches/ge_harmony/source/blender/blenlib/BLI_array.h
branches/ge_harmony/source/blender/blenlib/BLI_ghash.h
branches/ge_harmony/source/blender/blenlib/BLI_math_geom.h
branches/ge_harmony/source/blender/blenlib/BLI_math_matrix.h
branches/ge_harmony/source/blender/blenlib/BLI_math_vector.h
branches/ge_harmony/source/blender/blenlib/BLI_rect.h
branches/ge_harmony/source/blender/blenlib/BLI_string.h
branches/ge_harmony/source/blender/blenlib/BLI_utildefines.h
branches/ge_harmony/source/blender/blenlib/CMakeLists.txt
branches/ge_harmony/source/blender/blenlib/intern/BLI_ghash.c
branches/ge_harmony/source/blender/blenlib/intern/endian_switch.c
branches/ge_harmony/source/blender/blenlib/intern/fileops.c
branches/ge_harmony/source/blender/blenlib/intern/listbase.c
branches/ge_harmony/source/blender/blenlib/intern/math_color.c
branches/ge_harmony/source/blender/blenlib/intern/math_geom.c
branches/ge_harmony/source/blender/blenlib/intern/math_interp.c
branches/ge_harmony/source/blender/blenlib/intern/math_matrix.c
branches/ge_harmony/source/blender/blenlib/intern/math_rotation.c
branches/ge_harmony/source/blender/blenlib/intern/math_vector.c
branches/ge_harmony/source/blender/blenlib/intern/math_vector_inline.c
branches/ge_harmony/source/blender/blenlib/intern/rct.c
branches/ge_harmony/source/blender/blenlib/intern/scanfill.c
branches/ge_harmony/source/blender/blenlib/intern/string.c
branches/ge_harmony/source/blender/blenlib/intern/winstuff.c
branches/ge_harmony/source/blender/blenloader/CMakeLists.txt
branches/ge_harmony/source/blender/blenloader/SConscript
branches/ge_harmony/source/blender/blenloader/intern/readblenentry.c
branches/ge_harmony/source/blender/blenloader/intern/readfile.c
branches/ge_harmony/source/blender/bmesh/CMakeLists.txt
branches/ge_harmony/source/blender/bmesh/bmesh.h
branches/ge_harmony/source/blender/bmesh/intern/bmesh_construct.c
branches/ge_harmony/source/blender/bmesh/intern/bmesh_core.c
branches/ge_harmony/source/blender/bmesh/intern/bmesh_edgeloop.c
branches/ge_harmony/source/blender/bmesh/intern/bmesh_edgeloop.h
branches/ge_harmony/source/blender/bmesh/intern/bmesh_interp.c
branches/ge_harmony/source/blender/bmesh/intern/bmesh_iterators.c
branches/ge_harmony/source/blender/bmesh/intern/bmesh_iterators.h
branches/ge_harmony/source/blender/bmesh/intern/bmesh_iterators_inline.h
branches/ge_harmony/source/blender/bmesh/intern/bmesh_marking.c
branches/ge_harmony/source/blender/bmesh/intern/bmesh_mesh.c
branches/ge_harmony/source/blender/bmesh/intern/bmesh_mesh_conv.c
branches/ge_harmony/source/blender/bmesh/intern/bmesh_mesh_conv.h
branches/ge_harmony/source/blender/bmesh/intern/bmesh_opdefines.c
branches/ge_harmony/source/blender/bmesh/intern/bmesh_operator_api.h
branches/ge_harmony/source/blender/bmesh/intern/bmesh_operators.h
branches/ge_harmony/source/blender/bmesh/intern/bmesh_operators_private.h
branches/ge_harmony/source/blender/bmesh/intern/bmesh_polygon.c
branches/ge_harmony/source/blender/bmesh/intern/bmesh_polygon.h
branches/ge_harmony/source/blender/bmesh/intern/bmesh_queries.c
branches/ge_harmony/source/blender/bmesh/intern/bmesh_queries.h
branches/ge_harmony/source/blender/bmesh/intern/bmesh_walkers_impl.c
branches/ge_harmony/source/blender/bmesh/operators/bmo_bridge.c
branches/ge_harmony/source/blender/bmesh/operators/bmo_connect.c
branches/ge_harmony/source/blender/bmesh/operators/bmo_dissolve.c
branches/ge_harmony/source/blender/bmesh/operators/bmo_edgenet.c
branches/ge_harmony/source/blender/bmesh/operators/bmo_extrude.c
branches/ge_harmony/source/blender/bmesh/operators/bmo_fill_grid.c
branches/ge_harmony/source/blender/bmesh/operators/bmo_mesh_conv.c
branches/ge_harmony/source/blender/bmesh/operators/bmo_similar.c
branches/ge_harmony/source/blender/bmesh/operators/bmo_subdivide.c
branches/ge_harmony/source/blender/bmesh/operators/bmo_utils.c
branches/ge_harmony/source/blender/bmesh/tools/bmesh_bevel.c
branches/ge_harmony/source/blender/bmesh/tools/bmesh_decimate.h
branches/ge_harmony/source/blender/bmesh/tools/bmesh_decimate_dissolve.c
branches/ge_harmony/source/blender/collada/AnimationExporter.cpp
branches/ge_harmony/source/blender/collada/AnimationImporter.cpp
branches/ge_harmony/source/blender/collada/ArmatureExporter.cpp
branches/ge_harmony/source/blender/collada/ArmatureImporter.cpp
branches/ge_harmony/source/blender/collada/CMakeLists.txt
branches/ge_harmony/source/blender/collada/ControllerExporter.cpp
branches/ge_harmony/source/blender/collada/DocumentImporter.cpp
branches/ge_harmony/source/blender/collada/GeometryExporter.cpp
branches/ge_harmony/source/blender/collada/MeshImporter.cpp
branches/ge_harmony/source/blender/collada/SConscript
branches/ge_harmony/source/blender/collada/TransformReader.cpp
branches/ge_harmony/source/blender/collada/TransformWriter.cpp
branches/ge_harmony/source/blender/collada/collada_utils.cpp
branches/ge_harmony/source/blender/compositor/CMakeLists.txt
branches/ge_harmony/source/blender/compositor/SConscript
branches/ge_harmony/source/blender/compositor/intern/COM_compositor.cpp
branches/ge_harmony/source/blender/compositor/nodes/COM_ImageNode.cpp
branches/ge_harmony/source/blender/compositor/nodes/COM_TrackPositionNode.cpp
branches/ge_harmony/source/blender/compositor/operations/COM_BilateralBlurOperation.h
branches/ge_harmony/source/blender/compositor/operations/COM_BokehBlurOperation.h
branches/ge_harmony/source/blender/compositor/operations/COM_DirectionalBlurOperation.h
branches/ge_harmony/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp
branches/ge_harmony/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp
branches/ge_harmony/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h
branches/ge_harmony/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
branches/ge_harmony/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
branches/ge_harmony/source/blender/compositor/operations/COM_MovieClipOperation.cpp
branches/ge_harmony/source/blender/compositor/operations/COM_TrackPositionOperation.cpp
branches/ge_harmony/source/blender/compositor/operations/COM_TrackPositionOperation.h
branches/ge_harmony/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h
branches/ge_harmony/source/blender/editors/animation/CMakeLists.txt
branches/ge_harmony/source/blender/editors/animation/SConscript
branches/ge_harmony/source/blender/editors/animation/anim_draw.c
branches/ge_harmony/source/blender/editors/animation/anim_filter.c
branches/ge_harmony/source/blender/editors/animation/anim_markers.c
branches/ge_harmony/source/blender/editors/animation/anim_ops.c
branches/ge_harmony/source/blender/editors/animation/keyframes_general.c
branches/ge_harmony/source/blender/editors/armature/CMakeLists.txt
branches/ge_harmony/source/blender/editors/armature/SConscript
branches/ge_harmony/source/blender/editors/armature/armature_ops.c
branches/ge_harmony/source/blender/editors/armature/armature_relations.c
branches/ge_harmony/source/blender/editors/armature/meshlaplacian.c
branches/ge_harmony/source/blender/editors/curve/CMakeLists.txt
branches/ge_harmony/source/blender/editors/curve/SConscript
branches/ge_harmony/source/blender/editors/curve/curve_ops.c
branches/ge_harmony/source/blender/editors/curve/editcurve.c
branches/ge_harmony/source/blender/editors/gpencil/CMakeLists.txt
branches/ge_harmony/source/blender/editors/gpencil/SConscript
branches/ge_harmony/source/blender/editors/gpencil/drawgpencil.c
branches/ge_harmony/source/blender/editors/gpencil/gpencil_edit.c
branches/ge_harmony/source/blender/editors/gpencil/gpencil_ops.c
branches/ge_harmony/source/blender/editors/gpencil/gpencil_paint.c
branches/ge_harmony/source/blender/editors/include/ED_image.h
branches/ge_harmony/source/blender/editors/include/ED_mesh.h
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/ED_transform.h
branches/ge_harmony/source/blender/editors/include/ED_view3d.h
branches/ge_harmony/source/blender/editors/include/UI_icons.h
branches/ge_harmony/source/blender/editors/include/UI_interface.h
branches/ge_harmony/source/blender/editors/include/UI_resources.h
branches/ge_harmony/source/blender/editors/include/UI_view2d.h
branches/ge_harmony/source/blender/editors/interface/CMakeLists.txt
branches/ge_harmony/source/blender/editors/interface/SConscript
branches/ge_harmony/source/blender/editors/interface/interface.c
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_intern.h
branches/ge_harmony/source/blender/editors/interface/interface_layout.c
branches/ge_harmony/source/blender/editors/interface/interface_ops.c
branches/ge_harmony/source/blender/editors/interface/interface_regions.c
branches/ge_harmony/source/blender/editors/interface/interface_style.c
branches/ge_harmony/source/blender/editors/interface/interface_templates.c
branches/ge_harmony/source/blender/editors/interface/interface_utils.c
branches/ge_harmony/source/blender/editors/interface/interface_widgets.c
branches/ge_harmony/source/blender/editors/interface/resources.c
branches/ge_harmony/source/blender/editors/interface/view2d.c
branches/ge_harmony/source/blender/editors/interface/view2d_ops.c
branches/ge_harmony/source/blender/editors/io/CMakeLists.txt
branches/ge_harmony/source/blender/editors/io/SConscript
branches/ge_harmony/source/blender/editors/mask/CMakeLists.txt
branches/ge_harmony/source/blender/editors/mask/SConscript
branches/ge_harmony/source/blender/editors/mask/mask_shapekey.c
branches/ge_harmony/source/blender/editors/mesh/CMakeLists.txt
branches/ge_harmony/source/blender/editors/mesh/SConscript
branches/ge_harmony/source/blender/editors/mesh/editface.c
branches/ge_harmony/source/blender/editors/mesh/editmesh_add.c
branches/ge_harmony/source/blender/editors/mesh/editmesh_extrude.c
branches/ge_harmony/source/blender/editors/mesh/editmesh_knife.c
branches/ge_harmony/source/blender/editors/mesh/editmesh_loopcut.c
branches/ge_harmony/source/blender/editors/mesh/editmesh_rip.c
branches/ge_harmony/source/blender/editors/mesh/editmesh_select.c
branches/ge_harmony/source/blender/editors/mesh/editmesh_tools.c
branches/ge_harmony/source/blender/editors/mesh/editmesh_utils.c
branches/ge_harmony/source/blender/editors/mesh/mesh_data.c
branches/ge_harmony/source/blender/editors/mesh/mesh_intern.h
branches/ge_harmony/source/blender/editors/mesh/mesh_ops.c
branches/ge_harmony/source/blender/editors/mesh/meshtools.c
branches/ge_harmony/source/blender/editors/metaball/CMakeLists.txt
branches/ge_harmony/source/blender/editors/metaball/SConscript
branches/ge_harmony/source/blender/editors/object/CMakeLists.txt
branches/ge_harmony/source/blender/editors/object/SConscript
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_group.c
branches/ge_harmony/source/blender/editors/object/object_hook.c
branches/ge_harmony/source/blender/editors/object/object_lattice.c
branches/ge_harmony/source/blender/editors/object/object_relations.c
branches/ge_harmony/source/blender/editors/object/object_shapekey.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/CMakeLists.txt
branches/ge_harmony/source/blender/editors/physics/SConscript
branches/ge_harmony/source/blender/editors/physics/particle_object.c
branches/ge_harmony/source/blender/editors/render/render_internal.c
branches/ge_harmony/source/blender/editors/render/render_opengl.c
branches/ge_harmony/source/blender/editors/render/render_update.c
branches/ge_harmony/source/blender/editors/screen/CMakeLists.txt
branches/ge_harmony/source/blender/editors/screen/SConscript
branches/ge_harmony/source/blender/editors/screen/area.c
branches/ge_harmony/source/blender/editors/screen/screen_edit.c
branches/ge_harmony/source/blender/editors/screen/screen_ops.c
branches/ge_harmony/source/blender/editors/sculpt_paint/CMakeLists.txt
branches/ge_harmony/source/blender/editors/sculpt_paint/SConscript
branches/ge_harmony/source/blender/editors/sculpt_paint/paint_cursor.c
branches/ge_harmony/source/blender/editors/sculpt_paint/paint_hide.c
branches/ge_harmony/source/blender/editors/sculpt_paint/paint_image.c
branches/ge_harmony/source/blender/editors/sculpt_paint/paint_image_2d.c
branches/ge_harmony/source/blender/editors/sculpt_paint/paint_image_proj.c
branches/ge_harmony/source/blender/editors/sculpt_paint/paint_intern.h
branches/ge_harmony/source/blender/editors/sculpt_paint/paint_mask.c
branches/ge_harmony/source/blender/editors/sculpt_paint/paint_ops.c
branches/ge_harmony/source/blender/editors/sculpt_paint/paint_stroke.c
branches/ge_harmony/source/blender/editors/sculpt_paint/paint_utils.c
branches/ge_harmony/source/blender/editors/sculpt_paint/paint_vertex.c
branches/ge_harmony/source/blender/editors/sculpt_paint/sculpt.c
branches/ge_harmony/source/blender/editors/sound/CMakeLists.txt
branches/ge_harmony/source/blender/editors/sound/SConscript
branches/ge_harmony/source/blender/editors/space_action/CMakeLists.txt
branches/ge_harmony/source/blender/editors/space_action/SConscript
branches/ge_harmony/source/blender/editors/space_api/CMakeLists.txt
branches/ge_harmony/source/blender/editors/space_api/SConscript
branches/ge_harmony/source/blender/editors/space_buttons/CMakeLists.txt
branches/ge_harmony/source/blender/editors/space_buttons/SConscript
branches/ge_harmony/source/blender/editors/space_buttons/buttons_header.c
branches/ge_harmony/source/blender/editors/space_buttons/buttons_intern.h
branches/ge_harmony/source/blender/editors/space_buttons/buttons_texture.c
branches/ge_harmony/source/blender/editors/space_clip/CMakeLists.txt
branches/ge_harmony/source/blender/editors/space_clip/SConscript
branches/ge_harmony/source/blender/editors/space_clip/clip_draw.c
branches/ge_harmony/source/blender/editors/space_clip/clip_intern.h
branches/ge_harmony/source/blender/editors/space_clip/space_clip.c
branches/ge_harmony/source/blender/editors/space_clip/tracking_ops.c
branches/ge_harmony/source/blender/editors/space_console/CMakeLists.txt
branches/ge_harmony/source/blender/editors/space_console/SConscript
branches/ge_harmony/source/blender/editors/space_console/space_console.c
branches/ge_harmony/source/blender/editors/space_file/filesel.c
branches/ge_harmony/source/blender/editors/space_file/space_file.c
branches/ge_harmony/source/blender/editors/space_graph/CMakeLists.txt
branches/ge_harmony/source/blender/editors/space_graph/SConscript
branches/ge_harmony/source/blender/editors/space_graph/graph_edit.c
branches/ge_harmony/source/blender/editors/space_image/CMakeLists.txt
branches/ge_harmony/source/blender/editors/space_image/SConscript
branches/ge_harmony/source/blender/editors/space_image/image_draw.c
branches/ge_harmony/source/blender/editors/space_image/image_edit.c
branches/ge_harmony/source/blender/editors/space_image/image_ops.c
branches/ge_harmony/source/blender/editors/space_logic/CMakeLists.txt
branches/ge_harmony/source/blender/editors/space_logic/SConscript
branches/ge_harmony/source/blender/editors/space_nla/CMakeLists.txt
branches/ge_harmony/source/blender/editors/space_nla/SConscript
branches/ge_harmony/source/blender/editors/space_nla/nla_channels.c
branches/ge_harmony/source/blender/editors/space_nla/nla_edit.c
branches/ge_harmony/source/blender/editors/space_nla/nla_intern.h
branches/ge_harmony/source/blender/editors/space_node/CMakeLists.txt
branches/ge_harmony/source/blender/editors/space_node/SConscript
branches/ge_harmony/source/blender/editors/space_node/drawnode.c
branches/ge_harmony/source/blender/editors/space_node/node_add.c
branches/ge_harmony/source/blender/editors/space_node/node_buttons.c
branches/ge_harmony/source/blender/editors/space_node/node_draw.c
branches/ge_harmony/source/blender/editors/space_node/node_edit.c
branches/ge_harmony/source/blender/editors/space_node/node_group.c
branches/ge_harmony/source/blender/editors/space_node/node_intern.h
branches/ge_harmony/source/blender/editors/space_node/node_relationships.c
branches/ge_harmony/source/blender/editors/space_node/node_templates.c
branches/ge_harmony/source/blender/editors/space_node/space_node.c
branches/ge_harmony/source/blender/editors/space_outliner/CMakeLists.txt
branches/ge_harmony/source/blender/editors/space_outliner/SConscript
branches/ge_harmony/source/blender/editors/space_script/CMakeLists.txt
branches/ge_harmony/source/blender/editors/space_script/SConscript
branches/ge_harmony/source/blender/editors/space_script/script_edit.c
branches/ge_harmony/source/blender/editors/space_script/script_intern.h
branches/ge_harmony/source/blender/editors/space_script/script_ops.c
branches/ge_harmony/source/blender/editors/space_sequencer/CMakeLists.txt
branches/ge_harmony/source/blender/editors/space_sequencer/SConscript
branches/ge_harmony/source/blender/editors/space_sequencer/sequencer_draw.c
branches/ge_harmony/source/blender/editors/space_text/CMakeLists.txt
branches/ge_harmony/source/blender/editors/space_text/SConscript
branches/ge_harmony/source/blender/editors/space_text/text_ops.c
branches/ge_harmony/source/blender/editors/space_time/CMakeLists.txt
branches/ge_harmony/source/blender/editors/space_time/SConscript
branches/ge_harmony/source/blender/editors/space_userpref/CMakeLists.txt
branches/ge_harmony/source/blender/editors/space_userpref/SConscript
branches/ge_harmony/source/blender/editors/space_view3d/CMakeLists.txt
branches/ge_harmony/source/blender/editors/space_view3d/SConscript
branches/ge_harmony/source/blender/editors/space_view3d/drawanimviz.c
branches/ge_harmony/source/blender/editors/space_view3d/drawarmature.c
branches/ge_harmony/source/blender/editors/space_view3d/drawobject.c
branches/ge_harmony/source/blender/editors/space_view3d/space_view3d.c
branches/ge_harmony/source/blender/editors/space_view3d/view3d_buttons.c
branches/ge_harmony/source/blender/editors/space_view3d/view3d_draw.c
branches/ge_harmony/source/blender/editors/space_view3d/view3d_edit.c
branches/ge_harmony/source/blender/editors/space_view3d/view3d_fly.c
branches/ge_harmony/source/blender/editors/space_view3d/view3d_header.c
branches/ge_harmony/source/blender/editors/space_view3d/view3d_project.c
branches/ge_harmony/source/blender/editors/space_view3d/view3d_select.c
branches/ge_harmony/source/blender/editors/space_view3d/view3d_snap.c
branches/ge_harmony/source/blender/editors/space_view3d/view3d_view.c
branches/ge_harmony/source/blender/editors/transform/CMakeLists.txt
branches/ge_harmony/source/blender/editors/transform/SConscript
branches/ge_harmony/source/blender/editors/transform/transform.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_manipulator.c
branches/ge_harmony/source/blender/editors/transform/transform_ops.c
branches/ge_harmony/source/blender/editors/transform/transform_orientations.c
branches/ge_harmony/source/blender/editors/util/CMakeLists.txt
branches/ge_harmony/source/blender/editors/util/SConscript
branches/ge_harmony/source/blender/editors/uvedit/CMakeLists.txt
branches/ge_harmony/source/blender/editors/uvedit/SConscript
branches/ge_harmony/source/blender/editors/uvedit/uvedit_ops.c
branches/ge_harmony/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/ge_harmony/source/blender/editors/uvedit/uvedit_parametrizer.h
branches/ge_harmony/source/blender/editors/uvedit/uvedit_smart_stitch.c
branches/ge_harmony/source/blender/freestyle/CMakeLists.txt
branches/ge_harmony/source/blender/freestyle/FRS_freestyle.h
branches/ge_harmony/source/blender/freestyle/SConscript
branches/ge_harmony/source/blender/freestyle/intern/application/AppCanvas.cpp
branches/ge_harmony/source/blender/freestyle/intern/application/Controller.cpp
branches/ge_harmony/source/blender/freestyle/intern/application/Controller.h
branches/ge_harmony/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
branches/ge_harmony/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h
branches/ge_harmony/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
branches/ge_harmony/source/blender/freestyle/intern/geometry/FitCurve.cpp
branches/ge_harmony/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp
branches/ge_harmony/source/blender/freestyle/intern/system/PseudoNoise.cpp
branches/ge_harmony/source/blender/freestyle/intern/view_map/Silhouette.h
branches/ge_harmony/source/blender/gpu/CMakeLists.txt
branches/ge_harmony/source/blender/gpu/SConscript
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_draw.c
branches/ge_harmony/source/blender/gpu/intern/gpu_extensions.c
branches/ge_harmony/source/blender/gpu/intern/gpu_material.c
branches/ge_harmony/source/blender/gpu/shaders/gpu_shader_material.glsl
branches/ge_harmony/source/blender/ikplugin/intern/iksolver_plugin.c
branches/ge_harmony/source/blender/ikplugin/intern/itasc_plugin.cpp
branches/ge_harmony/source/blender/imbuf/intern/cineon/CMakeLists.txt
branches/ge_harmony/source/blender/imbuf/intern/cineon/SConscript
branches/ge_harmony/source/blender/imbuf/intern/cineon/cineon_dpx.c
branches/ge_harmony/source/blender/imbuf/intern/cineon/logImageCore.h
branches/ge_harmony/source/blender/imbuf/intern/colormanagement.c
branches/ge_harmony/source/blender/imbuf/intern/dds/FlipDXT.h
branches/ge_harmony/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/ge_harmony/source/blender/imbuf/intern/png.c
branches/ge_harmony/source/blender/imbuf/intern/rectop.c
branches/ge_harmony/source/blender/imbuf/intern/scaling.c
branches/ge_harmony/source/blender/makesdna/DNA_action_types.h
branches/ge_harmony/source/blender/makesdna/DNA_anim_types.h
branches/ge_harmony/source/blender/makesdna/DNA_armature_types.h
branches/ge_harmony/source/blender/makesdna/DNA_defs.h
branches/ge_harmony/source/blender/makesdna/DNA_image_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_modifier_types.h
branches/ge_harmony/source/blender/makesdna/DNA_nla_types.h
branches/ge_harmony/source/blender/makesdna/DNA_node_types.h
branches/ge_harmony/source/blender/makesdna/DNA_particle_types.h
branches/ge_harmony/source/blender/makesdna/DNA_property_types.h
branches/ge_harmony/source/blender/makesdna/DNA_screen_types.h
branches/ge_harmony/source/blender/makesdna/DNA_space_types.h
branches/ge_harmony/source/blender/makesdna/DNA_text_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/CMakeLists.txt
branches/ge_harmony/source/blender/makesdna/intern/SConscript
branches/ge_harmony/source/blender/makesdna/intern/makesdna.c
branches/ge_harmony/source/blender/makesrna/RNA_access.h
branches/ge_harmony/source/blender/makesrna/RNA_enum_types.h
branches/ge_harmony/source/blender/makesrna/RNA_types.h
branches/ge_harmony/source/blender/makesrna/SConscript
branches/ge_harmony/source/blender/makesrna/intern/CMakeLists.txt
branches/ge_harmony/source/blender/makesrna/intern/SConscript
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_action.c
branches/ge_harmony/source/blender/makesrna/intern/rna_curve.c
branches/ge_harmony/source/blender/makesrna/intern/rna_define.c
branches/ge_harmony/source/blender/makesrna/intern/rna_lamp.c
branches/ge_harmony/source/blender/makesrna/intern/rna_main_api.c
branches/ge_harmony/source/blender/makesrna/intern/rna_mask.c
branches/ge_harmony/source/blender/makesrna/intern/rna_mesh.c
branches/ge_harmony/source/blender/makesrna/intern/rna_mesh_api.c
branches/ge_harmony/source/blender/makesrna/intern/rna_meta_api.c
branches/ge_harmony/source/blender/makesrna/intern/rna_modifier.c
branches/ge_harmony/source/blender/makesrna/intern/rna_nodetree.c
branches/ge_harmony/source/blender/makesrna/intern/rna_object.c
branches/ge_harmony/source/blender/makesrna/intern/rna_particle.c
branches/ge_harmony/source/blender/makesrna/intern/rna_pose_api.c
branches/ge_harmony/source/blender/makesrna/intern/rna_render.c
branches/ge_harmony/source/blender/makesrna/intern/rna_scene.c
branches/ge_harmony/source/blender/makesrna/intern/rna_scene_api.c
branches/ge_harmony/source/blender/makesrna/intern/rna_screen.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/makesrna/intern/rna_wm.c
branches/ge_harmony/source/blender/makesrna/intern/rna_wm_api.c
branches/ge_harmony/source/blender/modifiers/CMakeLists.txt
branches/ge_harmony/source/blender/modifiers/SConscript
branches/ge_harmony/source/blender/modifiers/intern/MOD_armature.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_array.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_bevel.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_boolean.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_boolean_util.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_build.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_cast.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_cloth.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_collision.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_curve.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_decimate.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_displace.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_dynamicpaint.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_edgesplit.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_explode.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_fluidsim.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_hook.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_laplaciansmooth.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_lattice.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_mask.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_meshcache.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_meshcache_mdd.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_meshcache_pc2.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_meshdeform.c
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_ocean.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_particleinstance.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_remesh.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_screw.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_shrinkwrap.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_skin.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_smoke.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_smooth.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_softbody.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_solidify.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_subsurf.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_surface.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_triangulate.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_util.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_uvproject.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_uvwarp.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_warp.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_wave.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_weightvgedit.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_weightvgmix.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_weightvgproximity.c
branches/ge_harmony/source/blender/nodes/CMakeLists.txt
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_static_types.h
branches/ge_harmony/source/blender/nodes/SConscript
branches/ge_harmony/source/blender/nodes/composite/node_composite_tree.c
branches/ge_harmony/source/blender/nodes/composite/node_composite_util.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_blur.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_bokehblur.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_bokehimage.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_boxmask.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_brightness.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_colorcorrection.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_common.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_composite.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_crop.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_curves.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_defocus.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_despeckle.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_dilate.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_displace.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_ellipsemask.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_filter.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_flip.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_gamma.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_glare.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_huecorrect.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_idMask.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_image.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_inpaint.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_invert.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_keying.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_keyingscreen.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_lensdist.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_levels.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_mapRange.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_mapUV.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_mapValue.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_mask.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_math.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_movieclip.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_normal.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_normalize.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_outputFile.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_pixelate.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_premulkey.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_rgb.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_rotate.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_scale.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_sepcombRGBA.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_setalpha.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_stabilize2d.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_switch.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_texture.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_tonemap.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_trackpos.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_transform.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_translate.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_valToRgb.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_value.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_vecBlur.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_viewer.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_zcombine.c
branches/ge_harmony/source/blender/nodes/intern/node_common.c
branches/ge_harmony/source/blender/nodes/intern/node_exec.c
branches/ge_harmony/source/blender/nodes/intern/node_socket.c
branches/ge_harmony/source/blender/nodes/intern/node_util.c
branches/ge_harmony/source/blender/nodes/shader/node_shader_tree.c
branches/ge_harmony/source/blender/nodes/shader/node_shader_util.c
branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_attribute.c
branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_brightness.c
branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_bsdf_glass.c
branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.c
branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_bsdf_refraction.c
branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_bump.c
branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_camera.c
branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_common.c
branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_curves.c
branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_gamma.c
branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_geom.c
branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_geometry.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_mapping.c
branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_material.c
branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_math.c
branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_mixRgb.c
branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_normal.c
branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_normal_map.c
branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_output.c
branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_rgb.c
branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_script.c
branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_sepcombRGB.c
branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_squeeze.c
branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_tangent.c
branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_tex_brick.c
branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_tex_coord.c
branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_tex_gradient.c
branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_tex_image.c
branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_tex_magic.c
branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c
branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_tex_sky.c
branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c
branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_tex_wave.c
branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_texture.c
branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_valToRgb.c
branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_value.c
branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_vectMath.c
branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_wireframe.c
branches/ge_harmony/source/blender/nodes/texture/node_texture_tree.c
branches/ge_harmony/source/blender/nodes/texture/node_texture_util.c
branches/ge_harmony/source/blender/nodes/texture/nodes/node_texture_bricks.c
branches/ge_harmony/source/blender/nodes/texture/nodes/node_texture_checker.c
branches/ge_harmony/source/blender/nodes/texture/nodes/node_texture_common.c
branches/ge_harmony/source/blender/nodes/texture/nodes/node_texture_compose.c
branches/ge_harmony/source/blender/nodes/texture/nodes/node_texture_coord.c
branches/ge_harmony/source/blender/nodes/texture/nodes/node_texture_curves.c
branches/ge_harmony/source/blender/nodes/texture/nodes/node_texture_decompose.c
branches/ge_harmony/source/blender/nodes/texture/nodes/node_texture_distance.c
branches/ge_harmony/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
branches/ge_harmony/source/blender/nodes/texture/nodes/node_texture_image.c
branches/ge_harmony/source/blender/nodes/texture/nodes/node_texture_invert.c
branches/ge_harmony/source/blender/nodes/texture/nodes/node_texture_math.c
branches/ge_harmony/source/blender/nodes/texture/nodes/node_texture_mixRgb.c
branches/ge_harmony/source/blender/nodes/texture/nodes/node_texture_output.c
branches/ge_harmony/source/blender/nodes/texture/nodes/node_texture_proc.c
branches/ge_harmony/source/blender/nodes/texture/nodes/node_texture_rotate.c
branches/ge_harmony/source/blender/nodes/texture/nodes/node_texture_scale.c
branches/ge_harmony/source/blender/nodes/texture/nodes/node_texture_texture.c
branches/ge_harmony/source/blender/nodes/texture/nodes/node_texture_translate.c
branches/ge_harmony/source/blender/nodes/texture/nodes/node_texture_valToNor.c
branches/ge_harmony/source/blender/nodes/texture/nodes/node_texture_valToRgb.c
branches/ge_harmony/source/blender/nodes/texture/nodes/node_texture_viewer.c
branches/ge_harmony/source/blender/python/BPY_extern.h
branches/ge_harmony/source/blender/python/bmesh/bmesh_py_types.c
branches/ge_harmony/source/blender/python/generic/CMakeLists.txt
branches/ge_harmony/source/blender/python/intern/bpy_app.c
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_rna.c
branches/ge_harmony/source/blender/quicktime/CMakeLists.txt
branches/ge_harmony/source/blender/quicktime/SConscript
branches/ge_harmony/source/blender/quicktime/apple/qtkit_export.m
branches/ge_harmony/source/blender/quicktime/apple/qtkit_import.m
branches/ge_harmony/source/blender/quicktime/apple/quicktime_export.c
branches/ge_harmony/source/blender/quicktime/apple/quicktime_import.c
branches/ge_harmony/source/blender/render/CMakeLists.txt
branches/ge_harmony/source/blender/render/SConscript
branches/ge_harmony/source/blender/render/extern/include/RE_engine.h
branches/ge_harmony/source/blender/render/extern/include/RE_pipeline.h
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/envmap.c
branches/ge_harmony/source/blender/render/intern/source/external_engine.c
branches/ge_harmony/source/blender/render/intern/source/imagetexture.c
branches/ge_harmony/source/blender/render/intern/source/pipeline.c
branches/ge_harmony/source/blender/render/intern/source/pointdensity.c
branches/ge_harmony/source/blender/render/intern/source/render_texture.c
branches/ge_harmony/source/blender/render/intern/source/shadbuf.c
branches/ge_harmony/source/blender/render/intern/source/shadeinput.c
branches/ge_harmony/source/blender/render/intern/source/sss.c
branches/ge_harmony/source/blender/render/intern/source/strand.c
branches/ge_harmony/source/blender/render/intern/source/volumetric.c
branches/ge_harmony/source/blender/render/intern/source/zbuf.c
branches/ge_harmony/source/blender/windowmanager/CMakeLists.txt
branches/ge_harmony/source/blender/windowmanager/SConscript
branches/ge_harmony/source/blender/windowmanager/WM_api.h
branches/ge_harmony/source/blender/windowmanager/intern/wm.c
branches/ge_harmony/source/blender/windowmanager/intern/wm_cursors.c
branches/ge_harmony/source/blender/windowmanager/intern/wm_event_system.c
branches/ge_harmony/source/blender/windowmanager/intern/wm_files.c
branches/ge_harmony/source/blender/windowmanager/intern/wm_init_exit.c
branches/ge_harmony/source/blender/windowmanager/intern/wm_operators.c
branches/ge_harmony/source/blender/windowmanager/intern/wm_playanim.c
branches/ge_harmony/source/blender/windowmanager/intern/wm_window.c
branches/ge_harmony/source/blender/windowmanager/wm_subwindow.h
branches/ge_harmony/source/blenderplayer/bad_level_call_stubs/SConscript
branches/ge_harmony/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/ge_harmony/source/creator/CMakeLists.txt
branches/ge_harmony/source/creator/creator.c
branches/ge_harmony/source/gameengine/BlenderRoutines/SConscript
branches/ge_harmony/source/gameengine/Converter/BL_ArmatureChannel.cpp
branches/ge_harmony/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/ge_harmony/source/gameengine/Converter/SConscript
branches/ge_harmony/source/gameengine/Expressions/CMakeLists.txt
branches/ge_harmony/source/gameengine/Expressions/ListValue.cpp
branches/ge_harmony/source/gameengine/Expressions/SConscript
branches/ge_harmony/source/gameengine/GameLogic/SConscript
branches/ge_harmony/source/gameengine/GamePlayer/common/SConscript
branches/ge_harmony/source/gameengine/GamePlayer/ghost/SConscript
branches/ge_harmony/source/gameengine/Ketsji/BL_Shader.h
branches/ge_harmony/source/gameengine/Ketsji/KXNetwork/SConscript
branches/ge_harmony/source/gameengine/Ketsji/KX_GameObject.cpp
branches/ge_harmony/source/gameengine/Ketsji/KX_GameObject.h
branches/ge_harmony/source/gameengine/Ketsji/KX_MaterialIpoController.cpp
branches/ge_harmony/source/gameengine/Ketsji/SConscript
branches/ge_harmony/source/gameengine/Network/LoopBackNetwork/SConscript
branches/ge_harmony/source/gameengine/Network/SConscript
branches/ge_harmony/source/gameengine/Physics/Bullet/SConscript
branches/ge_harmony/source/gameengine/Physics/Dummy/SConscript
branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
branches/ge_harmony/source/gameengine/Rasterizer/SConscript
branches/ge_harmony/source/gameengine/SceneGraph/SConscript
branches/ge_harmony/source/gameengine/VideoTexture/SConscript
branches/ge_harmony/source/tools/uncrustify_clean.sh
branches/ge_harmony/source/tools/update_themes.py
Added Paths:
-----------
branches/ge_harmony/doc/python_api/examples/bpy.types.WindowManager.popup_menu.py
branches/ge_harmony/extern/libmv/libmv/simple_pipeline/keyframe_selection.cc
branches/ge_harmony/extern/libmv/libmv/simple_pipeline/keyframe_selection.h
branches/ge_harmony/intern/cycles/kernel/kernel_jitter.h
branches/ge_harmony/intern/cycles/kernel/shaders/node_toon_bsdf.osl
branches/ge_harmony/intern/cycles/kernel/shaders/node_wavelength.osl
branches/ge_harmony/intern/cycles/kernel/svm/svm_wavelength.h
branches/ge_harmony/scons/scons-local/
branches/ge_harmony/source/blender/blenlib/BLI_sys_types.h
branches/ge_harmony/source/blender/bmesh/operators/bmo_subdivide_edgering.c
branches/ge_harmony/source/blender/bmesh/tools/bmesh_path.c
branches/ge_harmony/source/blender/bmesh/tools/bmesh_path.h
branches/ge_harmony/source/blender/editors/mesh/editmesh_path.c
branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_bsdf_toon.c
branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_wavelength.c
Removed Paths:
-------------
branches/ge_harmony/extern/libmv/libmv/tracking/esm_region_tracker.cc
branches/ge_harmony/extern/libmv/libmv/tracking/esm_region_tracker.h
branches/ge_harmony/extern/libmv/libmv/tracking/lmicklt_region_tracker.cc
branches/ge_harmony/extern/libmv/libmv/tracking/lmicklt_region_tracker.h
branches/ge_harmony/intern/cycles/kernel/osl/bsdf_toon.cpp
branches/ge_harmony/intern/ghost/intern/GHOST_SizerWin32.cpp
branches/ge_harmony/intern/ghost/intern/GHOST_SizerWin32.h
branches/ge_harmony/intern/guardedalloc/MEM_sys_types.h
branches/ge_harmony/intern/opennl/superlu/superlu_sys_types.h
branches/ge_harmony/release/scripts/templates_osl/toon_closure.osl
branches/ge_harmony/scons/scons-local-1.2.0.d20090223/
branches/ge_harmony/source/blender/blenloader/BLO_sys_types.h
Property Changed:
----------------
branches/ge_harmony/
branches/ge_harmony/source/blender/editors/interface/interface.c
branches/ge_harmony/source/blender/editors/space_outliner/
Property changes on: branches/ge_harmony
___________________________________________________________________
Modified: svn:ignore
- *.pdb
.*
TAGS
cscope.out
sgc.bat
sgd.bat
smc.bat
ssenv.bat
tags
user-config.py
CMakeFiles
CMakeCache.txt
blender.bin
blender.kdev4
.kdev4
+ BUILD_NOTES.txt
*.pdb
.*
TAGS
cscope.out
sgc.bat
sgd.bat
smc.bat
ssenv.bat
tags
user-config.py
CMakeFiles
CMakeCache.txt
blender.bin
blender.kdev4
.kdev4
Modified: svn:mergeinfo
- /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/trunk/blender:48067-56959
+ /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/tags/blender-2.67b-release/blender:57122
/trunk/blender:48067-57511
Modified: branches/ge_harmony/CMakeLists.txt
===================================================================
--- branches/ge_harmony/CMakeLists.txt 2013-06-17 22:31:52 UTC (rev 57534)
+++ branches/ge_harmony/CMakeLists.txt 2013-06-18 03:51:43 UTC (rev 57535)
@@ -118,9 +118,10 @@
option(WITH_INTERNATIONAL "Enable I18N (International fonts and text)" ON)
option(WITH_PYTHON "Enable Embedded Python API (only disable for development)" ON)
-option(WITH_PYTHON_SECURITY "Disables execution of scripts within blend files by default (recommend to leave off)" OFF)
+option(WITH_PYTHON_SECURITY "Disables execution of scripts within blend files by default" ON)
mark_as_advanced(WITH_PYTHON) # dont want people disabling this unless they really know what they are doing.
mark_as_advanced(WITH_PYTHON_SECURITY) # some distributions see this as a security issue, rather than have them patch it, make a build option.
+set(WITH_PYTHON_SECURITY ON CACHE BOOL "ON" FORCE) # temp force on.
option(WITH_PYTHON_SAFETY "Enable internal API error checking to track invalid data to prevent crash on access (at the expense of some effeciency, only enable for development)." OFF)
option(WITH_PYTHON_MODULE "Enable building as a python module which runs without a user interface, like running regular blender in background mode (experimental, only enable for development)" OFF)
@@ -931,20 +932,26 @@
# include(${CMAKE_ROOT}/Modules/Platform/Windows-cl.cmake)
if(CMAKE_COMPILER_IS_GNUCC)
- set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/mingw32)
include(CheckCSourceCompiles)
# Setup 64bit and 64bit windows systems
CHECK_C_SOURCE_COMPILES("
#ifndef __MINGW64__
#error
#endif
- main(){}
+ int main(void) { return 0; }
"
WITH_MINGW64)
if(WITH_MINGW64)
message(STATUS "Compiling for 64 bit with MinGW-w64.")
set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/mingw64)
+ else()
+ message(STATUS "Compiling for 32 bit with MinGW-w32.")
+ set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/mingw32)
+
+ if(WITH_RAYOPTIMIZATION)
+ message(WARNING "MinGW-w32 is known to be unstable with 'WITH_RAYOPTIMIZATION' option enabled.")
+ endif()
endif()
else()
# Setup 64bit and 64bit windows systems
@@ -1088,11 +1095,7 @@
set(PNG_LIBPATH ${PNG}/lib) # not cmake defined
set(ZLIB_INCLUDE_DIRS ${LIBDIR}/zlib/include)
- if(CMAKE_CL_64)
- set(ZLIB_LIBRARIES ${LIBDIR}/zlib/lib/libz.lib)
- else()
- set(ZLIB_LIBRARIES ${LIBDIR}/zlib/lib/zlib.lib)
- endif()
+ set(ZLIB_LIBRARIES ${LIBDIR}/zlib/lib/libz_st.lib)
set(PTHREADS_INCLUDE_DIRS ${LIBDIR}/pthreads/include)
set(PTHREADS_LIBRARIES ${LIBDIR}/pthreads/lib/pthreadVC2.lib)
@@ -2234,6 +2237,7 @@
info_cfg_option(WITH_INTERNATIONAL)
info_cfg_option(WITH_INPUT_NDOF)
info_cfg_option(WITH_CYCLES)
+ info_cfg_option(WITH_FREESTYLE)
info_cfg_option(WITH_OPENCOLORIO)
info_cfg_text("Compiler Options:")
Modified: branches/ge_harmony/SConstruct
===================================================================
--- branches/ge_harmony/SConstruct 2013-06-17 22:31:52 UTC (rev 57534)
+++ branches/ge_harmony/SConstruct 2013-06-18 03:51:43 UTC (rev 57535)
@@ -46,9 +46,7 @@
import os.path
import string
import shutil
-import glob
import re
-from tempfile import mkdtemp
# store path to tools
toolpath=os.path.join(".", "build_files", "scons", "tools")
@@ -58,7 +56,6 @@
import Blender
import btools
-import bcolors
EnsureSConsVersion(1,0,0)
@@ -121,7 +118,7 @@
if bitness:
B.bitness = bitness
-else:
+else:
B.bitness = tempbitness
@@ -151,9 +148,9 @@
btools.SetupSpawn(env)
else:
if bitness==64 and platform=='win32':
- env = BlenderEnvironment(ENV = os.environ, MSVS_ARCH='amd64')
+ env = BlenderEnvironment(ENV = os.environ, MSVS_ARCH='amd64', TARGET_ARCH='x86_64')
else:
- env = BlenderEnvironment(ENV = os.environ)
+ env = BlenderEnvironment(ENV = os.environ, TARGET_ARCH='x86')
if not env:
print "Could not create a build environment"
@@ -172,6 +169,10 @@
elif env['CC'] in ['gcc']:
platform = 'win64-mingw' if bitness == 64 else 'win32-mingw'
+if 'mingw' in platform:
+ print "Setting custom spawn function"
+ btools.SetupSpawn(env)
+
env.SConscriptChdir(0)
# Remove major kernel version from linux platform.
@@ -303,7 +304,7 @@
env.Append(LINKFLAGS=['-F/Library/Frameworks','-Xlinker','-weak_framework','-Xlinker','3DconnexionClient'])
env['BF_3DMOUSE_INC'] = '/Library/Frameworks/3DconnexionClient.framework/Headers'
- # for now, Mac builders must download and install the JackOSX framework
+ # 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:
@@ -313,13 +314,13 @@
else:
env.Append(LINKFLAGS=['-L/Library/Frameworks','-Xlinker','-weak_framework','-Xlinker','Jackmp'])
- if env['WITH_BF_CYCLES_OSL'] == 1:
+ if env['WITH_BF_CYCLES_OSL'] == 1:
OSX_OSL_LIBPATH = Dir(env.subst(env['BF_OSL_LIBPATH'])).abspath
# we need 2 variants of passing the oslexec with the force_load option, string and list type atm
env.Append(LINKFLAGS=['-L'+OSX_OSL_LIBPATH,'-loslcomp','-force_load '+ OSX_OSL_LIBPATH +'/liboslexec.a','-loslquery'])
env.Append(BF_PROGRAM_LINKFLAGS=['-Xlinker','-force_load','-Xlinker',OSX_OSL_LIBPATH +'/liboslexec.a'])
- # Trying to get rid of eventually clashes, we export some explicite as local symbols
+ # Trying to get rid of eventually clashes, we export some explicite as local symbols
env.Append(LINKFLAGS=['-Xlinker','-unexported_symbols_list','-Xlinker','./source/creator/osx_locals.map'])
if env['WITH_BF_OPENMP'] == 1:
@@ -330,10 +331,10 @@
env.Append(LINKFLAGS=['-openmp', '-static-intel'])
env['CCFLAGS'].append('-openmp')
else:
- env.Append(CCFLAGS=['-fopenmp'])
+ env.Append(CCFLAGS=['-fopenmp'])
if env['WITH_GHOST_COCOA'] == True:
- env.Append(CPPFLAGS=['-DGHOST_COCOA'])
+ env.Append(CPPFLAGS=['-DGHOST_COCOA'])
if env['USE_QTKIT'] == True:
env.Append(CPPFLAGS=['-DUSE_QTKIT'])
@@ -370,7 +371,7 @@
# build with ocean sim?
if env['WITH_BF_OCEANSIM'] == 1:
- env['WITH_BF_FFTW3'] = 1 # ocean needs fftw3 so enable it
+ env['WITH_BF_FFTW3'] = 1 # ocean needs fftw3 so enable it
env['CPPFLAGS'].append('-DWITH_MOD_OCEANSIM')
@@ -517,10 +518,10 @@
filename_only = os.path.basename(FILE_FROM)
FILE_TO = os.path.join(env['DATA_SOURCES'], filename_only + ".c")
VAR_NAME = "datatoc_" + filename_only.replace(".", "_")
-
+
data_to_c(FILE_FROM, FILE_TO, VAR_NAME)
-
+
if B.targets != ['cudakernels']:
data_to_c("source/blender/compositor/operations/COM_OpenCLKernels.cl",
B.root_build_dir + "data_headers/COM_OpenCLKernels.cl.h",
@@ -913,7 +914,6 @@
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc', 'linuxcross'):
dllsources = []
- dllsources += ['${BF_ZLIB_LIBPATH}/zlib.dll']
# Used when linking to libtiff was dynamic
# keep it here until compilation on all platform would be ok
# dllsources += ['${BF_TIFF_LIBPATH}/${BF_TIFF_LIB}.dll']
@@ -964,7 +964,7 @@
else:
dllsources.append('${LCGDIR}/opencolorio/bin/libOpenColorIO.dll')
-
+
dllsources.append('#source/icons/blender.exe.manifest')
windlls = env.Install(dir=env['BF_INSTALLDIR'], source = dllsources)
@@ -994,7 +994,7 @@
if(env['WITH_BF_OPENMP']):
dllsources.append('${LCGDIR}/binaries/libgomp-1.dll')
-
+
if env['WITH_BF_OCIO']:
dllsources.append('${LCGDIR}/opencolorio/bin/libOpenColorIO.dll')
Modified: branches/ge_harmony/build_files/build_environment/install_deps.sh
===================================================================
--- branches/ge_harmony/build_files/build_environment/install_deps.sh 2013-06-17 22:31:52 UTC (rev 57534)
+++ branches/ge_harmony/build_files/build_environment/install_deps.sh 2013-06-18 03:51:43 UTC (rev 57535)
@@ -19,11 +19,13 @@
# A shell script installing/building all needed dependencies to build Blender, for some Linux distributions.
+##### Args and Help Handling #####
+
# Parse command line!
ARGS=$( \
getopt \
-o s:i:t:h \
---long source:,install:,threads:,help,with-all,with-osl,with-opencollada,all-static,force-all,\
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list