[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60699] branches/ soc-2013-meshdata_transfer: merge from svn -r60105:60698
Walid Shouman
eng.walidshouman at gmail.com
Sat Oct 12 11:41:47 CEST 2013
Revision: 60699
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60699
Author: walid
Date: 2013-10-12 09:41:46 +0000 (Sat, 12 Oct 2013)
Log Message:
-----------
merge from svn -r60105:60698
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60105
Modified Paths:
--------------
branches/soc-2013-meshdata_transfer/CMakeLists.txt
branches/soc-2013-meshdata_transfer/GNUmakefile
branches/soc-2013-meshdata_transfer/SConstruct
branches/soc-2013-meshdata_transfer/build_files/build_environment/install_deps.sh
branches/soc-2013-meshdata_transfer/build_files/cmake/macros.cmake
branches/soc-2013-meshdata_transfer/build_files/scons/config/darwin-config.py
branches/soc-2013-meshdata_transfer/build_files/scons/tools/Blender.py
branches/soc-2013-meshdata_transfer/build_files/scons/tools/btools.py
branches/soc-2013-meshdata_transfer/doc/python_api/examples/bpy.props.5.py
branches/soc-2013-meshdata_transfer/doc/python_api/examples/bpy.types.UIList.1.py
branches/soc-2013-meshdata_transfer/doc/python_api/examples/bpy.types.UIList.2.py
branches/soc-2013-meshdata_transfer/doc/python_api/rst/bge.logic.rst
branches/soc-2013-meshdata_transfer/doc/python_api/rst/bge_types/bge.types.KX_GameObject.rst
branches/soc-2013-meshdata_transfer/doc/python_api/sphinx_doc_gen.py
branches/soc-2013-meshdata_transfer/extern/libmv/CMakeLists.txt
branches/soc-2013-meshdata_transfer/extern/libmv/SConscript
branches/soc-2013-meshdata_transfer/extern/libmv/bundle.sh
branches/soc-2013-meshdata_transfer/extern/libmv/libmv/multiview/fundamental.cc
branches/soc-2013-meshdata_transfer/extern/libmv/libmv/multiview/fundamental.h
branches/soc-2013-meshdata_transfer/extern/libmv/libmv/multiview/homography.cc
branches/soc-2013-meshdata_transfer/extern/libmv/libmv/multiview/homography.h
branches/soc-2013-meshdata_transfer/extern/libmv/libmv/simple_pipeline/keyframe_selection.cc
branches/soc-2013-meshdata_transfer/extern/libmv/libmv/simple_pipeline/pipeline.cc
branches/soc-2013-meshdata_transfer/extern/libmv/libmv-capi.cc
branches/soc-2013-meshdata_transfer/extern/libmv/libmv-capi.h
branches/soc-2013-meshdata_transfer/extern/libmv/libmv-capi_stub.cc
branches/soc-2013-meshdata_transfer/extern/libmv/third_party/msinttypes/stdint.h
branches/soc-2013-meshdata_transfer/intern/cycles/blender/CMakeLists.txt
branches/soc-2013-meshdata_transfer/intern/cycles/blender/addon/ui.py
branches/soc-2013-meshdata_transfer/intern/cycles/blender/blender_curves.cpp
branches/soc-2013-meshdata_transfer/intern/cycles/blender/blender_mesh.cpp
branches/soc-2013-meshdata_transfer/intern/cycles/blender/blender_session.cpp
branches/soc-2013-meshdata_transfer/intern/cycles/blender/blender_shader.cpp
branches/soc-2013-meshdata_transfer/intern/cycles/blender/blender_sync.cpp
branches/soc-2013-meshdata_transfer/intern/cycles/bvh/bvh_build.cpp
branches/soc-2013-meshdata_transfer/intern/cycles/device/device_cuda.cpp
branches/soc-2013-meshdata_transfer/intern/cycles/device/device_opencl.cpp
branches/soc-2013-meshdata_transfer/intern/cycles/kernel/CMakeLists.txt
branches/soc-2013-meshdata_transfer/intern/cycles/kernel/SConscript
branches/soc-2013-meshdata_transfer/intern/cycles/kernel/closure/bsdf.h
branches/soc-2013-meshdata_transfer/intern/cycles/kernel/kernel_accumulate.h
branches/soc-2013-meshdata_transfer/intern/cycles/kernel/kernel_bvh.h
branches/soc-2013-meshdata_transfer/intern/cycles/kernel/kernel_compat_cuda.h
branches/soc-2013-meshdata_transfer/intern/cycles/kernel/kernel_film.h
branches/soc-2013-meshdata_transfer/intern/cycles/kernel/kernel_globals.h
branches/soc-2013-meshdata_transfer/intern/cycles/kernel/kernel_passes.h
branches/soc-2013-meshdata_transfer/intern/cycles/kernel/kernel_path.h
branches/soc-2013-meshdata_transfer/intern/cycles/kernel/kernel_primitive.h
branches/soc-2013-meshdata_transfer/intern/cycles/kernel/kernel_shader.h
branches/soc-2013-meshdata_transfer/intern/cycles/kernel/kernel_sse2.cpp
branches/soc-2013-meshdata_transfer/intern/cycles/kernel/kernel_sse3.cpp
branches/soc-2013-meshdata_transfer/intern/cycles/kernel/kernel_subsurface.h
branches/soc-2013-meshdata_transfer/intern/cycles/kernel/kernel_types.h
branches/soc-2013-meshdata_transfer/intern/cycles/kernel/osl/osl_closures.cpp
branches/soc-2013-meshdata_transfer/intern/cycles/kernel/osl/osl_shader.cpp
branches/soc-2013-meshdata_transfer/intern/cycles/kernel/shaders/CMakeLists.txt
branches/soc-2013-meshdata_transfer/intern/cycles/kernel/shaders/SConscript
branches/soc-2013-meshdata_transfer/intern/cycles/kernel/shaders/node_environment_texture.osl
branches/soc-2013-meshdata_transfer/intern/cycles/kernel/shaders/node_sky_texture.osl
branches/soc-2013-meshdata_transfer/intern/cycles/kernel/shaders/node_subsurface_scattering.osl
branches/soc-2013-meshdata_transfer/intern/cycles/kernel/shaders/node_ward_bsdf.osl
branches/soc-2013-meshdata_transfer/intern/cycles/kernel/shaders/stdosl.h
branches/soc-2013-meshdata_transfer/intern/cycles/kernel/svm/svm_closure.h
branches/soc-2013-meshdata_transfer/intern/cycles/kernel/svm/svm_types.h
branches/soc-2013-meshdata_transfer/intern/cycles/render/CMakeLists.txt
branches/soc-2013-meshdata_transfer/intern/cycles/render/attribute.cpp
branches/soc-2013-meshdata_transfer/intern/cycles/render/film.cpp
branches/soc-2013-meshdata_transfer/intern/cycles/render/nodes.cpp
branches/soc-2013-meshdata_transfer/intern/cycles/render/nodes.h
branches/soc-2013-meshdata_transfer/intern/cycles/render/shader.cpp
branches/soc-2013-meshdata_transfer/intern/cycles/render/shader.h
branches/soc-2013-meshdata_transfer/intern/cycles/util/util_opengl.h
branches/soc-2013-meshdata_transfer/intern/cycles/util/util_types.h
branches/soc-2013-meshdata_transfer/intern/elbeem/CMakeLists.txt
branches/soc-2013-meshdata_transfer/intern/elbeem/SConscript
branches/soc-2013-meshdata_transfer/intern/elbeem/intern/attributes.h
branches/soc-2013-meshdata_transfer/intern/elbeem/intern/controlparticles.h
branches/soc-2013-meshdata_transfer/intern/elbeem/intern/isosurface.h
branches/soc-2013-meshdata_transfer/intern/elbeem/intern/mvmcoords.h
branches/soc-2013-meshdata_transfer/intern/elbeem/intern/ntl_blenderdumper.h
branches/soc-2013-meshdata_transfer/intern/elbeem/intern/ntl_bsptree.h
branches/soc-2013-meshdata_transfer/intern/elbeem/intern/ntl_geometryclass.h
branches/soc-2013-meshdata_transfer/intern/elbeem/intern/ntl_geometrymodel.h
branches/soc-2013-meshdata_transfer/intern/elbeem/intern/ntl_geometryobject.h
branches/soc-2013-meshdata_transfer/intern/elbeem/intern/ntl_geometryshader.h
branches/soc-2013-meshdata_transfer/intern/elbeem/intern/ntl_lighting.h
branches/soc-2013-meshdata_transfer/intern/elbeem/intern/ntl_matrices.h
branches/soc-2013-meshdata_transfer/intern/elbeem/intern/ntl_ray.h
branches/soc-2013-meshdata_transfer/intern/elbeem/intern/ntl_vector3dim.h
branches/soc-2013-meshdata_transfer/intern/elbeem/intern/ntl_world.h
branches/soc-2013-meshdata_transfer/intern/elbeem/intern/parametrizer.h
branches/soc-2013-meshdata_transfer/intern/elbeem/intern/particletracer.cpp
branches/soc-2013-meshdata_transfer/intern/elbeem/intern/particletracer.h
branches/soc-2013-meshdata_transfer/intern/elbeem/intern/simulation_object.cpp
branches/soc-2013-meshdata_transfer/intern/elbeem/intern/simulation_object.h
branches/soc-2013-meshdata_transfer/intern/elbeem/intern/solver_class.h
branches/soc-2013-meshdata_transfer/intern/elbeem/intern/solver_control.cpp
branches/soc-2013-meshdata_transfer/intern/elbeem/intern/solver_control.h
branches/soc-2013-meshdata_transfer/intern/elbeem/intern/solver_interface.cpp
branches/soc-2013-meshdata_transfer/intern/elbeem/intern/solver_interface.h
branches/soc-2013-meshdata_transfer/intern/elbeem/intern/solver_main.cpp
branches/soc-2013-meshdata_transfer/intern/ghost/CMakeLists.txt
branches/soc-2013-meshdata_transfer/intern/ghost/SConscript
branches/soc-2013-meshdata_transfer/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm
branches/soc-2013-meshdata_transfer/intern/ghost/intern/GHOST_NDOFManager.h
branches/soc-2013-meshdata_transfer/intern/ghost/intern/GHOST_NDOFManagerCocoa.h
branches/soc-2013-meshdata_transfer/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm
branches/soc-2013-meshdata_transfer/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2013-meshdata_transfer/intern/ghost/intern/GHOST_SystemPathsX11.cpp
branches/soc-2013-meshdata_transfer/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/soc-2013-meshdata_transfer/intern/ghost/intern/GHOST_SystemX11.cpp
branches/soc-2013-meshdata_transfer/intern/ghost/intern/GHOST_WindowCocoa.h
branches/soc-2013-meshdata_transfer/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/soc-2013-meshdata_transfer/intern/ghost/intern/GHOST_WindowX11.cpp
branches/soc-2013-meshdata_transfer/intern/guardedalloc/CMakeLists.txt
branches/soc-2013-meshdata_transfer/intern/guardedalloc/MEM_guardedalloc.h
branches/soc-2013-meshdata_transfer/intern/guardedalloc/SConscript
branches/soc-2013-meshdata_transfer/intern/guardedalloc/intern/mallocn.c
branches/soc-2013-meshdata_transfer/intern/guardedalloc/mmap_win.h
branches/soc-2013-meshdata_transfer/intern/locale/boost_locale_wrapper.cpp
branches/soc-2013-meshdata_transfer/intern/opencolorio/CMakeLists.txt
branches/soc-2013-meshdata_transfer/intern/opencolorio/SConscript
branches/soc-2013-meshdata_transfer/intern/opencolorio/fallback_impl.cc
branches/soc-2013-meshdata_transfer/intern/opencolorio/ocio_capi.cc
branches/soc-2013-meshdata_transfer/intern/opencolorio/ocio_capi.h
branches/soc-2013-meshdata_transfer/intern/opencolorio/ocio_impl.cc
branches/soc-2013-meshdata_transfer/intern/opencolorio/ocio_impl.h
branches/soc-2013-meshdata_transfer/intern/opencolorio/ocio_impl_glsl.cc
branches/soc-2013-meshdata_transfer/intern/utfconv/utf_winfunc.c
branches/soc-2013-meshdata_transfer/release/datafiles/preview_cycles.blend
branches/soc-2013-meshdata_transfer/release/datafiles/splash.png
branches/soc-2013-meshdata_transfer/release/datafiles/startup.blend
branches/soc-2013-meshdata_transfer/release/scripts/freestyle/style_modules/ChainingIterators.py
branches/soc-2013-meshdata_transfer/release/scripts/freestyle/style_modules/PredicatesB1D.py
branches/soc-2013-meshdata_transfer/release/scripts/freestyle/style_modules/PredicatesU1D.py
branches/soc-2013-meshdata_transfer/release/scripts/freestyle/style_modules/parameter_editor.py
branches/soc-2013-meshdata_transfer/release/scripts/freestyle/style_modules/shaders.py
branches/soc-2013-meshdata_transfer/release/scripts/modules/bpy/path.py
branches/soc-2013-meshdata_transfer/release/scripts/modules/bpy_extras/mesh_utils.py
branches/soc-2013-meshdata_transfer/release/scripts/modules/bpy_types.py
branches/soc-2013-meshdata_transfer/release/scripts/modules/rna_info.py
branches/soc-2013-meshdata_transfer/release/scripts/modules/rna_keymap_ui.py
branches/soc-2013-meshdata_transfer/release/scripts/presets/keyconfig/maya.py
branches/soc-2013-meshdata_transfer/release/scripts/startup/bl_operators/node.py
branches/soc-2013-meshdata_transfer/release/scripts/startup/bl_operators/uvcalc_lightmap.py
branches/soc-2013-meshdata_transfer/release/scripts/startup/bl_operators/wm.py
branches/soc-2013-meshdata_transfer/release/scripts/startup/bl_ui/__init__.py
branches/soc-2013-meshdata_transfer/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2013-meshdata_transfer/release/scripts/startup/bl_ui/properties_freestyle.py
branches/soc-2013-meshdata_transfer/release/scripts/startup/bl_ui/properties_game.py
branches/soc-2013-meshdata_transfer/release/scripts/startup/bl_ui/properties_material.py
branches/soc-2013-meshdata_transfer/release/scripts/startup/bl_ui/properties_paint_common.py
branches/soc-2013-meshdata_transfer/release/scripts/startup/bl_ui/properties_physics_common.py
branches/soc-2013-meshdata_transfer/release/scripts/startup/bl_ui/properties_render.py
branches/soc-2013-meshdata_transfer/release/scripts/startup/bl_ui/properties_texture.py
branches/soc-2013-meshdata_transfer/release/scripts/startup/bl_ui/space_image.py
branches/soc-2013-meshdata_transfer/release/scripts/startup/bl_ui/space_info.py
branches/soc-2013-meshdata_transfer/release/scripts/startup/bl_ui/space_node.py
branches/soc-2013-meshdata_transfer/release/scripts/startup/bl_ui/space_sequencer.py
branches/soc-2013-meshdata_transfer/release/scripts/startup/bl_ui/space_text.py
branches/soc-2013-meshdata_transfer/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2013-meshdata_transfer/release/scripts/startup/nodeitems_builtins.py
branches/soc-2013-meshdata_transfer/release/scripts/templates_py/custom_nodes.py
branches/soc-2013-meshdata_transfer/release/scripts/templates_py/ui_list.py
branches/soc-2013-meshdata_transfer/release/text/readme.html
branches/soc-2013-meshdata_transfer/source/blender/CMakeLists.txt
branches/soc-2013-meshdata_transfer/source/blender/SConscript
branches/soc-2013-meshdata_transfer/source/blender/blenkernel/BKE_action.h
branches/soc-2013-meshdata_transfer/source/blender/blenkernel/BKE_animsys.h
branches/soc-2013-meshdata_transfer/source/blender/blenkernel/BKE_blender.h
branches/soc-2013-meshdata_transfer/source/blender/blenkernel/BKE_curve.h
branches/soc-2013-meshdata_transfer/source/blender/blenkernel/BKE_customdata.h
branches/soc-2013-meshdata_transfer/source/blender/blenkernel/BKE_deform.h
branches/soc-2013-meshdata_transfer/source/blender/blenkernel/BKE_fcurve.h
branches/soc-2013-meshdata_transfer/source/blender/blenkernel/BKE_mesh.h
branches/soc-2013-meshdata_transfer/source/blender/blenkernel/BKE_modifier.h
branches/soc-2013-meshdata_transfer/source/blender/blenkernel/BKE_node.h
branches/soc-2013-meshdata_transfer/source/blender/blenkernel/BKE_ocean.h
branches/soc-2013-meshdata_transfer/source/blender/blenkernel/BKE_paint.h
branches/soc-2013-meshdata_transfer/source/blender/blenkernel/BKE_subsurf.h
branches/soc-2013-meshdata_transfer/source/blender/blenkernel/BKE_texture.h
branches/soc-2013-meshdata_transfer/source/blender/blenkernel/BKE_tracking.h
branches/soc-2013-meshdata_transfer/source/blender/blenkernel/SConscript
branches/soc-2013-meshdata_transfer/source/blender/blenkernel/intern/CCGSubSurf.c
branches/soc-2013-meshdata_transfer/source/blender/blenkernel/intern/CCGSubSurf.h
branches/soc-2013-meshdata_transfer/source/blender/blenkernel/intern/action.c
branches/soc-2013-meshdata_transfer/source/blender/blenkernel/intern/anim.c
branches/soc-2013-meshdata_transfer/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2013-meshdata_transfer/source/blender/blenkernel/intern/boids.c
branches/soc-2013-meshdata_transfer/source/blender/blenkernel/intern/bpath.c
branches/soc-2013-meshdata_transfer/source/blender/blenkernel/intern/bvhutils.c
branches/soc-2013-meshdata_transfer/source/blender/blenkernel/intern/colortools.c
branches/soc-2013-meshdata_transfer/source/blender/blenkernel/intern/curve.c
branches/soc-2013-meshdata_transfer/source/blender/blenkernel/intern/customdata.c
branches/soc-2013-meshdata_transfer/source/blender/blenkernel/intern/deform.c
branches/soc-2013-meshdata_transfer/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2013-meshdata_transfer/source/blender/blenkernel/intern/dynamicpaint.c
branches/soc-2013-meshdata_transfer/source/blender/blenkernel/intern/fcurve.c
branches/soc-2013-meshdata_transfer/source/blender/blenkernel/intern/freestyle.c
branches/soc-2013-meshdata_transfer/source/blender/blenkernel/intern/gpencil.c
branches/soc-2013-meshdata_transfer/source/blender/blenkernel/intern/idprop.c
branches/soc-2013-meshdata_transfer/source/blender/blenkernel/intern/image.c
branches/soc-2013-meshdata_transfer/source/blender/blenkernel/intern/library.c
branches/soc-2013-meshdata_transfer/source/blender/blenkernel/intern/mask_rasterize.c
branches/soc-2013-meshdata_transfer/source/blender/blenkernel/intern/mesh.c
branches/soc-2013-meshdata_transfer/source/blender/blenkernel/intern/mesh_evaluate.c
branches/soc-2013-meshdata_transfer/source/blender/blenkernel/intern/mesh_validate.c
branches/soc-2013-meshdata_transfer/source/blender/blenkernel/intern/modifier.c
branches/soc-2013-meshdata_transfer/source/blender/blenkernel/intern/modifiers_bmesh.c
branches/soc-2013-meshdata_transfer/source/blender/blenkernel/intern/movieclip.c
branches/soc-2013-meshdata_transfer/source/blender/blenkernel/intern/multires.c
branches/soc-2013-meshdata_transfer/source/blender/blenkernel/intern/node.c
branches/soc-2013-meshdata_transfer/source/blender/blenkernel/intern/object.c
branches/soc-2013-meshdata_transfer/source/blender/blenkernel/intern/packedFile.c
branches/soc-2013-meshdata_transfer/source/blender/blenkernel/intern/paint.c
branches/soc-2013-meshdata_transfer/source/blender/blenkernel/intern/particle.c
branches/soc-2013-meshdata_transfer/source/blender/blenkernel/intern/particle_system.c
branches/soc-2013-meshdata_transfer/source/blender/blenkernel/intern/pbvh_bmesh.c
branches/soc-2013-meshdata_transfer/source/blender/blenkernel/intern/pbvh_intern.h
branches/soc-2013-meshdata_transfer/source/blender/blenkernel/intern/rigidbody.c
branches/soc-2013-meshdata_transfer/source/blender/blenkernel/intern/scene.c
branches/soc-2013-meshdata_transfer/source/blender/blenkernel/intern/screen.c
branches/soc-2013-meshdata_transfer/source/blender/blenkernel/intern/sequencer.c
branches/soc-2013-meshdata_transfer/source/blender/blenkernel/intern/shrinkwrap.c
branches/soc-2013-meshdata_transfer/source/blender/blenkernel/intern/smoke.c
branches/soc-2013-meshdata_transfer/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2013-meshdata_transfer/source/blender/blenkernel/intern/texture.c
branches/soc-2013-meshdata_transfer/source/blender/blenkernel/intern/tracking.c
branches/soc-2013-meshdata_transfer/source/blender/blenlib/BLI_alloca.h
branches/soc-2013-meshdata_transfer/source/blender/blenlib/BLI_bitmap.h
branches/soc-2013-meshdata_transfer/source/blender/blenlib/BLI_boxpack2d.h
branches/soc-2013-meshdata_transfer/source/blender/blenlib/BLI_convexhull2d.h
branches/soc-2013-meshdata_transfer/source/blender/blenlib/BLI_linklist_stack.h
branches/soc-2013-meshdata_transfer/source/blender/blenlib/BLI_math_geom.h
branches/soc-2013-meshdata_transfer/source/blender/blenlib/BLI_math_interp.h
branches/soc-2013-meshdata_transfer/source/blender/blenlib/BLI_memarena.h
branches/soc-2013-meshdata_transfer/source/blender/blenlib/BLI_mempool.h
branches/soc-2013-meshdata_transfer/source/blender/blenlib/BLI_scanfill.h
branches/soc-2013-meshdata_transfer/source/blender/blenlib/CMakeLists.txt
branches/soc-2013-meshdata_transfer/source/blender/blenlib/PIL_time_utildefines.h
branches/soc-2013-meshdata_transfer/source/blender/blenlib/intern/BLI_heap.c
branches/soc-2013-meshdata_transfer/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/soc-2013-meshdata_transfer/source/blender/blenlib/intern/BLI_memarena.c
branches/soc-2013-meshdata_transfer/source/blender/blenlib/intern/BLI_mempool.c
branches/soc-2013-meshdata_transfer/source/blender/blenlib/intern/boxpack2d.c
branches/soc-2013-meshdata_transfer/source/blender/blenlib/intern/lasso.c
branches/soc-2013-meshdata_transfer/source/blender/blenlib/intern/math_geom.c
branches/soc-2013-meshdata_transfer/source/blender/blenlib/intern/math_rotation.c
branches/soc-2013-meshdata_transfer/source/blender/blenlib/intern/noise.c
branches/soc-2013-meshdata_transfer/source/blender/blenlib/intern/path_util.c
branches/soc-2013-meshdata_transfer/source/blender/blenlib/intern/smallhash.c
branches/soc-2013-meshdata_transfer/source/blender/blenloader/intern/readfile.c
branches/soc-2013-meshdata_transfer/source/blender/blenloader/intern/versioning_defaults.c
branches/soc-2013-meshdata_transfer/source/blender/blenloader/intern/versioning_legacy.c
branches/soc-2013-meshdata_transfer/source/blender/blenloader/intern/writefile.c
branches/soc-2013-meshdata_transfer/source/blender/bmesh/intern/bmesh_construct.c
branches/soc-2013-meshdata_transfer/source/blender/bmesh/intern/bmesh_core.c
branches/soc-2013-meshdata_transfer/source/blender/bmesh/intern/bmesh_core.h
branches/soc-2013-meshdata_transfer/source/blender/bmesh/intern/bmesh_iterators.c
branches/soc-2013-meshdata_transfer/source/blender/bmesh/intern/bmesh_iterators.h
branches/soc-2013-meshdata_transfer/source/blender/bmesh/intern/bmesh_mesh.h
branches/soc-2013-meshdata_transfer/source/blender/bmesh/intern/bmesh_opdefines.c
branches/soc-2013-meshdata_transfer/source/blender/bmesh/intern/bmesh_operators.c
branches/soc-2013-meshdata_transfer/source/blender/bmesh/intern/bmesh_polygon.c
branches/soc-2013-meshdata_transfer/source/blender/bmesh/intern/bmesh_polygon.h
branches/soc-2013-meshdata_transfer/source/blender/bmesh/intern/bmesh_walkers_impl.c
branches/soc-2013-meshdata_transfer/source/blender/bmesh/operators/bmo_beautify.c
branches/soc-2013-meshdata_transfer/source/blender/bmesh/operators/bmo_bridge.c
branches/soc-2013-meshdata_transfer/source/blender/bmesh/operators/bmo_connect.c
branches/soc-2013-meshdata_transfer/source/blender/bmesh/operators/bmo_connect_nonplanar.c
branches/soc-2013-meshdata_transfer/source/blender/bmesh/operators/bmo_dissolve.c
branches/soc-2013-meshdata_transfer/source/blender/bmesh/operators/bmo_dupe.c
branches/soc-2013-meshdata_transfer/source/blender/bmesh/operators/bmo_edgenet.c
branches/soc-2013-meshdata_transfer/source/blender/bmesh/operators/bmo_fill_attribute.c
branches/soc-2013-meshdata_transfer/source/blender/bmesh/operators/bmo_fill_holes.c
branches/soc-2013-meshdata_transfer/source/blender/bmesh/operators/bmo_inset.c
branches/soc-2013-meshdata_transfer/source/blender/bmesh/operators/bmo_join_triangles.c
branches/soc-2013-meshdata_transfer/source/blender/bmesh/operators/bmo_primitive.c
branches/soc-2013-meshdata_transfer/source/blender/bmesh/operators/bmo_removedoubles.c
branches/soc-2013-meshdata_transfer/source/blender/bmesh/operators/bmo_symmetrize.c
branches/soc-2013-meshdata_transfer/source/blender/bmesh/operators/bmo_triangulate.c
branches/soc-2013-meshdata_transfer/source/blender/bmesh/operators/bmo_utils.c
branches/soc-2013-meshdata_transfer/source/blender/bmesh/tools/bmesh_bevel.c
branches/soc-2013-meshdata_transfer/source/blender/bmesh/tools/bmesh_bisect_plane.c
branches/soc-2013-meshdata_transfer/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c
branches/soc-2013-meshdata_transfer/source/blender/bmesh/tools/bmesh_triangulate.c
branches/soc-2013-meshdata_transfer/source/blender/bmesh/tools/bmesh_triangulate.h
branches/soc-2013-meshdata_transfer/source/blender/collada/AnimationExporter.cpp
branches/soc-2013-meshdata_transfer/source/blender/collada/ArmatureExporter.cpp
branches/soc-2013-meshdata_transfer/source/blender/collada/ControllerExporter.cpp
branches/soc-2013-meshdata_transfer/source/blender/collada/DocumentImporter.cpp
branches/soc-2013-meshdata_transfer/source/blender/collada/ExportSettings.h
branches/soc-2013-meshdata_transfer/source/blender/collada/MeshImporter.cpp
branches/soc-2013-meshdata_transfer/source/blender/collada/collada.cpp
branches/soc-2013-meshdata_transfer/source/blender/collada/collada.h
branches/soc-2013-meshdata_transfer/source/blender/compositor/CMakeLists.txt
branches/soc-2013-meshdata_transfer/source/blender/compositor/COM_compositor.h
branches/soc-2013-meshdata_transfer/source/blender/compositor/COM_defines.h
branches/soc-2013-meshdata_transfer/source/blender/compositor/intern/COM_ExecutionGroup.cpp
branches/soc-2013-meshdata_transfer/source/blender/compositor/intern/COM_ExecutionGroup.h
branches/soc-2013-meshdata_transfer/source/blender/compositor/intern/COM_ExecutionSystem.cpp
branches/soc-2013-meshdata_transfer/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
branches/soc-2013-meshdata_transfer/source/blender/compositor/intern/COM_ExecutionSystemHelper.h
branches/soc-2013-meshdata_transfer/source/blender/compositor/intern/COM_MemoryBuffer.cpp
branches/soc-2013-meshdata_transfer/source/blender/compositor/intern/COM_NodeBase.h
branches/soc-2013-meshdata_transfer/source/blender/compositor/intern/COM_NodeOperation.h
branches/soc-2013-meshdata_transfer/source/blender/compositor/nodes/COM_ImageNode.cpp
branches/soc-2013-meshdata_transfer/source/blender/compositor/nodes/COM_ImageNode.h
branches/soc-2013-meshdata_transfer/source/blender/compositor/nodes/COM_OutputFileNode.cpp
branches/soc-2013-meshdata_transfer/source/blender/compositor/operations/COM_MultilayerImageOperation.cpp
branches/soc-2013-meshdata_transfer/source/blender/compositor/operations/COM_MultilayerImageOperation.h
branches/soc-2013-meshdata_transfer/source/blender/compositor/operations/COM_OutputFileOperation.cpp
branches/soc-2013-meshdata_transfer/source/blender/compositor/operations/COM_SetColorOperation.h
branches/soc-2013-meshdata_transfer/source/blender/compositor/operations/COM_SetValueOperation.h
branches/soc-2013-meshdata_transfer/source/blender/compositor/operations/COM_SetVectorOperation.h
branches/soc-2013-meshdata_transfer/source/blender/compositor/operations/COM_TrackPositionOperation.h
branches/soc-2013-meshdata_transfer/source/blender/editors/animation/anim_filter.c
branches/soc-2013-meshdata_transfer/source/blender/editors/animation/anim_ipo_utils.c
branches/soc-2013-meshdata_transfer/source/blender/editors/animation/anim_markers.c
branches/soc-2013-meshdata_transfer/source/blender/editors/animation/keyframes_edit.c
branches/soc-2013-meshdata_transfer/source/blender/editors/animation/keyframing.c
branches/soc-2013-meshdata_transfer/source/blender/editors/armature/armature_naming.c
branches/soc-2013-meshdata_transfer/source/blender/editors/armature/pose_lib.c
branches/soc-2013-meshdata_transfer/source/blender/editors/curve/CMakeLists.txt
branches/soc-2013-meshdata_transfer/source/blender/editors/curve/curve_intern.h
branches/soc-2013-meshdata_transfer/source/blender/editors/curve/editcurve.c
branches/soc-2013-meshdata_transfer/source/blender/editors/curve/editfont.c
branches/soc-2013-meshdata_transfer/source/blender/editors/curve/lorem.c
branches/soc-2013-meshdata_transfer/source/blender/editors/include/BIF_glutil.h
branches/soc-2013-meshdata_transfer/source/blender/editors/include/ED_lattice.h
branches/soc-2013-meshdata_transfer/source/blender/editors/include/ED_mball.h
branches/soc-2013-meshdata_transfer/source/blender/editors/include/ED_mesh.h
branches/soc-2013-meshdata_transfer/source/blender/editors/include/ED_object.h
branches/soc-2013-meshdata_transfer/source/blender/editors/include/ED_render.h
branches/soc-2013-meshdata_transfer/source/blender/editors/include/ED_transform.h
branches/soc-2013-meshdata_transfer/source/blender/editors/include/ED_util.h
branches/soc-2013-meshdata_transfer/source/blender/editors/include/ED_view3d.h
branches/soc-2013-meshdata_transfer/source/blender/editors/include/UI_view2d.h
branches/soc-2013-meshdata_transfer/source/blender/editors/interface/CMakeLists.txt
branches/soc-2013-meshdata_transfer/source/blender/editors/interface/interface.c
branches/soc-2013-meshdata_transfer/source/blender/editors/interface/interface_anim.c
branches/soc-2013-meshdata_transfer/source/blender/editors/interface/interface_draw.c
branches/soc-2013-meshdata_transfer/source/blender/editors/interface/interface_handlers.c
branches/soc-2013-meshdata_transfer/source/blender/editors/interface/interface_intern.h
branches/soc-2013-meshdata_transfer/source/blender/editors/interface/interface_layout.c
branches/soc-2013-meshdata_transfer/source/blender/editors/interface/interface_ops.c
branches/soc-2013-meshdata_transfer/source/blender/editors/interface/interface_regions.c
branches/soc-2013-meshdata_transfer/source/blender/editors/interface/interface_templates.c
branches/soc-2013-meshdata_transfer/source/blender/editors/interface/view2d_ops.c
branches/soc-2013-meshdata_transfer/source/blender/editors/io/io_collada.c
branches/soc-2013-meshdata_transfer/source/blender/editors/mesh/editmesh_add.c
branches/soc-2013-meshdata_transfer/source/blender/editors/mesh/editmesh_bevel.c
branches/soc-2013-meshdata_transfer/source/blender/editors/mesh/editmesh_bisect.c
branches/soc-2013-meshdata_transfer/source/blender/editors/mesh/editmesh_extrude.c
branches/soc-2013-meshdata_transfer/source/blender/editors/mesh/editmesh_inset.c
branches/soc-2013-meshdata_transfer/source/blender/editors/mesh/editmesh_knife.c
branches/soc-2013-meshdata_transfer/source/blender/editors/mesh/editmesh_loopcut.c
branches/soc-2013-meshdata_transfer/source/blender/editors/mesh/editmesh_select.c
branches/soc-2013-meshdata_transfer/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2013-meshdata_transfer/source/blender/editors/mesh/editmesh_utils.c
branches/soc-2013-meshdata_transfer/source/blender/editors/mesh/meshtools.c
branches/soc-2013-meshdata_transfer/source/blender/editors/metaball/mball_edit.c
branches/soc-2013-meshdata_transfer/source/blender/editors/object/object_add.c
branches/soc-2013-meshdata_transfer/source/blender/editors/object/object_bake.c
branches/soc-2013-meshdata_transfer/source/blender/editors/object/object_edit.c
branches/soc-2013-meshdata_transfer/source/blender/editors/object/object_group.c
branches/soc-2013-meshdata_transfer/source/blender/editors/object/object_hook.c
branches/soc-2013-meshdata_transfer/source/blender/editors/object/object_transform.c
branches/soc-2013-meshdata_transfer/source/blender/editors/object/object_vgroup.c
branches/soc-2013-meshdata_transfer/source/blender/editors/physics/particle_edit.c
branches/soc-2013-meshdata_transfer/source/blender/editors/render/render_internal.c
branches/soc-2013-meshdata_transfer/source/blender/editors/render/render_opengl.c
branches/soc-2013-meshdata_transfer/source/blender/editors/render/render_shading.c
branches/soc-2013-meshdata_transfer/source/blender/editors/screen/area.c
branches/soc-2013-meshdata_transfer/source/blender/editors/screen/glutil.c
branches/soc-2013-meshdata_transfer/source/blender/editors/screen/screen_edit.c
branches/soc-2013-meshdata_transfer/source/blender/editors/screen/screen_ops.c
branches/soc-2013-meshdata_transfer/source/blender/editors/screen/screendump.c
branches/soc-2013-meshdata_transfer/source/blender/editors/sculpt_paint/paint_cursor.c
branches/soc-2013-meshdata_transfer/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2013-meshdata_transfer/source/blender/editors/sculpt_paint/paint_image_proj.c
branches/soc-2013-meshdata_transfer/source/blender/editors/sculpt_paint/paint_intern.h
branches/soc-2013-meshdata_transfer/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2013-meshdata_transfer/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2013-meshdata_transfer/source/blender/editors/sculpt_paint/paint_undo.c
branches/soc-2013-meshdata_transfer/source/blender/editors/sculpt_paint/paint_utils.c
branches/soc-2013-meshdata_transfer/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2013-meshdata_transfer/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2013-meshdata_transfer/source/blender/editors/sculpt_paint/sculpt_uv.c
branches/soc-2013-meshdata_transfer/source/blender/editors/space_clip/clip_draw.c
branches/soc-2013-meshdata_transfer/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2013-meshdata_transfer/source/blender/editors/space_console/console_ops.c
branches/soc-2013-meshdata_transfer/source/blender/editors/space_console/space_console.c
branches/soc-2013-meshdata_transfer/source/blender/editors/space_file/CMakeLists.txt
branches/soc-2013-meshdata_transfer/source/blender/editors/space_file/SConscript
branches/soc-2013-meshdata_transfer/source/blender/editors/space_file/file_intern.h
branches/soc-2013-meshdata_transfer/source/blender/editors/space_file/file_ops.c
branches/soc-2013-meshdata_transfer/source/blender/editors/space_file/file_panels.c
branches/soc-2013-meshdata_transfer/source/blender/editors/space_file/space_file.c
branches/soc-2013-meshdata_transfer/source/blender/editors/space_graph/graph_draw.c
branches/soc-2013-meshdata_transfer/source/blender/editors/space_graph/graph_edit.c
branches/soc-2013-meshdata_transfer/source/blender/editors/space_image/CMakeLists.txt
branches/soc-2013-meshdata_transfer/source/blender/editors/space_image/SConscript
branches/soc-2013-meshdata_transfer/source/blender/editors/space_image/image_buttons.c
branches/soc-2013-meshdata_transfer/source/blender/editors/space_image/image_draw.c
branches/soc-2013-meshdata_transfer/source/blender/editors/space_image/image_ops.c
branches/soc-2013-meshdata_transfer/source/blender/editors/space_info/info_stats.c
branches/soc-2013-meshdata_transfer/source/blender/editors/space_info/textview.h
branches/soc-2013-meshdata_transfer/source/blender/editors/space_logic/logic_ops.c
branches/soc-2013-meshdata_transfer/source/blender/editors/space_node/drawnode.c
branches/soc-2013-meshdata_transfer/source/blender/editors/space_node/node_draw.c
branches/soc-2013-meshdata_transfer/source/blender/editors/space_node/node_edit.c
branches/soc-2013-meshdata_transfer/source/blender/editors/space_node/node_intern.h
branches/soc-2013-meshdata_transfer/source/blender/editors/space_node/node_select.c
branches/soc-2013-meshdata_transfer/source/blender/editors/space_node/node_templates.c
branches/soc-2013-meshdata_transfer/source/blender/editors/space_node/node_view.c
branches/soc-2013-meshdata_transfer/source/blender/editors/space_outliner/outliner_edit.c
branches/soc-2013-meshdata_transfer/source/blender/editors/space_outliner/outliner_tree.c
branches/soc-2013-meshdata_transfer/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2013-meshdata_transfer/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2013-meshdata_transfer/source/blender/editors/space_sequencer/sequencer_modifier.c
branches/soc-2013-meshdata_transfer/source/blender/editors/space_sequencer/sequencer_select.c
branches/soc-2013-meshdata_transfer/source/blender/editors/space_sequencer/sequencer_view.c
branches/soc-2013-meshdata_transfer/source/blender/editors/space_text/space_text.c
branches/soc-2013-meshdata_transfer/source/blender/editors/space_text/text_autocomplete.c
branches/soc-2013-meshdata_transfer/source/blender/editors/space_text/text_ops.c
branches/soc-2013-meshdata_transfer/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2013-meshdata_transfer/source/blender/editors/space_view3d/drawobject.c
branches/soc-2013-meshdata_transfer/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2013-meshdata_transfer/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2013-meshdata_transfer/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2013-meshdata_transfer/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2013-meshdata_transfer/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2013-meshdata_transfer/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2013-meshdata_transfer/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2013-meshdata_transfer/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2013-meshdata_transfer/source/blender/editors/transform/transform.c
branches/soc-2013-meshdata_transfer/source/blender/editors/transform/transform.h
branches/soc-2013-meshdata_transfer/source/blender/editors/transform/transform_conversions.c
branches/soc-2013-meshdata_transfer/source/blender/editors/transform/transform_generics.c
branches/soc-2013-meshdata_transfer/source/blender/editors/transform/transform_input.c
branches/soc-2013-meshdata_transfer/source/blender/editors/transform/transform_manipulator.c
branches/soc-2013-meshdata_transfer/source/blender/editors/transform/transform_ops.c
branches/soc-2013-meshdata_transfer/source/blender/editors/transform/transform_orientations.c
branches/soc-2013-meshdata_transfer/source/blender/editors/transform/transform_snap.c
branches/soc-2013-meshdata_transfer/source/blender/editors/util/crazyspace.c
branches/soc-2013-meshdata_transfer/source/blender/editors/util/ed_util.c
branches/soc-2013-meshdata_transfer/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/soc-2013-meshdata_transfer/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
branches/soc-2013-meshdata_transfer/source/blender/freestyle/intern/stroke/StrokeRep.cpp
branches/soc-2013-meshdata_transfer/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
branches/soc-2013-meshdata_transfer/source/blender/gpu/intern/gpu_material.c
branches/soc-2013-meshdata_transfer/source/blender/gpu/shaders/gpu_shader_material.glsl
branches/soc-2013-meshdata_transfer/source/blender/imbuf/CMakeLists.txt
branches/soc-2013-meshdata_transfer/source/blender/imbuf/IMB_colormanagement.h
branches/soc-2013-meshdata_transfer/source/blender/imbuf/IMB_imbuf.h
branches/soc-2013-meshdata_transfer/source/blender/imbuf/IMB_imbuf_types.h
branches/soc-2013-meshdata_transfer/source/blender/imbuf/SConscript
branches/soc-2013-meshdata_transfer/source/blender/imbuf/intern/IMB_filetype.h
branches/soc-2013-meshdata_transfer/source/blender/imbuf/intern/colormanagement.c
branches/soc-2013-meshdata_transfer/source/blender/imbuf/intern/filetype.c
branches/soc-2013-meshdata_transfer/source/blender/imbuf/intern/indexer.c
branches/soc-2013-meshdata_transfer/source/blender/imbuf/intern/readimage.c
branches/soc-2013-meshdata_transfer/source/blender/imbuf/intern/tiff.c
branches/soc-2013-meshdata_transfer/source/blender/imbuf/intern/util.c
branches/soc-2013-meshdata_transfer/source/blender/imbuf/intern/writeimage.c
branches/soc-2013-meshdata_transfer/source/blender/makesdna/DNA_mask_types.h
branches/soc-2013-meshdata_transfer/source/blender/makesdna/DNA_mesh_types.h
branches/soc-2013-meshdata_transfer/source/blender/makesdna/DNA_node_types.h
branches/soc-2013-meshdata_transfer/source/blender/makesdna/DNA_object_types.h
branches/soc-2013-meshdata_transfer/source/blender/makesdna/DNA_scene_types.h
branches/soc-2013-meshdata_transfer/source/blender/makesdna/DNA_texture_types.h
branches/soc-2013-meshdata_transfer/source/blender/makesdna/DNA_tracking_types.h
branches/soc-2013-meshdata_transfer/source/blender/makesdna/DNA_windowmanager_types.h
branches/soc-2013-meshdata_transfer/source/blender/makesdna/intern/CMakeLists.txt
branches/soc-2013-meshdata_transfer/source/blender/makesdna/intern/SConscript
branches/soc-2013-meshdata_transfer/source/blender/makesrna/RNA_access.h
branches/soc-2013-meshdata_transfer/source/blender/makesrna/RNA_define.h
branches/soc-2013-meshdata_transfer/source/blender/makesrna/SConscript
branches/soc-2013-meshdata_transfer/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2013-meshdata_transfer/source/blender/makesrna/intern/SConscript
branches/soc-2013-meshdata_transfer/source/blender/makesrna/intern/makesrna.c
branches/soc-2013-meshdata_transfer/source/blender/makesrna/intern/rna_ID.c
branches/soc-2013-meshdata_transfer/source/blender/makesrna/intern/rna_access.c
branches/soc-2013-meshdata_transfer/source/blender/makesrna/intern/rna_action.c
branches/soc-2013-meshdata_transfer/source/blender/makesrna/intern/rna_animation.c
branches/soc-2013-meshdata_transfer/source/blender/makesrna/intern/rna_armature.c
branches/soc-2013-meshdata_transfer/source/blender/makesrna/intern/rna_boid.c
branches/soc-2013-meshdata_transfer/source/blender/makesrna/intern/rna_color.c
branches/soc-2013-meshdata_transfer/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2013-meshdata_transfer/source/blender/makesrna/intern/rna_curve.c
branches/soc-2013-meshdata_transfer/source/blender/makesrna/intern/rna_define.c
branches/soc-2013-meshdata_transfer/source/blender/makesrna/intern/rna_dynamicpaint.c
branches/soc-2013-meshdata_transfer/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2013-meshdata_transfer/source/blender/makesrna/intern/rna_gpencil.c
branches/soc-2013-meshdata_transfer/source/blender/makesrna/intern/rna_internal.h
branches/soc-2013-meshdata_transfer/source/blender/makesrna/intern/rna_key.c
branches/soc-2013-meshdata_transfer/source/blender/makesrna/intern/rna_lamp.c
branches/soc-2013-meshdata_transfer/source/blender/makesrna/intern/rna_linestyle.c
branches/soc-2013-meshdata_transfer/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2013-meshdata_transfer/source/blender/makesrna/intern/rna_material.c
branches/soc-2013-meshdata_transfer/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2013-meshdata_transfer/source/blender/makesrna/intern/rna_mesh_api.c
branches/soc-2013-meshdata_transfer/source/blender/makesrna/intern/rna_mesh_utils.h
branches/soc-2013-meshdata_transfer/source/blender/makesrna/intern/rna_meta.c
branches/soc-2013-meshdata_transfer/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2013-meshdata_transfer/source/blender/makesrna/intern/rna_nla.c
branches/soc-2013-meshdata_transfer/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2013-meshdata_transfer/source/blender/makesrna/intern/rna_object.c
branches/soc-2013-meshdata_transfer/source/blender/makesrna/intern/rna_object_api.c
branches/soc-2013-meshdata_transfer/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2013-meshdata_transfer/source/blender/makesrna/intern/rna_particle.c
branches/soc-2013-meshdata_transfer/source/blender/makesrna/intern/rna_pose.c
branches/soc-2013-meshdata_transfer/source/blender/makesrna/intern/rna_render.c
branches/soc-2013-meshdata_transfer/source/blender/makesrna/intern/rna_rigidbody.c
branches/soc-2013-meshdata_transfer/source/blender/makesrna/intern/rna_scene.c
branches/soc-2013-meshdata_transfer/source/blender/makesrna/intern/rna_scene_api.c
branches/soc-2013-meshdata_transfer/source/blender/makesrna/intern/rna_screen.c
branches/soc-2013-meshdata_transfer/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/soc-2013-meshdata_transfer/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2013-meshdata_transfer/source/blender/makesrna/intern/rna_smoke.c
branches/soc-2013-meshdata_transfer/source/blender/makesrna/intern/rna_space.c
branches/soc-2013-meshdata_transfer/source/blender/makesrna/intern/rna_test.c
branches/soc-2013-meshdata_transfer/source/blender/makesrna/intern/rna_texture.c
branches/soc-2013-meshdata_transfer/source/blender/makesrna/intern/rna_tracking.c
branches/soc-2013-meshdata_transfer/source/blender/makesrna/intern/rna_ui.c
branches/soc-2013-meshdata_transfer/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2013-meshdata_transfer/source/blender/makesrna/intern/rna_wm.c
branches/soc-2013-meshdata_transfer/source/blender/makesrna/intern/rna_wm_api.c
branches/soc-2013-meshdata_transfer/source/blender/modifiers/intern/MOD_explode.c
branches/soc-2013-meshdata_transfer/source/blender/modifiers/intern/MOD_meshcache_util.h
branches/soc-2013-meshdata_transfer/source/blender/modifiers/intern/MOD_uvproject.c
branches/soc-2013-meshdata_transfer/source/blender/nodes/CMakeLists.txt
branches/soc-2013-meshdata_transfer/source/blender/nodes/NOD_common.h
branches/soc-2013-meshdata_transfer/source/blender/nodes/NOD_shader.h
branches/soc-2013-meshdata_transfer/source/blender/nodes/NOD_static_types.h
branches/soc-2013-meshdata_transfer/source/blender/nodes/composite/nodes/node_composite_mapValue.c
branches/soc-2013-meshdata_transfer/source/blender/nodes/composite/nodes/node_composite_scale.c
branches/soc-2013-meshdata_transfer/source/blender/nodes/shader/node_shader_util.c
branches/soc-2013-meshdata_transfer/source/blender/nodes/shader/nodes/node_shader_gamma.c
branches/soc-2013-meshdata_transfer/source/blender/nodes/shader/nodes/node_shader_mapping.c
branches/soc-2013-meshdata_transfer/source/blender/nodes/shader/nodes/node_shader_tex_brick.c
branches/soc-2013-meshdata_transfer/source/blender/nodes/shader/nodes/node_shader_tex_checker.c
branches/soc-2013-meshdata_transfer/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
branches/soc-2013-meshdata_transfer/source/blender/nodes/shader/nodes/node_shader_tex_gradient.c
branches/soc-2013-meshdata_transfer/source/blender/nodes/shader/nodes/node_shader_tex_image.c
branches/soc-2013-meshdata_transfer/source/blender/nodes/shader/nodes/node_shader_tex_magic.c
branches/soc-2013-meshdata_transfer/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c
branches/soc-2013-meshdata_transfer/source/blender/nodes/shader/nodes/node_shader_tex_noise.c
branches/soc-2013-meshdata_transfer/source/blender/nodes/shader/nodes/node_shader_tex_sky.c
branches/soc-2013-meshdata_transfer/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c
branches/soc-2013-meshdata_transfer/source/blender/nodes/shader/nodes/node_shader_tex_wave.c
branches/soc-2013-meshdata_transfer/source/blender/python/bmesh/bmesh_py_types.h
branches/soc-2013-meshdata_transfer/source/blender/python/generic/blf_py_api.h
branches/soc-2013-meshdata_transfer/source/blender/python/generic/idprop_py_api.c
branches/soc-2013-meshdata_transfer/source/blender/python/generic/py_capi_utils.c
branches/soc-2013-meshdata_transfer/source/blender/python/generic/py_capi_utils.h
branches/soc-2013-meshdata_transfer/source/blender/python/intern/CMakeLists.txt
branches/soc-2013-meshdata_transfer/source/blender/python/intern/bpy.h
branches/soc-2013-meshdata_transfer/source/blender/python/intern/bpy_driver.c
branches/soc-2013-meshdata_transfer/source/blender/python/intern/bpy_interface.c
branches/soc-2013-meshdata_transfer/source/blender/python/intern/bpy_intern_string.h
branches/soc-2013-meshdata_transfer/source/blender/python/intern/bpy_operator_wrap.c
branches/soc-2013-meshdata_transfer/source/blender/python/intern/bpy_props.c
branches/soc-2013-meshdata_transfer/source/blender/python/intern/bpy_rna.c
branches/soc-2013-meshdata_transfer/source/blender/python/intern/bpy_rna_anim.h
branches/soc-2013-meshdata_transfer/source/blender/python/intern/bpy_rna_callback.h
branches/soc-2013-meshdata_transfer/source/blender/python/intern/gpu.h
branches/soc-2013-meshdata_transfer/source/blender/python/mathutils/mathutils.c
branches/soc-2013-meshdata_transfer/source/blender/python/mathutils/mathutils_Euler.c
branches/soc-2013-meshdata_transfer/source/blender/python/mathutils/mathutils_Euler.h
branches/soc-2013-meshdata_transfer/source/blender/python/mathutils/mathutils_Quaternion.c
branches/soc-2013-meshdata_transfer/source/blender/python/mathutils/mathutils_Quaternion.h
branches/soc-2013-meshdata_transfer/source/blender/python/mathutils/mathutils_Vector.c
branches/soc-2013-meshdata_transfer/source/blender/python/mathutils/mathutils_Vector.h
branches/soc-2013-meshdata_transfer/source/blender/python/mathutils/mathutils_geometry.c
branches/soc-2013-meshdata_transfer/source/blender/quicktime/apple/qtkit_export.m
branches/soc-2013-meshdata_transfer/source/blender/quicktime/apple/qtkit_import.m
branches/soc-2013-meshdata_transfer/source/blender/render/extern/include/RE_multires_bake.h
branches/soc-2013-meshdata_transfer/source/blender/render/extern/include/RE_pipeline.h
branches/soc-2013-meshdata_transfer/source/blender/render/extern/include/RE_shader_ext.h
branches/soc-2013-meshdata_transfer/source/blender/render/intern/include/render_types.h
branches/soc-2013-meshdata_transfer/source/blender/render/intern/include/texture.h
branches/soc-2013-meshdata_transfer/source/blender/render/intern/source/bake.c
branches/soc-2013-meshdata_transfer/source/blender/render/intern/source/convertblender.c
branches/soc-2013-meshdata_transfer/source/blender/render/intern/source/imagetexture.c
branches/soc-2013-meshdata_transfer/source/blender/render/intern/source/multires_bake.c
branches/soc-2013-meshdata_transfer/source/blender/render/intern/source/pipeline.c
branches/soc-2013-meshdata_transfer/source/blender/render/intern/source/pixelshading.c
branches/soc-2013-meshdata_transfer/source/blender/render/intern/source/rayshade.c
branches/soc-2013-meshdata_transfer/source/blender/render/intern/source/rendercore.c
branches/soc-2013-meshdata_transfer/source/blender/render/intern/source/shadbuf.c
branches/soc-2013-meshdata_transfer/source/blender/render/intern/source/shadeinput.c
branches/soc-2013-meshdata_transfer/source/blender/windowmanager/WM_api.h
branches/soc-2013-meshdata_transfer/source/blender/windowmanager/WM_keymap.h
branches/soc-2013-meshdata_transfer/source/blender/windowmanager/WM_types.h
branches/soc-2013-meshdata_transfer/source/blender/windowmanager/intern/wm_dragdrop.c
branches/soc-2013-meshdata_transfer/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2013-meshdata_transfer/source/blender/windowmanager/intern/wm_files.c
branches/soc-2013-meshdata_transfer/source/blender/windowmanager/intern/wm_gesture.c
branches/soc-2013-meshdata_transfer/source/blender/windowmanager/intern/wm_jobs.c
branches/soc-2013-meshdata_transfer/source/blender/windowmanager/intern/wm_keymap.c
branches/soc-2013-meshdata_transfer/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2013-meshdata_transfer/source/blender/windowmanager/intern/wm_subwindow.c
branches/soc-2013-meshdata_transfer/source/blender/windowmanager/intern/wm_window.c
branches/soc-2013-meshdata_transfer/source/blender/windowmanager/wm_subwindow.h
branches/soc-2013-meshdata_transfer/source/blenderplayer/CMakeLists.txt
branches/soc-2013-meshdata_transfer/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2013-meshdata_transfer/source/creator/CMakeLists.txt
branches/soc-2013-meshdata_transfer/source/creator/creator.c
branches/soc-2013-meshdata_transfer/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
branches/soc-2013-meshdata_transfer/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2013-meshdata_transfer/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
branches/soc-2013-meshdata_transfer/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
branches/soc-2013-meshdata_transfer/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2013-meshdata_transfer/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/soc-2013-meshdata_transfer/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2013-meshdata_transfer/source/gameengine/Ketsji/KX_GameObject.h
branches/soc-2013-meshdata_transfer/source/gameengine/Ketsji/KX_TouchEventManager.cpp
branches/soc-2013-meshdata_transfer/source/tests/bl_run_operators.py
branches/soc-2013-meshdata_transfer/source/tools/CTS/FBlender.py
branches/soc-2013-meshdata_transfer/source/tools/check_style_c.py
Added Paths:
-----------
branches/soc-2013-meshdata_transfer/doc/python_api/examples/bpy.types.bpy_prop_collection.foreach_get.py
branches/soc-2013-meshdata_transfer/doc/python_api/examples/bpy.types.bpy_prop_collection.foreach_set.py
branches/soc-2013-meshdata_transfer/extern/libmv/libmv-capi_intern.h
branches/soc-2013-meshdata_transfer/intern/cycles/kernel/closure/bsdf_hair.h
branches/soc-2013-meshdata_transfer/intern/cycles/kernel/shaders/node_hair_bsdf.osl
branches/soc-2013-meshdata_transfer/intern/ghost/intern/GHOST_NDOFManager3Dconnexion.c
branches/soc-2013-meshdata_transfer/intern/ghost/intern/GHOST_NDOFManager3Dconnexion.h
branches/soc-2013-meshdata_transfer/intern/guardedalloc/intern/mallocn_guarded_impl.c
branches/soc-2013-meshdata_transfer/intern/guardedalloc/intern/mallocn_intern.h
branches/soc-2013-meshdata_transfer/intern/guardedalloc/intern/mallocn_lockfree_impl.c
branches/soc-2013-meshdata_transfer/intern/opencolorio/gpu_shader_display_transform.glsl
branches/soc-2013-meshdata_transfer/release/scripts/presets/operator/wm.collada_export/sl_plus_open_sim_rigged.py
branches/soc-2013-meshdata_transfer/release/scripts/presets/operator/wm.collada_export/sl_plus_open_sim_static.py
branches/soc-2013-meshdata_transfer/source/blender/collada/version.conf
branches/soc-2013-meshdata_transfer/source/blender/compositor/intern/COM_Debug.cpp
branches/soc-2013-meshdata_transfer/source/blender/compositor/intern/COM_Debug.h
branches/soc-2013-meshdata_transfer/source/blender/editors/curve/editcurve_add.c
branches/soc-2013-meshdata_transfer/source/blender/editors/interface/interface_eyedropper.c
branches/soc-2013-meshdata_transfer/source/blender/imbuf/intern/oiio/
branches/soc-2013-meshdata_transfer/source/blender/imbuf/intern/oiio/CMakeLists.txt
branches/soc-2013-meshdata_transfer/source/blender/imbuf/intern/oiio/SConscript
branches/soc-2013-meshdata_transfer/source/blender/imbuf/intern/oiio/openimageio_api.cpp
branches/soc-2013-meshdata_transfer/source/blender/imbuf/intern/oiio/openimageio_api.h
branches/soc-2013-meshdata_transfer/source/blender/nodes/shader/nodes/node_shader_bsdf_hair.c
branches/soc-2013-meshdata_transfer/source/tools/check_descriptions.py
Removed Paths:
-------------
branches/soc-2013-meshdata_transfer/intern/cycles/render/bssrdf.cpp
branches/soc-2013-meshdata_transfer/intern/cycles/render/bssrdf.h
branches/soc-2013-meshdata_transfer/release/scripts/presets/operator/wm.collada_export/second_life_rigged.py
branches/soc-2013-meshdata_transfer/release/scripts/presets/operator/wm.collada_export/second_life_static.py
branches/soc-2013-meshdata_transfer/source/blender/imbuf/intern/oiio/CMakeLists.txt
branches/soc-2013-meshdata_transfer/source/blender/imbuf/intern/oiio/SConscript
branches/soc-2013-meshdata_transfer/source/blender/imbuf/intern/oiio/openimageio_api.cpp
branches/soc-2013-meshdata_transfer/source/blender/imbuf/intern/oiio/openimageio_api.h
Property Changed:
----------------
branches/soc-2013-meshdata_transfer/
branches/soc-2013-meshdata_transfer/source/blender/editors/interface/interface.c
branches/soc-2013-meshdata_transfer/source/blender/editors/space_outliner/
Property changes on: branches/soc-2013-meshdata_transfer
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_dev:58091-58422
/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,58822,58989
/branches/soc-2013-depsgraph_mt:57516,57900,57939-57940,57945,57958-57961,58151,58155-58156,58169,58277-58279,58282-58283,58711,58787,58789,58796,59086-59087,59163,59166,59170,59181,59259-59260
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032,59214,59220,59251,59601
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57397-60104
+ /branches/ge_dev:58091-58422
/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,58822,58989
/branches/soc-2013-depsgraph_mt:57516,57900,57939-57940,57945,57958-57961,58151,58155-58156,58169,58277-58279,58282-58283,58711,58787,58789,58796,59086-59087,59163,59166,59170,59181,59259-59260,59942,60073,60094,60096,60105
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032,59214,59220,59251,59601
/branches/soc-2013-rigid_body_sim:60311
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57397-60698
Modified: branches/soc-2013-meshdata_transfer/CMakeLists.txt
===================================================================
--- branches/soc-2013-meshdata_transfer/CMakeLists.txt 2013-10-12 06:11:26 UTC (rev 60698)
+++ branches/soc-2013-meshdata_transfer/CMakeLists.txt 2013-10-12 09:41:46 UTC (rev 60699)
@@ -203,6 +203,7 @@
option(WITH_MOD_OCEANSIM "Enable Ocean Modifier" OFF)
# Image format support
+option(WITH_IMAGE_OPENIMAGEIO "Enable OpenImageIO Support (http://www.openimageio.org)" OFF)
option(WITH_IMAGE_OPENEXR "Enable OpenEXR Support (http://www.openexr.com)" ON)
option(WITH_IMAGE_OPENJPEG "Enable OpenJpeg Support (http://www.openjpeg.org)" ON)
option(WITH_IMAGE_TIFF "Enable LibTIFF Support" ON)
@@ -278,13 +279,14 @@
option(WITH_MEM_JEMALLOC "Enable malloc replacement (http://www.canonware.com/jemalloc)" OFF)
mark_as_advanced(WITH_MEM_JEMALLOC)
+# currently only used for BLI_mempool
+option(WITH_MEM_VALGRIND "Enable extended valgrind support for better reporting" OFF)
+mark_as_advanced(WITH_MEM_VALGRIND)
+
# Debug
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)
@@ -320,9 +322,22 @@
set(OSX_SYSTEM unsupported)
endif()
message(STATUS "Detected system-version: " ${OSX_SYSTEM})
-
+
+ # workaround for incorrect cmake xcode lookup for developer previews - XCODE_VERSION does not take xcode-select path into accout
+ # but would always look into /Applications/Xcode.app while dev versions are named Xcode<version>-DP<preview_number>
+ execute_process(COMMAND xcode-select --print-path OUTPUT_VARIABLE XCODE_CHECK OUTPUT_STRIP_TRAILING_WHITESPACE)
+ string(REPLACE "/Contents/Developer" "" XCODE_BUNDLE ${XCODE_CHECK}) # truncate to bundlepath in any case
+ message(STATUS "Xcode-bundle : " ${XCODE_BUNDLE})
+
if(${CMAKE_GENERATOR} MATCHES "Xcode")
+ if(${XCODE_VERSION} VERSION_GREATER 4.2) # earlier xcode has no bundled developer dir, no sense in getting xcode path from
+ string(SUBSTRING "${XCODE_CHECK}" 14 6 DP_NAME) # reduce to XCode name without dp extension
+ if(${DP_NAME} MATCHES Xcode5)
+ set(XCODE_VERSION 5)
+ endif()
+ endif()
+
##### cmake incompatibility with xcode 4.3 and higher #####
if(${XCODE_VERSION} MATCHES '') # cmake fails due looking for xcode in the wrong path, thus will be empty var
message(FATAL_ERROR "Xcode 4.3 and higher must be used with cmake 2.8-8 or higher")
@@ -346,15 +361,16 @@
if(${XCODE_VERSION} VERSION_LESS 4.3)
set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk CACHE PATH "" FORCE) # use guaranteed existing sdk
else()
- # note: i don't use xcode-select path on purpose, cause also /Applications/Xcode.app would be allowed
- # absolute pathes are more foolproof here !
- set(OSX_SYSROOT_PREFIX /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform)
+ # note: xcode-select path could be ambigous, cause /Applications/Xcode.app/Contents/Developer or /Applications/Xcode.app would be allowed
+ # so i use a selfcomposed bundlepath here
+ set(OSX_SYSROOT_PREFIX ${XCODE_BUNDLE}/Contents/Developer/Platforms/MacOSX.platform)
+ message(STATUS "OSX_SYSROOT_PREFIX: " ${OSX_SYSROOT_PREFIX})
set(OSX_DEVELOPER_PREFIX /Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk) # use guaranteed existing sdk
set(CMAKE_OSX_SYSROOT ${OSX_SYSROOT_PREFIX}/${OSX_DEVELOPER_PREFIX} CACHE PATH "" FORCE)
endif()
if(NOT CMAKE_OSX_DEPLOYMENT_TARGET)
- set(CMAKE_OSX_DEPLOYMENT_TARGET "10.5" CACHE STRING "" FORCE) # 10.5 is our min. target, if you use higher sdk, weak linking happens
+ set(CMAKE_OSX_DEPLOYMENT_TARGET "10.5" CACHE STRING "" FORCE) # 10.5 is our min. target, if you use higher sdk, weak linking happens
endif()
if(NOT ${CMAKE_GENERATOR} MATCHES "Xcode")
@@ -404,6 +420,10 @@
message(FATAL_ERROR "WITH_IMAGE_REDCODE requires WITH_IMAGE_OPENJPEG and WITH_CODEC_FFMPEG")
endif()
+if(WITH_IMAGE_OPENIMAGEIO)
+ set(WITH_OPENIMAGEIO ON)
+endif()
+
# python module, needs some different options
if(WITH_PYTHON_MODULE AND WITH_PLAYER)
message(FATAL_ERROR "WITH_PYTHON_MODULE requires WITH_PLAYER to be OFF")
@@ -442,7 +462,7 @@
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)
+elseif(WITH_CYCLES OR WITH_OPENIMAGEIO OR WITH_MOD_BOOLEAN OR WITH_AUDASPACE OR WITH_INTERNATIONAL)
# Keep enabled
else()
# Enabled but we don't need it
@@ -784,33 +804,38 @@
find_program(LLVM_CONFIG llvm-config)
endif()
endif()
- execute_process(COMMAND ${LLVM_CONFIG} --version
- OUTPUT_VARIABLE LLVM_VERSION
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- execute_process(COMMAND ${LLVM_CONFIG} --prefix
- OUTPUT_VARIABLE LLVM_DIRECTORY
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- execute_process(COMMAND ${LLVM_CONFIG} --libdir
- OUTPUT_VARIABLE LLVM_LIB_DIR
- OUTPUT_STRIP_TRAILING_WHITESPACE)
+ if(NOT DEFINED LLVM_VERSION)
+ execute_process(COMMAND ${LLVM_CONFIG} --version
+ OUTPUT_VARIABLE LLVM_VERSION
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ set(LLVM_VERSION ${LLVM_VERSION} CACHE STRING "Version of LLVM to use")
+ endif()
+ if(NOT DEFINED LLVM_DIRECTORY)
+ execute_process(COMMAND ${LLVM_CONFIG} --prefix
+ OUTPUT_VARIABLE LLVM_DIRECTORY
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ set(LLVM_DIRECTORY ${LLVM_DIRECTORY} CACHE PATH "Path to the LLVM installation")
+ endif()
+ if(NOT DEFINED LLVM_LIBPATH)
+ execute_process(COMMAND ${LLVM_CONFIG} --libdir
+ OUTPUT_VARIABLE LLVM_LIBPATH
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ set(LLVM_LIBPATH ${LLVM_LIBPATH} CACHE PATH "Path to the LLVM library path")
+ endif()
+
if(LLVM_STATIC)
find_library(LLVM_LIBRARY
NAMES LLVMAnalysis # first of a whole bunch of libs to get
- PATHS ${LLVM_LIB_DIR})
+ PATHS ${LLVM_LIBPATH})
else()
find_library(LLVM_LIBRARY
NAMES LLVM-${LLVM_VERSION}
- PATHS ${LLVM_LIB_DIR})
+ PATHS ${LLVM_LIBPATH})
endif()
- message(STATUS "LLVM version = ${LLVM_VERSION}")
- message(STATUS "LLVM dir = ${LLVM_DIRECTORY}")
- message(STATUS "LLVM lib dir = ${LLVM_LIB_DIR}")
- set(LLVM_VERSION ${LLVM_VERSION} CACHE STRING "Version of LLVM to use")
- set(LLVM_DIRECTORY ${LLVM_DIRECTORY} CACHE PATH "Path to the LLVM installation")
- if(LLVM_LIBRARY AND LLVM_DIRECTORY AND LLVM_LIB_DIR)
+ if(LLVM_LIBRARY AND LLVM_DIRECTORY AND LLVM_LIBPATH)
if(LLVM_STATIC)
# if static LLVM libraries were requested, use llvm-config to generate
# the list of what libraries we need, and substitute that in the right
@@ -818,7 +843,7 @@
execute_process(COMMAND ${LLVM_CONFIG} --libfiles
OUTPUT_VARIABLE LLVM_LIBRARY
OUTPUT_STRIP_TRAILING_WHITESPACE)
- string(REPLACE " " ";" LLVM_LIBRARY ${LLVM_LIBRARY})
+ string(REPLACE " " ";" LLVM_LIBRARY "${LLVM_LIBRARY}")
endif()
else()
message(FATAL_ERROR "LLVM not found.")
@@ -1435,7 +1460,7 @@
if(WITH_LLVM)
set(LLVM_DIRECTORY ${LIBDIR}/llvm CACHE PATH "Path to the LLVM installation")
- set(LLVM_LIB_DIR ${LLVM_DIRECTORY}/lib)
+ set(LLVM_LIBPATH ${LLVM_DIRECTORY}/lib)
# Explicitly set llvm lib order.
#---- WARNING ON GCC ORDER OF LIBS IS IMPORTANT, DO NOT CHANGE! ---------
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list