[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56681] branches/ge_harmony: Merged revisions 55933-56638 from trunk/blender
Daniel Stokes
kupomail at gmail.com
Sat May 11 07:32:41 CEST 2013
Revision: 56681
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56681
Author: kupoman
Date: 2013-05-11 05:32:40 +0000 (Sat, 11 May 2013)
Log Message:
-----------
Merged revisions 55933-56638 from trunk/blender
Modified Paths:
--------------
branches/ge_harmony/CMakeLists.txt
branches/ge_harmony/build_files/buildbot/config/user-config-glibc211-i686.py
branches/ge_harmony/build_files/buildbot/config/user-config-glibc211-x86_64.py
branches/ge_harmony/build_files/buildbot/config/user-config-mac-i386.py
branches/ge_harmony/build_files/buildbot/config/user-config-mac-x86_64.py
branches/ge_harmony/build_files/buildbot/config/user-config-player-glibc211-i686.py
branches/ge_harmony/build_files/buildbot/config/user-config-player-glibc211-x86_64.py
branches/ge_harmony/build_files/cmake/clang_array_check.py
branches/ge_harmony/build_files/cmake/cmake_static_check_clang_array.py
branches/ge_harmony/build_files/scons/config/win32-mingw-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/rst/bge.render.rst
branches/ge_harmony/doc/python_api/rst/change_log.rst
branches/ge_harmony/doc/python_api/rst/include__bmesh.rst
branches/ge_harmony/doc/python_api/rst/info_quickstart.rst
branches/ge_harmony/doc/python_api/rst_from_bmesh_opdefines.py
branches/ge_harmony/doc/python_api/sphinx_changelog_gen.py
branches/ge_harmony/doc/python_api/sphinx_doc_gen.py
branches/ge_harmony/doc/python_api/sphinx_doc_gen.sh
branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp
branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.cpp
branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp
branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp
branches/ge_harmony/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
branches/ge_harmony/extern/bullet2/src/LinearMath/btVector3.cpp
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/simple_pipeline/bundle.cc
branches/ge_harmony/extern/libmv/libmv-capi.cpp
branches/ge_harmony/extern/libmv/third_party/ceres/CMakeLists.txt
branches/ge_harmony/extern/libmv/third_party/ceres/ChangeLog
branches/ge_harmony/extern/libmv/third_party/ceres/files.txt
branches/ge_harmony/extern/libmv/third_party/ceres/include/ceres/ceres.h
branches/ge_harmony/extern/libmv/third_party/ceres/include/ceres/dynamic_autodiff_cost_function.h
branches/ge_harmony/extern/libmv/third_party/ceres/include/ceres/jet.h
branches/ge_harmony/extern/libmv/third_party/ceres/include/ceres/problem.h
branches/ge_harmony/extern/libmv/third_party/ceres/include/ceres/solver.h
branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/blas.h
branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/block_sparse_matrix.cc
branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/iterative_schur_complement_solver.cc
branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/linear_solver.h
branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/minimizer.h
branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/preconditioner.h
branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/problem.cc
branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/problem_impl.cc
branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/problem_impl.h
branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/residual_block.cc
branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/schur_complement_solver.cc
branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/schur_eliminator.h
branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/schur_eliminator_impl.h
branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/solver_impl.cc
branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/solver_impl.h
branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/sparse_normal_cholesky_solver.cc
branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/suitesparse.cc
branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/suitesparse.h
branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/visibility_based_preconditioner.cc
branches/ge_harmony/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
branches/ge_harmony/intern/audaspace/intern/AUD_JOSResampleReader.cpp
branches/ge_harmony/intern/audaspace/jack/AUD_JackLibrary.cpp
branches/ge_harmony/intern/cycles/SConscript
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_curves.cpp
branches/ge_harmony/intern/cycles/blender/blender_mesh.cpp
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_session.h
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/blender/blender_util.h
branches/ge_harmony/intern/cycles/bvh/bvh.cpp
branches/ge_harmony/intern/cycles/bvh/bvh_sort.cpp
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_microfacet.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_opencl.h
branches/ge_harmony/intern/cycles/kernel/kernel_curve.h
branches/ge_harmony/intern/cycles/kernel/kernel_differential.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_light.h
branches/ge_harmony/intern/cycles/kernel/kernel_path.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_subsurface.h
branches/ge_harmony/intern/cycles/kernel/kernel_types.h
branches/ge_harmony/intern/cycles/kernel/osl/SConscript
branches/ge_harmony/intern/cycles/kernel/osl/osl_services.cpp
branches/ge_harmony/intern/cycles/kernel/osl/osl_shader.cpp
branches/ge_harmony/intern/cycles/kernel/shaders/node_bump.osl
branches/ge_harmony/intern/cycles/kernel/shaders/node_environment_texture.osl
branches/ge_harmony/intern/cycles/kernel/shaders/node_image_texture.osl
branches/ge_harmony/intern/cycles/kernel/svm/svm_displace.h
branches/ge_harmony/intern/cycles/kernel/svm/svm_geometry.h
branches/ge_harmony/intern/cycles/kernel/svm/svm_image.h
branches/ge_harmony/intern/cycles/kernel/svm/svm_types.h
branches/ge_harmony/intern/cycles/render/CMakeLists.txt
branches/ge_harmony/intern/cycles/render/camera.cpp
branches/ge_harmony/intern/cycles/render/camera.h
branches/ge_harmony/intern/cycles/render/curves.cpp
branches/ge_harmony/intern/cycles/render/curves.h
branches/ge_harmony/intern/cycles/render/film.cpp
branches/ge_harmony/intern/cycles/render/graph.cpp
branches/ge_harmony/intern/cycles/render/integrator.cpp
branches/ge_harmony/intern/cycles/render/mesh.cpp
branches/ge_harmony/intern/cycles/render/mesh.h
branches/ge_harmony/intern/cycles/render/mesh_displace.cpp
branches/ge_harmony/intern/cycles/render/nodes.cpp
branches/ge_harmony/intern/cycles/render/object.cpp
branches/ge_harmony/intern/cycles/render/object.h
branches/ge_harmony/intern/cycles/render/osl.cpp
branches/ge_harmony/intern/cycles/render/osl.h
branches/ge_harmony/intern/cycles/render/session.cpp
branches/ge_harmony/intern/cycles/render/svm.cpp
branches/ge_harmony/intern/cycles/render/tile.cpp
branches/ge_harmony/intern/cycles/render/tile.h
branches/ge_harmony/intern/cycles/util/util_transform.h
branches/ge_harmony/intern/elbeem/extern/elbeem.h
branches/ge_harmony/intern/elbeem/intern/simulation_object.cpp
branches/ge_harmony/intern/ffmpeg/ffmpeg_compat.h
branches/ge_harmony/intern/ghost/intern/GHOST_SizerWin32.cpp
branches/ge_harmony/intern/ghost/intern/GHOST_SizerWin32.h
branches/ge_harmony/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/ge_harmony/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/ge_harmony/intern/guardedalloc/CMakeLists.txt
branches/ge_harmony/intern/guardedalloc/SConscript
branches/ge_harmony/intern/guardedalloc/intern/mallocn.c
branches/ge_harmony/intern/locale/boost_locale_wrapper.cpp
branches/ge_harmony/intern/opencolorio/ocio_impl_glsl.cc
branches/ge_harmony/intern/rigidbody/RBI_api.h
branches/ge_harmony/intern/rigidbody/rb_bullet_api.cpp
branches/ge_harmony/intern/smoke/intern/EIGENVALUE_HELPER.cpp
branches/ge_harmony/intern/smoke/intern/FLUID_3D.cpp
branches/ge_harmony/intern/smoke/intern/FLUID_3D_SOLVERS.cpp
branches/ge_harmony/intern/smoke/intern/FLUID_3D_STATIC.cpp
branches/ge_harmony/intern/smoke/intern/INTERPOLATE.h
branches/ge_harmony/intern/smoke/intern/LU_HELPER.cpp
branches/ge_harmony/intern/smoke/intern/VEC3.h
branches/ge_harmony/intern/smoke/intern/WAVELET_NOISE.h
branches/ge_harmony/intern/smoke/intern/WTURBULENCE.cpp
branches/ge_harmony/intern/smoke/intern/spectrum.cpp
branches/ge_harmony/intern/tools/credits_svn_gen.py
branches/ge_harmony/release/darwin/blender.app/Contents/Info.plist
branches/ge_harmony/release/datafiles/colormanagement/config.ocio
branches/ge_harmony/release/datafiles/colormanagement/luts/srgb.spi1d
branches/ge_harmony/release/datafiles/preview_cycles.blend
branches/ge_harmony/release/datafiles/splash.png
branches/ge_harmony/release/datafiles/startup.blend
branches/ge_harmony/release/scripts/freestyle/style_modules/parameter_editor.py
branches/ge_harmony/release/scripts/freestyle/style_modules/shaders.py
branches/ge_harmony/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py
branches/ge_harmony/release/scripts/modules/bl_i18n_utils/settings.py
branches/ge_harmony/release/scripts/modules/bl_i18n_utils/utils.py
branches/ge_harmony/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
branches/ge_harmony/release/scripts/modules/bpy_extras/anim_utils.py
branches/ge_harmony/release/scripts/modules/bpy_extras/io_utils.py
branches/ge_harmony/release/scripts/modules/bpy_extras/keyconfig_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/complete_namespace.py
branches/ge_harmony/release/scripts/modules/console_python.py
branches/ge_harmony/release/scripts/modules/rna_info.py
branches/ge_harmony/release/scripts/presets/interaction/maya.py
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/anim.py
branches/ge_harmony/release/scripts/startup/bl_operators/clip.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/node.py
branches/ge_harmony/release/scripts/startup/bl_operators/object_quick_effects.py
branches/ge_harmony/release/scripts/startup/bl_operators/rigidbody.py
branches/ge_harmony/release/scripts/startup/bl_operators/sequencer.py
branches/ge_harmony/release/scripts/startup/bl_operators/vertexpaint_dirt.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_modifier.py
branches/ge_harmony/release/scripts/startup/bl_ui/properties_freestyle.py
branches/ge_harmony/release/scripts/startup/bl_ui/properties_game.py
branches/ge_harmony/release/scripts/startup/bl_ui/properties_object.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_physics_fluid.py
branches/ge_harmony/release/scripts/startup/bl_ui/properties_physics_rigidbody.py
branches/ge_harmony/release/scripts/startup/bl_ui/properties_physics_rigidbody_constraint.py
branches/ge_harmony/release/scripts/startup/bl_ui/properties_physics_smoke.py
branches/ge_harmony/release/scripts/startup/bl_ui/properties_render_layer.py
branches/ge_harmony/release/scripts/startup/bl_ui/properties_scene.py
branches/ge_harmony/release/scripts/startup/bl_ui/space_clip.py
branches/ge_harmony/release/scripts/startup/bl_ui/space_console.py
branches/ge_harmony/release/scripts/startup/bl_ui/space_image.py
branches/ge_harmony/release/scripts/startup/bl_ui/space_node.py
branches/ge_harmony/release/scripts/startup/bl_ui/space_sequencer.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/templates_py/custom_nodes.py
branches/ge_harmony/release/scripts/templates_py/operator_uv.py
branches/ge_harmony/source/blender/avi/intern/avi_intern.h
branches/ge_harmony/source/blender/avi/intern/avi_mjpeg.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_boids.h
branches/ge_harmony/source/blender/blenkernel/BKE_brush.h
branches/ge_harmony/source/blender/blenkernel/BKE_bvhutils.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_mask.h
branches/ge_harmony/source/blender/blenkernel/BKE_material.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_paint.h
branches/ge_harmony/source/blender/blenkernel/BKE_particle.h
branches/ge_harmony/source/blender/blenkernel/BKE_pbvh.h
branches/ge_harmony/source/blender/blenkernel/BKE_rigidbody.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/CMakeLists.txt
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/boids.c
branches/ge_harmony/source/blender/blenkernel/intern/brush.c
branches/ge_harmony/source/blender/blenkernel/intern/bvhutils.c
branches/ge_harmony/source/blender/blenkernel/intern/cdderivedmesh.c
branches/ge_harmony/source/blender/blenkernel/intern/collision.c
branches/ge_harmony/source/blender/blenkernel/intern/colortools.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/curve.c
branches/ge_harmony/source/blender/blenkernel/intern/customdata.c
branches/ge_harmony/source/blender/blenkernel/intern/depsgraph.c
branches/ge_harmony/source/blender/blenkernel/intern/displist.c
branches/ge_harmony/source/blender/blenkernel/intern/editderivedmesh.c
branches/ge_harmony/source/blender/blenkernel/intern/effect.c
branches/ge_harmony/source/blender/blenkernel/intern/fcurve.c
branches/ge_harmony/source/blender/blenkernel/intern/group.c
branches/ge_harmony/source/blender/blenkernel/intern/image_gen.c
branches/ge_harmony/source/blender/blenkernel/intern/key.c
branches/ge_harmony/source/blender/blenkernel/intern/library.c
branches/ge_harmony/source/blender/blenkernel/intern/linestyle.c
branches/ge_harmony/source/blender/blenkernel/intern/mask_evaluate.c
branches/ge_harmony/source/blender/blenkernel/intern/mask_rasterize.c
branches/ge_harmony/source/blender/blenkernel/intern/material.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/modifiers_bmesh.c
branches/ge_harmony/source/blender/blenkernel/intern/movieclip.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/ocean.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/pointcache.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/seqeffects.c
branches/ge_harmony/source/blender/blenkernel/intern/seqmodifier.c
branches/ge_harmony/source/blender/blenkernel/intern/shrinkwrap.c
branches/ge_harmony/source/blender/blenkernel/intern/smoke.c
branches/ge_harmony/source/blender/blenkernel/intern/softbody.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/tracking.c
branches/ge_harmony/source/blender/blenkernel/intern/writeffmpeg.c
branches/ge_harmony/source/blender/blenlib/BLI_edgehash.h
branches/ge_harmony/source/blender/blenlib/BLI_ghash.h
branches/ge_harmony/source/blender/blenlib/BLI_math_base.h
branches/ge_harmony/source/blender/blenlib/BLI_math_color.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_rotation.h
branches/ge_harmony/source/blender/blenlib/BLI_math_vector.h
branches/ge_harmony/source/blender/blenlib/BLI_rand.h
branches/ge_harmony/source/blender/blenlib/BLI_scanfill.h
branches/ge_harmony/source/blender/blenlib/BLI_smallhash.h
branches/ge_harmony/source/blender/blenlib/BLI_threads.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/BLI_heap.c
branches/ge_harmony/source/blender/blenlib/intern/BLI_mempool.c
branches/ge_harmony/source/blender/blenlib/intern/edgehash.c
branches/ge_harmony/source/blender/blenlib/intern/fileops.c
branches/ge_harmony/source/blender/blenlib/intern/jitter.c
branches/ge_harmony/source/blender/blenlib/intern/math_base_inline.c
branches/ge_harmony/source/blender/blenlib/intern/math_color.c
branches/ge_harmony/source/blender/blenlib/intern/math_color_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/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/rand.c
branches/ge_harmony/source/blender/blenlib/intern/scanfill.c
branches/ge_harmony/source/blender/blenlib/intern/smallhash.c
branches/ge_harmony/source/blender/blenlib/intern/storage.c
branches/ge_harmony/source/blender/blenlib/intern/string.c
branches/ge_harmony/source/blender/blenlib/intern/string_cursor_utf8.c
branches/ge_harmony/source/blender/blenlib/intern/string_utf8.c
branches/ge_harmony/source/blender/blenlib/intern/threads.c
branches/ge_harmony/source/blender/blenlib/intern/uvproject.c
branches/ge_harmony/source/blender/blenloader/SConscript
branches/ge_harmony/source/blender/blenloader/intern/readfile.c
branches/ge_harmony/source/blender/blenloader/intern/versioning_250.c
branches/ge_harmony/source/blender/blenloader/intern/writefile.c
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_interp.c
branches/ge_harmony/source/blender/bmesh/intern/bmesh_interp.h
branches/ge_harmony/source/blender/bmesh/intern/bmesh_mesh.c
branches/ge_harmony/source/blender/bmesh/intern/bmesh_mesh.h
branches/ge_harmony/source/blender/bmesh/intern/bmesh_mesh_conv.c
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_polygon.c
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_beautify.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_dupe.c
branches/ge_harmony/source/blender/bmesh/operators/bmo_edgenet.c
branches/ge_harmony/source/blender/bmesh/operators/bmo_inset.c
branches/ge_harmony/source/blender/bmesh/operators/bmo_join_triangles.c
branches/ge_harmony/source/blender/bmesh/operators/bmo_smooth_laplacian.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/operators/bmo_wireframe.c
branches/ge_harmony/source/blender/bmesh/tools/BME_bevel.c
branches/ge_harmony/source/blender/bmesh/tools/bmesh_decimate_collapse.c
branches/ge_harmony/source/blender/collada/AnimationExporter.cpp
branches/ge_harmony/source/blender/collada/DocumentImporter.cpp
branches/ge_harmony/source/blender/collada/ExtraHandler.cpp
branches/ge_harmony/source/blender/collada/ExtraHandler.h
branches/ge_harmony/source/blender/collada/GeometryExporter.cpp
branches/ge_harmony/source/blender/collada/MeshImporter.cpp
branches/ge_harmony/source/blender/collada/SceneExporter.cpp
branches/ge_harmony/source/blender/collada/SkinInfo.cpp
branches/ge_harmony/source/blender/collada/collada_utils.cpp
branches/ge_harmony/source/blender/compositor/intern/COM_CompositorContext.h
branches/ge_harmony/source/blender/compositor/intern/COM_ExecutionSystem.cpp
branches/ge_harmony/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
branches/ge_harmony/source/blender/compositor/intern/COM_InputSocket.h
branches/ge_harmony/source/blender/compositor/intern/COM_compositor.cpp
branches/ge_harmony/source/blender/editors/animation/anim_channels_defines.c
branches/ge_harmony/source/blender/editors/animation/anim_deps.c
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_ipo_utils.c
branches/ge_harmony/source/blender/editors/animation/drivers.c
branches/ge_harmony/source/blender/editors/animation/keyframing.c
branches/ge_harmony/source/blender/editors/animation/keyingsets.c
branches/ge_harmony/source/blender/editors/armature/armature_add.c
branches/ge_harmony/source/blender/editors/armature/armature_naming.c
branches/ge_harmony/source/blender/editors/armature/editarmature_retarget.c
branches/ge_harmony/source/blender/editors/armature/editarmature_sketch.c
branches/ge_harmony/source/blender/editors/armature/pose_slide.c
branches/ge_harmony/source/blender/editors/armature/reeb.c
branches/ge_harmony/source/blender/editors/curve/editcurve.c
branches/ge_harmony/source/blender/editors/curve/editfont.c
branches/ge_harmony/source/blender/editors/gpencil/gpencil_edit.c
branches/ge_harmony/source/blender/editors/include/ED_mask.h
branches/ge_harmony/source/blender/editors/include/ED_mesh.h
branches/ge_harmony/source/blender/editors/include/ED_node.h
branches/ge_harmony/source/blender/editors/include/ED_object.h
branches/ge_harmony/source/blender/editors/include/ED_render.h
branches/ge_harmony/source/blender/editors/include/ED_screen.h
branches/ge_harmony/source/blender/editors/include/ED_sculpt.h
branches/ge_harmony/source/blender/editors/include/ED_transform.h
branches/ge_harmony/source/blender/editors/include/ED_uvedit.h
branches/ge_harmony/source/blender/editors/include/ED_view3d.h
branches/ge_harmony/source/blender/editors/include/UI_interface.h
branches/ge_harmony/source/blender/editors/interface/interface.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_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/mask/mask_draw.c
branches/ge_harmony/source/blender/editors/mask/mask_select.c
branches/ge_harmony/source/blender/editors/mesh/CMakeLists.txt
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_bevel.c
branches/ge_harmony/source/blender/editors/mesh/editmesh_extrude.c
branches/ge_harmony/source/blender/editors/mesh/editmesh_inset.c
branches/ge_harmony/source/blender/editors/mesh/editmesh_knife.c
branches/ge_harmony/source/blender/editors/mesh/editmesh_knife_project.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_navmesh.c
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/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_hook.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_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/particle_edit.c
branches/ge_harmony/source/blender/editors/physics/particle_object.c
branches/ge_harmony/source/blender/editors/physics/physics_fluid.c
branches/ge_harmony/source/blender/editors/render/render_intern.h
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_preview.c
branches/ge_harmony/source/blender/editors/render/render_shading.c
branches/ge_harmony/source/blender/editors/render/render_update.c
branches/ge_harmony/source/blender/editors/render/render_view.c
branches/ge_harmony/source/blender/editors/screen/area.c
branches/ge_harmony/source/blender/editors/screen/glutil.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/paint_cursor.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_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/sculpt_paint/sculpt_uv.c
branches/ge_harmony/source/blender/editors/space_action/space_action.c
branches/ge_harmony/source/blender/editors/space_api/spacetypes.c
branches/ge_harmony/source/blender/editors/space_buttons/buttons_context.c
branches/ge_harmony/source/blender/editors/space_buttons/buttons_texture.c
branches/ge_harmony/source/blender/editors/space_buttons/space_buttons.c
branches/ge_harmony/source/blender/editors/space_clip/clip_buttons.c
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/console_ops.c
branches/ge_harmony/source/blender/editors/space_console/space_console.c
branches/ge_harmony/source/blender/editors/space_file/file_draw.c
branches/ge_harmony/source/blender/editors/space_file/space_file.c
branches/ge_harmony/source/blender/editors/space_graph/graph_buttons.c
branches/ge_harmony/source/blender/editors/space_graph/graph_utils.c
branches/ge_harmony/source/blender/editors/space_graph/space_graph.c
branches/ge_harmony/source/blender/editors/space_image/image_buttons.c
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_image/space_image.c
branches/ge_harmony/source/blender/editors/space_info/info_stats.c
branches/ge_harmony/source/blender/editors/space_info/space_info.c
branches/ge_harmony/source/blender/editors/space_logic/logic_ops.c
branches/ge_harmony/source/blender/editors/space_nla/nla_buttons.c
branches/ge_harmony/source/blender/editors/space_nla/nla_channels.c
branches/ge_harmony/source/blender/editors/space_nla/nla_draw.c
branches/ge_harmony/source/blender/editors/space_nla/nla_edit.c
branches/ge_harmony/source/blender/editors/space_nla/nla_ops.c
branches/ge_harmony/source/blender/editors/space_nla/nla_select.c
branches/ge_harmony/source/blender/editors/space_nla/space_nla.c
branches/ge_harmony/source/blender/editors/space_node/CMakeLists.txt
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_ops.c
branches/ge_harmony/source/blender/editors/space_node/node_relationships.c
branches/ge_harmony/source/blender/editors/space_node/node_select.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/outliner_draw.c
branches/ge_harmony/source/blender/editors/space_outliner/outliner_tree.c
branches/ge_harmony/source/blender/editors/space_outliner/space_outliner.c
branches/ge_harmony/source/blender/editors/space_script/space_script.c
branches/ge_harmony/source/blender/editors/space_sequencer/sequencer_draw.c
branches/ge_harmony/source/blender/editors/space_sequencer/space_sequencer.c
branches/ge_harmony/source/blender/editors/space_text/text_autocomplete.c
branches/ge_harmony/source/blender/editors/space_text/text_ops.c
branches/ge_harmony/source/blender/editors/space_time/space_time.c
branches/ge_harmony/source/blender/editors/space_view3d/drawarmature.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/drawvolume.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_intern.h
branches/ge_harmony/source/blender/editors/space_view3d/view3d_iterators.c
branches/ge_harmony/source/blender/editors/space_view3d/view3d_project.c
branches/ge_harmony/source/blender/editors/space_view3d/view3d_ruler.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_toolbar.c
branches/ge_harmony/source/blender/editors/space_view3d/view3d_view.c
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_constraints.c
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/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/transform/transform_snap.c
branches/ge_harmony/source/blender/editors/util/crazyspace.c
branches/ge_harmony/source/blender/editors/uvedit/uvedit_buttons.c
branches/ge_harmony/source/blender/editors/uvedit/uvedit_draw.c
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/editors/uvedit/uvedit_unwrap_ops.c
branches/ge_harmony/source/blender/freestyle/FRS_freestyle.h
branches/ge_harmony/source/blender/freestyle/intern/application/AppCanvas.cpp
branches/ge_harmony/source/blender/freestyle/intern/application/AppConfig.cpp
branches/ge_harmony/source/blender/freestyle/intern/application/Controller.cpp
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/BlenderTextureManager.cpp
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/geometry/Noise.h
branches/ge_harmony/source/blender/freestyle/intern/geometry/normal_cycle.h
branches/ge_harmony/source/blender/freestyle/intern/image/GaussianFilter.h
branches/ge_harmony/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.cpp
branches/ge_harmony/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.h
branches/ge_harmony/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp
branches/ge_harmony/source/blender/freestyle/intern/stroke/BasicStrokeShaders.h
branches/ge_harmony/source/blender/freestyle/intern/stroke/Curve.cpp
branches/ge_harmony/source/blender/freestyle/intern/stroke/Stroke.cpp
branches/ge_harmony/source/blender/freestyle/intern/stroke/Stroke.h
branches/ge_harmony/source/blender/freestyle/intern/stroke/StrokeRep.cpp
branches/ge_harmony/source/blender/freestyle/intern/system/PythonInterpreter.h
branches/ge_harmony/source/blender/freestyle/intern/system/StringUtils.cpp
branches/ge_harmony/source/blender/freestyle/intern/system/StringUtils.h
branches/ge_harmony/source/blender/freestyle/intern/view_map/Functions1D.cpp
branches/ge_harmony/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
branches/ge_harmony/source/blender/gpu/GPU_draw.h
branches/ge_harmony/source/blender/gpu/GPU_extensions.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_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/imbuf/IMB_imbuf.h
branches/ge_harmony/source/blender/imbuf/intern/anim_movie.c
branches/ge_harmony/source/blender/imbuf/intern/colormanagement.c
branches/ge_harmony/source/blender/imbuf/intern/divers.c
branches/ge_harmony/source/blender/imbuf/intern/indexer.c
branches/ge_harmony/source/blender/imbuf/intern/jpeg.c
branches/ge_harmony/source/blender/imbuf/intern/moviecache.c
branches/ge_harmony/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/ge_harmony/source/blender/imbuf/intern/rectop.c
branches/ge_harmony/source/blender/imbuf/intern/util.c
branches/ge_harmony/source/blender/makesdna/DNA_brush_types.h
branches/ge_harmony/source/blender/makesdna/DNA_customdata_types.h
branches/ge_harmony/source/blender/makesdna/DNA_mesh_types.h
branches/ge_harmony/source/blender/makesdna/DNA_node_types.h
branches/ge_harmony/source/blender/makesdna/DNA_object_fluidsim.h
branches/ge_harmony/source/blender/makesdna/DNA_scene_types.h
branches/ge_harmony/source/blender/makesdna/DNA_screen_types.h
branches/ge_harmony/source/blender/makesdna/DNA_sequence_types.h
branches/ge_harmony/source/blender/makesdna/DNA_smoke_types.h
branches/ge_harmony/source/blender/makesdna/DNA_space_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/intern/CMakeLists.txt
branches/ge_harmony/source/blender/makesdna/intern/SConscript
branches/ge_harmony/source/blender/makesrna/RNA_access.h
branches/ge_harmony/source/blender/makesrna/RNA_types.h
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_actuator.c
branches/ge_harmony/source/blender/makesrna/intern/rna_animation.c
branches/ge_harmony/source/blender/makesrna/intern/rna_armature.c
branches/ge_harmony/source/blender/makesrna/intern/rna_boid.c
branches/ge_harmony/source/blender/makesrna/intern/rna_brush.c
branches/ge_harmony/source/blender/makesrna/intern/rna_cloth.c
branches/ge_harmony/source/blender/makesrna/intern/rna_constraint.c
branches/ge_harmony/source/blender/makesrna/intern/rna_curve.c
branches/ge_harmony/source/blender/makesrna/intern/rna_dynamicpaint.c
branches/ge_harmony/source/blender/makesrna/intern/rna_fluidsim.c
branches/ge_harmony/source/blender/makesrna/intern/rna_gpencil.c
branches/ge_harmony/source/blender/makesrna/intern/rna_image.c
branches/ge_harmony/source/blender/makesrna/intern/rna_internal.h
branches/ge_harmony/source/blender/makesrna/intern/rna_key.c
branches/ge_harmony/source/blender/makesrna/intern/rna_lamp.c
branches/ge_harmony/source/blender/makesrna/intern/rna_linestyle.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_modifier.c
branches/ge_harmony/source/blender/makesrna/intern/rna_nla.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_object_api.c
branches/ge_harmony/source/blender/makesrna/intern/rna_object_force.c
branches/ge_harmony/source/blender/makesrna/intern/rna_particle.c
branches/ge_harmony/source/blender/makesrna/intern/rna_pose.c
branches/ge_harmony/source/blender/makesrna/intern/rna_rigidbody.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_sculpt_paint.c
branches/ge_harmony/source/blender/makesrna/intern/rna_sequencer.c
branches/ge_harmony/source/blender/makesrna/intern/rna_smoke.c
branches/ge_harmony/source/blender/makesrna/intern/rna_space.c
branches/ge_harmony/source/blender/makesrna/intern/rna_texture.c
branches/ge_harmony/source/blender/makesrna/intern/rna_tracking.c
branches/ge_harmony/source/blender/makesrna/intern/rna_ui_api.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/SConscript
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_util.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_build.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_util.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_laplaciansmooth.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_mask.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_ocean.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_particleinstance.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_screw.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_skin.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_triangulate.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_weightvg_util.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_weightvg_util.h
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/NOD_static_types.h
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_common.c
branches/ge_harmony/source/blender/nodes/intern/node_exec.c
branches/ge_harmony/source/blender/nodes/shader/node_shader_tree.c
branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_bump.c
branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_common.c
branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_hair_info.c
branches/ge_harmony/source/blender/nodes/texture/node_texture_tree.c
branches/ge_harmony/source/blender/nodes/texture/nodes/node_texture_common.c
branches/ge_harmony/source/blender/python/SConscript
branches/ge_harmony/source/blender/python/bmesh/bmesh_py_api.c
branches/ge_harmony/source/blender/python/bmesh/bmesh_py_ops_call.c
branches/ge_harmony/source/blender/python/bmesh/bmesh_py_types.c
branches/ge_harmony/source/blender/python/bmesh/bmesh_py_types_customdata.c
branches/ge_harmony/source/blender/python/bmesh/bmesh_py_types_select.c
branches/ge_harmony/source/blender/python/bmesh/bmesh_py_utils.c
branches/ge_harmony/source/blender/python/intern/bpy_app_build_options.c
branches/ge_harmony/source/blender/python/intern/bpy_interface.c
branches/ge_harmony/source/blender/python/intern/bpy_operator.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/bpy_rna_anim.c
branches/ge_harmony/source/blender/python/mathutils/mathutils.c
branches/ge_harmony/source/blender/python/mathutils/mathutils_geometry.c
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_import.c
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/envmap.h
branches/ge_harmony/source/blender/render/intern/include/initrender.h
branches/ge_harmony/source/blender/render/intern/include/render_types.h
branches/ge_harmony/source/blender/render/intern/raytrace/bvh.h
branches/ge_harmony/source/blender/render/intern/raytrace/rayobject_qbvh.cpp
branches/ge_harmony/source/blender/render/intern/raytrace/rayobject_svbvh.cpp
branches/ge_harmony/source/blender/render/intern/raytrace/rayobject_vbvh.cpp
branches/ge_harmony/source/blender/render/intern/raytrace/reorganize.h
branches/ge_harmony/source/blender/render/intern/raytrace/vbvh.h
branches/ge_harmony/source/blender/render/intern/source/bake.c
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/rayshade.c
branches/ge_harmony/source/blender/render/intern/source/render_result.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/shadeoutput.c
branches/ge_harmony/source/blender/render/intern/source/sss.c
branches/ge_harmony/source/blender/render/intern/source/voxeldata.c
branches/ge_harmony/source/blender/windowmanager/WM_api.h
branches/ge_harmony/source/blender/windowmanager/WM_keymap.h
branches/ge_harmony/source/blender/windowmanager/intern/wm.c
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_files.c
branches/ge_harmony/source/blender/windowmanager/intern/wm_init_exit.c
branches/ge_harmony/source/blender/windowmanager/intern/wm_keymap.c
branches/ge_harmony/source/blender/windowmanager/intern/wm_operators.c
branches/ge_harmony/source/blender/windowmanager/intern/wm_window.c
branches/ge_harmony/source/blender/windowmanager/wm_event_system.h
branches/ge_harmony/source/blender/windowmanager/wm_window.h
branches/ge_harmony/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/ge_harmony/source/creator/CMakeLists.txt
branches/ge_harmony/source/creator/blender.map
branches/ge_harmony/source/creator/creator.c
branches/ge_harmony/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/ge_harmony/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
branches/ge_harmony/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
branches/ge_harmony/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
branches/ge_harmony/source/gameengine/BlenderRoutines/KX_BlenderGL.h
branches/ge_harmony/source/gameengine/Converter/BL_ActionActuator.h
branches/ge_harmony/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/ge_harmony/source/gameengine/Converter/BL_ShapeDeformer.cpp
branches/ge_harmony/source/gameengine/Converter/BL_ShapeDeformer.h
branches/ge_harmony/source/gameengine/Expressions/InputParser.cpp
branches/ge_harmony/source/gameengine/Expressions/ListValue.cpp
branches/ge_harmony/source/gameengine/Expressions/PyObjectPlus.cpp
branches/ge_harmony/source/gameengine/Expressions/Value.cpp
branches/ge_harmony/source/gameengine/Expressions/Value.h
branches/ge_harmony/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/ge_harmony/source/gameengine/GamePlayer/ghost/GPG_Canvas.cpp
branches/ge_harmony/source/gameengine/GamePlayer/ghost/GPG_Canvas.h
branches/ge_harmony/source/gameengine/Ketsji/CMakeLists.txt
branches/ge_harmony/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/ge_harmony/source/gameengine/Ketsji/KX_GameObject.cpp
branches/ge_harmony/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/ge_harmony/source/gameengine/Ketsji/KX_KetsjiEngine.h
branches/ge_harmony/source/gameengine/Ketsji/KX_PolyProxy.cpp
branches/ge_harmony/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/ge_harmony/source/gameengine/Ketsji/KX_PythonSeq.cpp
branches/ge_harmony/source/gameengine/Ketsji/KX_VertexProxy.cpp
branches/ge_harmony/source/gameengine/Physics/Bullet/CMakeLists.txt
branches/ge_harmony/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/ge_harmony/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
branches/ge_harmony/source/gameengine/Rasterizer/RAS_FramingManager.cpp
branches/ge_harmony/source/gameengine/Rasterizer/RAS_ICanvas.h
branches/ge_harmony/source/gameengine/Rasterizer/RAS_IRasterizer.h
branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
branches/ge_harmony/source/gameengine/Rasterizer/RAS_Polygon.cpp
branches/ge_harmony/source/gameengine/Rasterizer/RAS_Polygon.h
branches/ge_harmony/source/gameengine/VideoTexture/ImageBuff.cpp
branches/ge_harmony/source/gameengine/VideoTexture/ImageViewport.cpp
branches/ge_harmony/source/gameengine/VideoTexture/Texture.cpp
branches/ge_harmony/source/tools/check_style_c_config.py
branches/ge_harmony/source/tools/tag_release.py
branches/ge_harmony/source/tools/uncrustify.cfg
Added Paths:
-----------
branches/ge_harmony/extern/libmv/libmv/simple_pipeline/reconstruction_scale.cc
branches/ge_harmony/extern/libmv/libmv/simple_pipeline/reconstruction_scale.h
branches/ge_harmony/extern/libmv/third_party/ceres/include/ceres/autodiff_local_parameterization.h
branches/ge_harmony/intern/cycles/kernel/kernel_bvh_traversal.h
branches/ge_harmony/release/scripts/modules/nodeitems_utils.py
branches/ge_harmony/release/scripts/startup/nodeitems_builtins.py
branches/ge_harmony/release/scripts/templates_osl/ramp_closure.osl
branches/ge_harmony/release/scripts/templates_osl/temperature_to_rgb.osl
branches/ge_harmony/release/scripts/templates_osl/toon_closure.osl
branches/ge_harmony/release/scripts/templates_osl/wavelength_to_rgb.osl
branches/ge_harmony/source/blender/blenkernel/BKE_editmesh.h
branches/ge_harmony/source/blender/blenkernel/BKE_editmesh_bvh.h
branches/ge_harmony/source/blender/blenkernel/intern/editmesh.c
branches/ge_harmony/source/blender/blenkernel/intern/editmesh_bvh.c
branches/ge_harmony/source/blender/blenlib/BLI_math_color_blend.h
branches/ge_harmony/source/blender/blenlib/intern/math_color_blend_inline.c
Removed Paths:
-------------
branches/ge_harmony/intern/cycles/render/film_response.cpp
branches/ge_harmony/intern/cycles/render/film_response.h
branches/ge_harmony/release/darwin/set_simulation_threads.app/
branches/ge_harmony/source/blender/blenkernel/BKE_tessmesh.h
branches/ge_harmony/source/blender/editors/mesh/editmesh_bvh.c
branches/ge_harmony/source/blender/editors/mesh/editmesh_bvh.h
branches/ge_harmony/source/blender/editors/space_node/node_header.c
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: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-55932
+ /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-56638
Modified: branches/ge_harmony/CMakeLists.txt
===================================================================
--- branches/ge_harmony/CMakeLists.txt 2013-05-11 03:20:19 UTC (rev 56680)
+++ branches/ge_harmony/CMakeLists.txt 2013-05-11 05:32:40 UTC (rev 56681)
@@ -270,6 +270,8 @@
# LLVM
option(WITH_LLVM "Use LLVM" OFF)
+option(LLVM_STATIC "Link with LLVM static libraries" ON)
+mark_as_advanced(LLVM_STATIC)
# disable for now, but plan to support on all platforms eventually
option(WITH_MEM_JEMALLOC "Enable malloc replacement (http://www.canonware.com/jemalloc)" OFF)
@@ -279,6 +281,9 @@
option(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation tracking (only enable for development)" OFF)
mark_as_advanced(WITH_CXX_GUARDEDALLOC)
+option(WITH_GUARDEDALLOC "Enable GuardedAlloc (DISABLE AT OWN RISK!)" ON)
+mark_as_advanced(WITH_GUARDEDALLOC)
+
option(WITH_ASSERT_ABORT "Call abort() when raising an assertion through BLI_assert()" OFF)
mark_as_advanced(WITH_ASSERT_ABORT)
@@ -415,13 +420,21 @@
# otherwise if the user disabled
if(NOT WITH_BOOST)
# Explicitly disabled. so disable all deps.
- set(WITH_CYCLES OFF)
- set(WITH_MOD_BOOLEAN OFF)
- set(WITH_AUDASPACE OFF)
- set(WITH_INTERNATIONAL OFF)
+ macro(set_and_warn
+ _setting _val)
+ if(${${_setting}})
+ message(STATUS "'WITH_BOOST' is disabled: forceing 'set(${_setting} ${_val})'")
+ endif()
+ set(${_setting} ${_val})
+ endmacro()
- set(WITH_OPENAL OFF) # depends on AUDASPACE
- set(WITH_GAMEENGINE OFF) # depends on AUDASPACE
+ set_and_warn(WITH_CYCLES OFF)
+ set_and_warn(WITH_MOD_BOOLEAN OFF)
+ set_and_warn(WITH_AUDASPACE OFF)
+ set_and_warn(WITH_INTERNATIONAL OFF)
+
+ set_and_warn(WITH_OPENAL OFF) # depends on AUDASPACE
+ set_and_warn(WITH_GAMEENGINE OFF) # depends on AUDASPACE
elseif(WITH_CYCLES OR WITH_MOD_BOOLEAN OR WITH_AUDASPACE OR WITH_INTERNATIONAL)
# Keep enabled
else()
@@ -755,7 +768,7 @@
if(NOT LLVM_VERSION)
set(LLVM_VERSION "3.0")
endif()
- set(LLVM_STATIC YES)
+
if(LLVM_DIRECTORY)
FIND_PROGRAM(LLVM_CONFIG llvm-config-${LLVM_VERSION} HINTS ${LLVM_DIRECTORY}/bin NO_CMAKE_PATH)
if(NOT LLVM_CONFIG)
@@ -776,9 +789,17 @@
execute_process(COMMAND ${LLVM_CONFIG} --libdir
OUTPUT_VARIABLE LLVM_LIB_DIR
OUTPUT_STRIP_TRAILING_WHITESPACE)
- find_library(LLVM_LIBRARY
- NAMES LLVMAnalysis # first of a whole bunch of libs to get
- PATHS ${LLVM_LIB_DIR})
+
+ if(LLVM_STATIC)
+ find_library(LLVM_LIBRARY
+ NAMES LLVMAnalysis # first of a whole bunch of libs to get
+ PATHS ${LLVM_LIB_DIR})
+ else()
+ find_library(LLVM_LIBRARY
+ NAMES LLVM-${LLVM_VERSION}
+ PATHS ${LLVM_LIB_DIR})
+ endif()
+
message(STATUS "LLVM version = ${LLVM_VERSION}")
message(STATUS "LLVM dir = ${LLVM_DIRECTORY}")
message(STATUS "LLVM lib dir = ${LLVM_LIB_DIR}")
@@ -1205,7 +1226,6 @@
if(WITH_LLVM)
set(LLVM_DIRECTORY ${LIBDIR}/llvm CACHE PATH "Path to the LLVM installation")
file(GLOB LLVM_LIBRARY ${LLVM_DIRECTORY}/lib/*.lib)
- set(LLVM_STATIC YES)
endif()
if(WITH_OPENCOLORIO)
@@ -1237,10 +1257,6 @@
set(PLATFORM_CFLAGS "-pipe -funsigned-char -fno-strict-aliasing")
if(WITH_MINGW64)
- #We need to take care though not to have these on debug builds because they may play funky with gdb
- if(CMAKE_BUILD_TYPE MATCHES "Release")
- set(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -mmmx -ftree-vectorize")
- endif()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} -lpthread")
@@ -1414,7 +1430,6 @@
LLVMipo LLVMCore)
#imagehelp is needed by LLVM 3.1 on MinGW, check lib\Support\Windows\Signals.inc
set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} -limagehlp")
- set(LLVM_STATIC YES)
endif()
if(WITH_OPENCOLORIO)
@@ -1674,7 +1689,6 @@
if(WITH_LLVM)
set(LLVM_DIRECTORY ${LIBDIR}/llvm CACHE PATH "Path to the LLVM installation")
set(LLVM_VERSION "3.1" CACHE STRING "Version of LLVM to use")
- set(LLVM_STATIC YES)
if(EXISTS "${LLVM_DIRECTORY}/bin/llvm-config")
set(LLVM_CONFIG "${LLVM_DIRECTORY}/bin/llvm-config")
else()
Modified: branches/ge_harmony/build_files/buildbot/config/user-config-glibc211-i686.py
===================================================================
--- branches/ge_harmony/build_files/buildbot/config/user-config-glibc211-i686.py 2013-05-11 03:20:19 UTC (rev 56680)
+++ branches/ge_harmony/build_files/buildbot/config/user-config-glibc211-i686.py 2013-05-11 05:32:40 UTC (rev 56681)
@@ -7,6 +7,7 @@
BF_PYTHON_VERSION = '3.3'
BF_PYTHON_ABI_FLAGS = 'm'
BF_PYTHON = '/opt/lib/python-3.3'
+WITH_BF_PYTHON_INSTALL_NUMPY = True
WITH_BF_STATICPYTHON = True
Modified: branches/ge_harmony/build_files/buildbot/config/user-config-glibc211-x86_64.py
===================================================================
--- branches/ge_harmony/build_files/buildbot/config/user-config-glibc211-x86_64.py 2013-05-11 03:20:19 UTC (rev 56680)
+++ branches/ge_harmony/build_files/buildbot/config/user-config-glibc211-x86_64.py 2013-05-11 05:32:40 UTC (rev 56681)
@@ -7,6 +7,7 @@
BF_PYTHON_VERSION = '3.3'
BF_PYTHON_ABI_FLAGS = 'm'
BF_PYTHON = '/opt/lib/python-3.3'
+WITH_BF_PYTHON_INSTALL_NUMPY = True
WITH_BF_STATICPYTHON = True
Modified: branches/ge_harmony/build_files/buildbot/config/user-config-mac-i386.py
===================================================================
--- branches/ge_harmony/build_files/buildbot/config/user-config-mac-i386.py 2013-05-11 03:20:19 UTC (rev 56680)
+++ branches/ge_harmony/build_files/buildbot/config/user-config-mac-i386.py 2013-05-11 05:32:40 UTC (rev 56681)
@@ -317,6 +317,9 @@
BF_CYCLES_CUDA_NVCC = '/usr/local/cuda/bin/nvcc'
BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30']
+#Freestyle
+WITH_BF_FREESTYLE = True
+
#Ray trace optimization
if MACOSX_ARCHITECTURE == 'x86_64' or MACOSX_ARCHITECTURE == 'i386':
WITH_BF_RAYOPTIMIZATION = True
Modified: branches/ge_harmony/build_files/buildbot/config/user-config-mac-x86_64.py
===================================================================
--- branches/ge_harmony/build_files/buildbot/config/user-config-mac-x86_64.py 2013-05-11 03:20:19 UTC (rev 56680)
+++ branches/ge_harmony/build_files/buildbot/config/user-config-mac-x86_64.py 2013-05-11 05:32:40 UTC (rev 56681)
@@ -317,6 +317,9 @@
BF_CYCLES_CUDA_NVCC = '/usr/local/cuda/bin/nvcc'
BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30']
+#Freestyle
+WITH_BF_FREESTYLE = True
+
#Ray trace optimization
if MACOSX_ARCHITECTURE == 'x86_64' or MACOSX_ARCHITECTURE == 'i386':
WITH_BF_RAYOPTIMIZATION = True
Modified: branches/ge_harmony/build_files/buildbot/config/user-config-player-glibc211-i686.py
===================================================================
--- branches/ge_harmony/build_files/buildbot/config/user-config-player-glibc211-i686.py 2013-05-11 03:20:19 UTC (rev 56680)
+++ branches/ge_harmony/build_files/buildbot/config/user-config-player-glibc211-i686.py 2013-05-11 05:32:40 UTC (rev 56681)
@@ -6,6 +6,7 @@
BF_PYTHON_VERSION = '3.3'
BF_PYTHON_ABI_FLAGS = 'm'
BF_PYTHON = '/opt/lib/python-3.3'
+WITH_BF_PYTHON_INSTALL_NUMPY = True
WITH_BF_STATICPYTHON = True
Modified: branches/ge_harmony/build_files/buildbot/config/user-config-player-glibc211-x86_64.py
===================================================================
--- branches/ge_harmony/build_files/buildbot/config/user-config-player-glibc211-x86_64.py 2013-05-11 03:20:19 UTC (rev 56680)
+++ branches/ge_harmony/build_files/buildbot/config/user-config-player-glibc211-x86_64.py 2013-05-11 05:32:40 UTC (rev 56681)
@@ -6,6 +6,7 @@
BF_PYTHON_VERSION = '3.3'
BF_PYTHON_ABI_FLAGS = 'm'
BF_PYTHON = '/opt/lib/python-3.3'
+WITH_BF_PYTHON_INSTALL_NUMPY = True
WITH_BF_STATICPYTHON = True
Modified: branches/ge_harmony/build_files/cmake/clang_array_check.py
===================================================================
--- branches/ge_harmony/build_files/cmake/clang_array_check.py 2013-05-11 03:20:19 UTC (rev 56680)
+++ branches/ge_harmony/build_files/cmake/clang_array_check.py 2013-05-11 05:32:40 UTC (rev 56681)
@@ -21,6 +21,7 @@
# delay parsing functions until we need them
USE_LAZY_INIT = True
+USE_EXACT_COMPARE = False
# -----------------------------------------------------------------------------
# predefined function/arg sizes, handy sometimes, but not complete...
@@ -307,15 +308,25 @@
# testing
# size_def = 100
- if size < size_def and size != 1:
- location = node.location
- print("%s:%d:%d: argument %d is size %d, should be %d" %
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list