[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59229] branches/soc-2013-rigid_body_sim: svn merge -r58494:59227 ^/trunk/blender
Sergej Reich
sergej.reich at googlemail.com
Sun Aug 18 14:28:33 CEST 2013
Revision: 59229
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59229
Author: sergof
Date: 2013-08-18 12:28:32 +0000 (Sun, 18 Aug 2013)
Log Message:
-----------
svn merge -r58494:59227 ^/trunk/blender
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58494
Modified Paths:
--------------
branches/soc-2013-rigid_body_sim/CMakeLists.txt
branches/soc-2013-rigid_body_sim/build_files/build_environment/install_deps.sh
branches/soc-2013-rigid_body_sim/build_files/cmake/cmake_static_check_cppcheck.py
branches/soc-2013-rigid_body_sim/build_files/cmake/cmake_static_check_smatch.py
branches/soc-2013-rigid_body_sim/build_files/cmake/cmake_static_check_sparse.py
branches/soc-2013-rigid_body_sim/build_files/cmake/project_source_info.py
branches/soc-2013-rigid_body_sim/build_files/scons/tools/Blender.py
branches/soc-2013-rigid_body_sim/doc/python_api/rst/bge.logic.rst
branches/soc-2013-rigid_body_sim/doc/python_api/rst/bge.render.rst
branches/soc-2013-rigid_body_sim/doc/python_api/rst/bge_types/bge.types.KX_Camera.rst
branches/soc-2013-rigid_body_sim/doc/python_api/rst/bge_types/bge.types.KX_GameObject.rst
branches/soc-2013-rigid_body_sim/extern/libmv/libmv/multiview/euclidean_resection.cc
branches/soc-2013-rigid_body_sim/extern/libmv/libmv/multiview/euclidean_resection.h
branches/soc-2013-rigid_body_sim/extern/libmv/libmv/tracking/track_region.cc
branches/soc-2013-rigid_body_sim/extern/libmv/libmv-capi.cc
branches/soc-2013-rigid_body_sim/extern/libmv/libmv-capi.h
branches/soc-2013-rigid_body_sim/extern/libmv/libmv-capi_stub.cc
branches/soc-2013-rigid_body_sim/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
branches/soc-2013-rigid_body_sim/intern/audaspace/OpenAL/AUD_OpenALDevice.h
branches/soc-2013-rigid_body_sim/intern/audaspace/Python/AUD_PyAPI.cpp
branches/soc-2013-rigid_body_sim/intern/audaspace/intern/AUD_IHandle.h
branches/soc-2013-rigid_body_sim/intern/audaspace/intern/AUD_SoftwareDevice.cpp
branches/soc-2013-rigid_body_sim/intern/audaspace/intern/AUD_SoftwareDevice.h
branches/soc-2013-rigid_body_sim/intern/audaspace/intern/AUD_Space.h
branches/soc-2013-rigid_body_sim/intern/cycles/CMakeLists.txt
branches/soc-2013-rigid_body_sim/intern/cycles/blender/addon/ui.py
branches/soc-2013-rigid_body_sim/intern/cycles/blender/blender_mesh.cpp
branches/soc-2013-rigid_body_sim/intern/cycles/blender/blender_object.cpp
branches/soc-2013-rigid_body_sim/intern/cycles/blender/blender_session.cpp
branches/soc-2013-rigid_body_sim/intern/cycles/blender/blender_shader.cpp
branches/soc-2013-rigid_body_sim/intern/cycles/blender/blender_sync.cpp
branches/soc-2013-rigid_body_sim/intern/cycles/bvh/bvh.h
branches/soc-2013-rigid_body_sim/intern/cycles/device/device_cuda.cpp
branches/soc-2013-rigid_body_sim/intern/cycles/device/device_task.h
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/CMakeLists.txt
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/closure/bsdf.h
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/kernel.cl
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/kernel.cpp
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/kernel.cu
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/kernel_accumulate.h
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/kernel_bvh.h
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/kernel_bvh_traversal.h
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/kernel_curve.h
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/kernel_displace.h
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/kernel_emission.h
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/kernel_light.h
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/kernel_object.h
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/kernel_passes.h
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/kernel_path.h
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/kernel_random.h
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/kernel_shader.h
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/kernel_sse2.cpp
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/kernel_sse3.cpp
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/kernel_subsurface.h
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/kernel_types.h
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/osl/osl_closures.h
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/osl/osl_globals.h
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/osl/osl_services.cpp
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/osl/osl_services.h
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/osl/osl_shader.cpp
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/shaders/CMakeLists.txt
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/shaders/node_light_path.osl
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/shaders/node_texture.h
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/shaders/node_wave_texture.osl
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/svm/svm.h
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/svm/svm_fresnel.h
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/svm/svm_light_path.h
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/svm/svm_texture.h
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/svm/svm_types.h
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/svm/svm_wave.h
branches/soc-2013-rigid_body_sim/intern/cycles/render/CMakeLists.txt
branches/soc-2013-rigid_body_sim/intern/cycles/render/curves.cpp
branches/soc-2013-rigid_body_sim/intern/cycles/render/film.cpp
branches/soc-2013-rigid_body_sim/intern/cycles/render/graph.cpp
branches/soc-2013-rigid_body_sim/intern/cycles/render/graph.h
branches/soc-2013-rigid_body_sim/intern/cycles/render/light.cpp
branches/soc-2013-rigid_body_sim/intern/cycles/render/nodes.cpp
branches/soc-2013-rigid_body_sim/intern/cycles/render/nodes.h
branches/soc-2013-rigid_body_sim/intern/cycles/render/session.cpp
branches/soc-2013-rigid_body_sim/intern/cycles/render/shader.cpp
branches/soc-2013-rigid_body_sim/intern/cycles/render/shader.h
branches/soc-2013-rigid_body_sim/intern/cycles/render/svm.cpp
branches/soc-2013-rigid_body_sim/intern/cycles/render/tile.cpp
branches/soc-2013-rigid_body_sim/intern/dualcon/dualcon.h
branches/soc-2013-rigid_body_sim/intern/dualcon/intern/GeoCommon.h
branches/soc-2013-rigid_body_sim/intern/dualcon/intern/MemoryAllocator.h
branches/soc-2013-rigid_body_sim/intern/dualcon/intern/ModelReader.h
branches/soc-2013-rigid_body_sim/intern/dualcon/intern/Projections.cpp
branches/soc-2013-rigid_body_sim/intern/dualcon/intern/Projections.h
branches/soc-2013-rigid_body_sim/intern/dualcon/intern/Queue.h
branches/soc-2013-rigid_body_sim/intern/dualcon/intern/cubes.h
branches/soc-2013-rigid_body_sim/intern/dualcon/intern/dualcon_c_api.cpp
branches/soc-2013-rigid_body_sim/intern/dualcon/intern/manifold_table.h
branches/soc-2013-rigid_body_sim/intern/dualcon/intern/marching_cubes_table.h
branches/soc-2013-rigid_body_sim/intern/dualcon/intern/octree.cpp
branches/soc-2013-rigid_body_sim/intern/dualcon/intern/octree.h
branches/soc-2013-rigid_body_sim/intern/ghost/CMakeLists.txt
branches/soc-2013-rigid_body_sim/intern/ghost/GHOST_C-api.h
branches/soc-2013-rigid_body_sim/intern/ghost/GHOST_IWindow.h
branches/soc-2013-rigid_body_sim/intern/ghost/SConscript
branches/soc-2013-rigid_body_sim/intern/ghost/intern/GHOST_C-api.cpp
branches/soc-2013-rigid_body_sim/intern/ghost/intern/GHOST_Window.h
branches/soc-2013-rigid_body_sim/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/soc-2013-rigid_body_sim/intern/ghost/intern/GHOST_WindowWin32.h
branches/soc-2013-rigid_body_sim/intern/ghost/intern/GHOST_WindowX11.cpp
branches/soc-2013-rigid_body_sim/intern/ghost/intern/GHOST_WindowX11.h
branches/soc-2013-rigid_body_sim/intern/guardedalloc/MEM_guardedalloc.h
branches/soc-2013-rigid_body_sim/intern/guardedalloc/intern/mallocn.c
branches/soc-2013-rigid_body_sim/intern/mikktspace/mikktspace.c
branches/soc-2013-rigid_body_sim/intern/rigidbody/rb_bullet_api.cpp
branches/soc-2013-rigid_body_sim/release/datafiles/splash.png
branches/soc-2013-rigid_body_sim/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
branches/soc-2013-rigid_body_sim/release/scripts/modules/bpy/path.py
branches/soc-2013-rigid_body_sim/release/scripts/modules/bpy_extras/image_utils.py
branches/soc-2013-rigid_body_sim/release/scripts/presets/cycles/sampling/final.py
branches/soc-2013-rigid_body_sim/release/scripts/presets/cycles/sampling/preview.py
branches/soc-2013-rigid_body_sim/release/scripts/presets/keyconfig/3dsmax.py
branches/soc-2013-rigid_body_sim/release/scripts/presets/keyconfig/maya.py
branches/soc-2013-rigid_body_sim/release/scripts/startup/bl_operators/add_mesh_torus.py
branches/soc-2013-rigid_body_sim/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2013-rigid_body_sim/release/scripts/startup/bl_ui/properties_game.py
branches/soc-2013-rigid_body_sim/release/scripts/startup/bl_ui/properties_mask_common.py
branches/soc-2013-rigid_body_sim/release/scripts/startup/bl_ui/properties_object.py
branches/soc-2013-rigid_body_sim/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
branches/soc-2013-rigid_body_sim/release/scripts/startup/bl_ui/space_clip.py
branches/soc-2013-rigid_body_sim/release/scripts/startup/bl_ui/space_sequencer.py
branches/soc-2013-rigid_body_sim/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2013-rigid_body_sim/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2013-rigid_body_sim/release/scripts/startup/nodeitems_builtins.py
branches/soc-2013-rigid_body_sim/release/scripts/templates_py/custom_nodes.py
branches/soc-2013-rigid_body_sim/release/scripts/templates_py/script_stub.py
branches/soc-2013-rigid_body_sim/source/blender/avi/intern/avi.c
branches/soc-2013-rigid_body_sim/source/blender/avi/intern/avi_mjpeg.c
branches/soc-2013-rigid_body_sim/source/blender/blenfont/BLF_api.h
branches/soc-2013-rigid_body_sim/source/blender/blenfont/intern/blf_glyph.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/BKE_DerivedMesh.h
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/BKE_armature.h
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/BKE_blender.h
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/BKE_context.h
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/BKE_curve.h
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/BKE_global.h
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/BKE_image.h
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/BKE_mask.h
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/BKE_material.h
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/BKE_mesh.h
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/BKE_node.h
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/BKE_pbvh.h
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/BKE_screen.h
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/BKE_tracking.h
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/CMakeLists.txt
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/action.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/anim.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/armature.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/blender.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/camera.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/cloth.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/constraint.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/context.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/curve.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/customdata.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/deform.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/dynamicpaint.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/editderivedmesh.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/fmodifier.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/image.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/image_gen.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/key.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/library.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/mask.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/material.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/mesh.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/mesh_validate.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/modifiers_bmesh.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/movieclip.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/multires.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/navmesh_conversion.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/node.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/object.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/object_deform.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/packedFile.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/particle.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/pbvh.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/pbvh_bmesh.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/pbvh_intern.h
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/pointcache.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/property.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/screen.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/sequencer.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/shrinkwrap.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/sketch.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/smoke.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/sound.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/text.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/texture.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/tracking.c
branches/soc-2013-rigid_body_sim/source/blender/blenlib/BLI_array.h
branches/soc-2013-rigid_body_sim/source/blender/blenlib/BLI_bitmap.h
branches/soc-2013-rigid_body_sim/source/blender/blenlib/BLI_buffer.h
branches/soc-2013-rigid_body_sim/source/blender/blenlib/BLI_edgehash.h
branches/soc-2013-rigid_body_sim/source/blender/blenlib/BLI_ghash.h
branches/soc-2013-rigid_body_sim/source/blender/blenlib/BLI_linklist.h
branches/soc-2013-rigid_body_sim/source/blender/blenlib/BLI_math_base.h
branches/soc-2013-rigid_body_sim/source/blender/blenlib/BLI_math_geom.h
branches/soc-2013-rigid_body_sim/source/blender/blenlib/BLI_math_matrix.h
branches/soc-2013-rigid_body_sim/source/blender/blenlib/BLI_math_vector.h
branches/soc-2013-rigid_body_sim/source/blender/blenlib/BLI_memarena.h
branches/soc-2013-rigid_body_sim/source/blender/blenlib/BLI_mempool.h
branches/soc-2013-rigid_body_sim/source/blender/blenlib/BLI_path_util.h
branches/soc-2013-rigid_body_sim/source/blender/blenlib/BLI_string.h
branches/soc-2013-rigid_body_sim/source/blender/blenlib/BLI_string_utf8.h
branches/soc-2013-rigid_body_sim/source/blender/blenlib/BLI_utildefines.h
branches/soc-2013-rigid_body_sim/source/blender/blenlib/CMakeLists.txt
branches/soc-2013-rigid_body_sim/source/blender/blenlib/intern/BLI_array.c
branches/soc-2013-rigid_body_sim/source/blender/blenlib/intern/BLI_ghash.c
branches/soc-2013-rigid_body_sim/source/blender/blenlib/intern/BLI_heap.c
branches/soc-2013-rigid_body_sim/source/blender/blenlib/intern/BLI_kdtree.c
branches/soc-2013-rigid_body_sim/source/blender/blenlib/intern/BLI_linklist.c
branches/soc-2013-rigid_body_sim/source/blender/blenlib/intern/BLI_mempool.c
branches/soc-2013-rigid_body_sim/source/blender/blenlib/intern/buffer.c
branches/soc-2013-rigid_body_sim/source/blender/blenlib/intern/edgehash.c
branches/soc-2013-rigid_body_sim/source/blender/blenlib/intern/fileops.c
branches/soc-2013-rigid_body_sim/source/blender/blenlib/intern/math_geom.c
branches/soc-2013-rigid_body_sim/source/blender/blenlib/intern/math_matrix.c
branches/soc-2013-rigid_body_sim/source/blender/blenlib/intern/math_vector_inline.c
branches/soc-2013-rigid_body_sim/source/blender/blenlib/intern/path_util.c
branches/soc-2013-rigid_body_sim/source/blender/blenlib/intern/scanfill.c
branches/soc-2013-rigid_body_sim/source/blender/blenlib/intern/smallhash.c
branches/soc-2013-rigid_body_sim/source/blender/blenlib/intern/storage.c
branches/soc-2013-rigid_body_sim/source/blender/blenlib/intern/string.c
branches/soc-2013-rigid_body_sim/source/blender/blenlib/intern/string_utf8.c
branches/soc-2013-rigid_body_sim/source/blender/blenlib/intern/voronoi.c
branches/soc-2013-rigid_body_sim/source/blender/blenloader/intern/readfile.c
branches/soc-2013-rigid_body_sim/source/blender/blenloader/intern/runtime.c
branches/soc-2013-rigid_body_sim/source/blender/blenloader/intern/writefile.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/CMakeLists.txt
branches/soc-2013-rigid_body_sim/source/blender/bmesh/bmesh.h
branches/soc-2013-rigid_body_sim/source/blender/bmesh/intern/bmesh_construct.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/intern/bmesh_construct.h
branches/soc-2013-rigid_body_sim/source/blender/bmesh/intern/bmesh_core.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/intern/bmesh_core.h
branches/soc-2013-rigid_body_sim/source/blender/bmesh/intern/bmesh_edgeloop.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/intern/bmesh_edgeloop.h
branches/soc-2013-rigid_body_sim/source/blender/bmesh/intern/bmesh_interp.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/intern/bmesh_log.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/intern/bmesh_marking.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/intern/bmesh_marking.h
branches/soc-2013-rigid_body_sim/source/blender/bmesh/intern/bmesh_mesh_conv.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/intern/bmesh_mods.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/intern/bmesh_opdefines.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/intern/bmesh_operators.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/intern/bmesh_operators.h
branches/soc-2013-rigid_body_sim/source/blender/bmesh/intern/bmesh_operators_private.h
branches/soc-2013-rigid_body_sim/source/blender/bmesh/intern/bmesh_polygon.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/intern/bmesh_polygon.h
branches/soc-2013-rigid_body_sim/source/blender/bmesh/intern/bmesh_private.h
branches/soc-2013-rigid_body_sim/source/blender/bmesh/intern/bmesh_queries.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/intern/bmesh_queries.h
branches/soc-2013-rigid_body_sim/source/blender/bmesh/intern/bmesh_structure.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/intern/bmesh_structure.h
branches/soc-2013-rigid_body_sim/source/blender/bmesh/intern/bmesh_walkers.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/operators/bmo_beautify.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/operators/bmo_bridge.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/operators/bmo_connect.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/operators/bmo_connect_pair.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/operators/bmo_create.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/operators/bmo_dissolve.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/operators/bmo_dupe.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/operators/bmo_edgenet.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/operators/bmo_extrude.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/operators/bmo_inset.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/operators/bmo_join_triangles.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/operators/bmo_normals.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/operators/bmo_poke.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/operators/bmo_removedoubles.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/operators/bmo_smooth_laplacian.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/operators/bmo_split_edges.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/operators/bmo_subdivide.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/operators/bmo_subdivide_edgering.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/operators/bmo_symmetrize.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/operators/bmo_utils.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/operators/bmo_wireframe.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/tools/bmesh_bevel.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/tools/bmesh_decimate.h
branches/soc-2013-rigid_body_sim/source/blender/bmesh/tools/bmesh_decimate_collapse.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/tools/bmesh_decimate_dissolve.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/tools/bmesh_edgesplit.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/tools/bmesh_edgesplit.h
branches/soc-2013-rigid_body_sim/source/blender/bmesh/tools/bmesh_triangulate.c
branches/soc-2013-rigid_body_sim/source/blender/collada/ArmatureImporter.cpp
branches/soc-2013-rigid_body_sim/source/blender/collada/DocumentImporter.cpp
branches/soc-2013-rigid_body_sim/source/blender/collada/MeshImporter.cpp
branches/soc-2013-rigid_body_sim/source/blender/collada/SkinInfo.cpp
branches/soc-2013-rigid_body_sim/source/blender/collada/TransformReader.cpp
branches/soc-2013-rigid_body_sim/source/blender/collada/collada_internal.cpp
branches/soc-2013-rigid_body_sim/source/blender/collada/collada_internal.h
branches/soc-2013-rigid_body_sim/source/blender/collada/collada_utils.cpp
branches/soc-2013-rigid_body_sim/source/blender/collada/collada_utils.h
branches/soc-2013-rigid_body_sim/source/blender/compositor/CMakeLists.txt
branches/soc-2013-rigid_body_sim/source/blender/compositor/COM_compositor.h
branches/soc-2013-rigid_body_sim/source/blender/compositor/intern/COM_Converter.cpp
branches/soc-2013-rigid_body_sim/source/blender/compositor/intern/COM_ExecutionGroup.cpp
branches/soc-2013-rigid_body_sim/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
branches/soc-2013-rigid_body_sim/source/blender/compositor/intern/COM_SocketReader.h
branches/soc-2013-rigid_body_sim/source/blender/compositor/intern/COM_WorkScheduler.cpp
branches/soc-2013-rigid_body_sim/source/blender/compositor/nodes/COM_RenderLayersNode.cpp
branches/soc-2013-rigid_body_sim/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
branches/soc-2013-rigid_body_sim/source/blender/compositor/operations/COM_ConvertColorToBWOperation.cpp
branches/soc-2013-rigid_body_sim/source/blender/compositor/operations/COM_ConvertColorToValueProg.cpp
branches/soc-2013-rigid_body_sim/source/blender/compositor/operations/COM_ImageOperation.cpp
branches/soc-2013-rigid_body_sim/source/blender/compositor/operations/COM_ImageOperation.h
branches/soc-2013-rigid_body_sim/source/blender/compositor/operations/COM_MapUVOperation.cpp
branches/soc-2013-rigid_body_sim/source/blender/compositor/operations/COM_MathBaseOperation.cpp
branches/soc-2013-rigid_body_sim/source/blender/compositor/operations/COM_MixAddOperation.cpp
branches/soc-2013-rigid_body_sim/source/blender/compositor/operations/COM_MixBurnOperation.cpp
branches/soc-2013-rigid_body_sim/source/blender/compositor/operations/COM_MixColorOperation.cpp
branches/soc-2013-rigid_body_sim/source/blender/compositor/operations/COM_MixDarkenOperation.cpp
branches/soc-2013-rigid_body_sim/source/blender/compositor/operations/COM_MixDifferenceOperation.cpp
branches/soc-2013-rigid_body_sim/source/blender/compositor/operations/COM_MixDivideOperation.cpp
branches/soc-2013-rigid_body_sim/source/blender/compositor/operations/COM_MixDodgeOperation.cpp
branches/soc-2013-rigid_body_sim/source/blender/compositor/operations/COM_MixHueOperation.cpp
branches/soc-2013-rigid_body_sim/source/blender/compositor/operations/COM_MixLightenOperation.cpp
branches/soc-2013-rigid_body_sim/source/blender/compositor/operations/COM_MixLinearLightOperation.cpp
branches/soc-2013-rigid_body_sim/source/blender/compositor/operations/COM_MixOverlayOperation.cpp
branches/soc-2013-rigid_body_sim/source/blender/compositor/operations/COM_MixSaturationOperation.cpp
branches/soc-2013-rigid_body_sim/source/blender/compositor/operations/COM_MixScreenOperation.cpp
branches/soc-2013-rigid_body_sim/source/blender/compositor/operations/COM_MixSoftLightOperation.cpp
branches/soc-2013-rigid_body_sim/source/blender/compositor/operations/COM_MixSubtractOperation.cpp
branches/soc-2013-rigid_body_sim/source/blender/compositor/operations/COM_MixValueOperation.cpp
branches/soc-2013-rigid_body_sim/source/blender/compositor/operations/COM_MultilayerImageOperation.cpp
branches/soc-2013-rigid_body_sim/source/blender/compositor/operations/COM_ReadBufferOperation.cpp
branches/soc-2013-rigid_body_sim/source/blender/compositor/operations/COM_ReadBufferOperation.h
branches/soc-2013-rigid_body_sim/source/blender/compositor/operations/COM_ViewerOperation.cpp
branches/soc-2013-rigid_body_sim/source/blender/compositor/operations/COM_ViewerOperation.h
branches/soc-2013-rigid_body_sim/source/blender/compositor/operations/COM_WriteBufferOperation.cpp
branches/soc-2013-rigid_body_sim/source/blender/compositor/operations/COM_WriteBufferOperation.h
branches/soc-2013-rigid_body_sim/source/blender/editors/animation/anim_intern.h
branches/soc-2013-rigid_body_sim/source/blender/editors/animation/anim_markers.c
branches/soc-2013-rigid_body_sim/source/blender/editors/animation/keyframes_draw.c
branches/soc-2013-rigid_body_sim/source/blender/editors/animation/keyframes_general.c
branches/soc-2013-rigid_body_sim/source/blender/editors/armature/armature_edit.c
branches/soc-2013-rigid_body_sim/source/blender/editors/armature/armature_relations.c
branches/soc-2013-rigid_body_sim/source/blender/editors/armature/armature_select.c
branches/soc-2013-rigid_body_sim/source/blender/editors/armature/armature_skinning.c
branches/soc-2013-rigid_body_sim/source/blender/editors/armature/armature_utils.c
branches/soc-2013-rigid_body_sim/source/blender/editors/armature/pose_edit.c
branches/soc-2013-rigid_body_sim/source/blender/editors/armature/pose_select.c
branches/soc-2013-rigid_body_sim/source/blender/editors/armature/pose_transform.c
branches/soc-2013-rigid_body_sim/source/blender/editors/armature/pose_utils.c
branches/soc-2013-rigid_body_sim/source/blender/editors/curve/curve_intern.h
branches/soc-2013-rigid_body_sim/source/blender/editors/curve/curve_ops.c
branches/soc-2013-rigid_body_sim/source/blender/editors/curve/editcurve.c
branches/soc-2013-rigid_body_sim/source/blender/editors/curve/editfont.c
branches/soc-2013-rigid_body_sim/source/blender/editors/include/BIF_glutil.h
branches/soc-2013-rigid_body_sim/source/blender/editors/include/ED_anim_api.h
branches/soc-2013-rigid_body_sim/source/blender/editors/include/ED_armature.h
branches/soc-2013-rigid_body_sim/source/blender/editors/include/ED_mesh.h
branches/soc-2013-rigid_body_sim/source/blender/editors/include/ED_transform.h
branches/soc-2013-rigid_body_sim/source/blender/editors/include/UI_interface.h
branches/soc-2013-rigid_body_sim/source/blender/editors/interface/interface.c
branches/soc-2013-rigid_body_sim/source/blender/editors/interface/interface_draw.c
branches/soc-2013-rigid_body_sim/source/blender/editors/interface/interface_handlers.c
branches/soc-2013-rigid_body_sim/source/blender/editors/interface/interface_intern.h
branches/soc-2013-rigid_body_sim/source/blender/editors/interface/interface_layout.c
branches/soc-2013-rigid_body_sim/source/blender/editors/interface/interface_ops.c
branches/soc-2013-rigid_body_sim/source/blender/editors/interface/interface_regions.c
branches/soc-2013-rigid_body_sim/source/blender/editors/interface/interface_templates.c
branches/soc-2013-rigid_body_sim/source/blender/editors/interface/resources.c
branches/soc-2013-rigid_body_sim/source/blender/editors/interface/view2d_ops.c
branches/soc-2013-rigid_body_sim/source/blender/editors/mask/mask_draw.c
branches/soc-2013-rigid_body_sim/source/blender/editors/mask/mask_ops.c
branches/soc-2013-rigid_body_sim/source/blender/editors/mask/mask_relationships.c
branches/soc-2013-rigid_body_sim/source/blender/editors/mask/mask_select.c
branches/soc-2013-rigid_body_sim/source/blender/editors/mask/mask_shapekey.c
branches/soc-2013-rigid_body_sim/source/blender/editors/mesh/editface.c
branches/soc-2013-rigid_body_sim/source/blender/editors/mesh/editmesh_add.c
branches/soc-2013-rigid_body_sim/source/blender/editors/mesh/editmesh_extrude.c
branches/soc-2013-rigid_body_sim/source/blender/editors/mesh/editmesh_knife.c
branches/soc-2013-rigid_body_sim/source/blender/editors/mesh/editmesh_loopcut.c
branches/soc-2013-rigid_body_sim/source/blender/editors/mesh/editmesh_rip.c
branches/soc-2013-rigid_body_sim/source/blender/editors/mesh/editmesh_select.c
branches/soc-2013-rigid_body_sim/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2013-rigid_body_sim/source/blender/editors/mesh/editmesh_utils.c
branches/soc-2013-rigid_body_sim/source/blender/editors/mesh/mesh_data.c
branches/soc-2013-rigid_body_sim/source/blender/editors/mesh/mesh_intern.h
branches/soc-2013-rigid_body_sim/source/blender/editors/mesh/mesh_navmesh.c
branches/soc-2013-rigid_body_sim/source/blender/editors/mesh/mesh_ops.c
branches/soc-2013-rigid_body_sim/source/blender/editors/mesh/meshtools.c
branches/soc-2013-rigid_body_sim/source/blender/editors/object/object_add.c
branches/soc-2013-rigid_body_sim/source/blender/editors/object/object_bake.c
branches/soc-2013-rigid_body_sim/source/blender/editors/object/object_edit.c
branches/soc-2013-rigid_body_sim/source/blender/editors/object/object_group.c
branches/soc-2013-rigid_body_sim/source/blender/editors/object/object_hook.c
branches/soc-2013-rigid_body_sim/source/blender/editors/object/object_lattice.c
branches/soc-2013-rigid_body_sim/source/blender/editors/object/object_modifier.c
branches/soc-2013-rigid_body_sim/source/blender/editors/object/object_relations.c
branches/soc-2013-rigid_body_sim/source/blender/editors/object/object_vgroup.c
branches/soc-2013-rigid_body_sim/source/blender/editors/render/render_internal.c
branches/soc-2013-rigid_body_sim/source/blender/editors/render/render_opengl.c
branches/soc-2013-rigid_body_sim/source/blender/editors/render/render_preview.c
branches/soc-2013-rigid_body_sim/source/blender/editors/render/render_shading.c
branches/soc-2013-rigid_body_sim/source/blender/editors/screen/area.c
branches/soc-2013-rigid_body_sim/source/blender/editors/screen/screen_edit.c
branches/soc-2013-rigid_body_sim/source/blender/editors/screen/screen_ops.c
branches/soc-2013-rigid_body_sim/source/blender/editors/sculpt_paint/paint_hide.c
branches/soc-2013-rigid_body_sim/source/blender/editors/sculpt_paint/paint_image_proj.c
branches/soc-2013-rigid_body_sim/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2013-rigid_body_sim/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2013-rigid_body_sim/source/blender/editors/sculpt_paint/paint_utils.c
branches/soc-2013-rigid_body_sim/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2013-rigid_body_sim/source/blender/editors/sculpt_paint/paint_vertex_proj.c
branches/soc-2013-rigid_body_sim/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2013-rigid_body_sim/source/blender/editors/sculpt_paint/sculpt_intern.h
branches/soc-2013-rigid_body_sim/source/blender/editors/sculpt_paint/sculpt_undo.c
branches/soc-2013-rigid_body_sim/source/blender/editors/sculpt_paint/sculpt_uv.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_buttons/space_buttons.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_clip/clip_draw.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_clip/clip_graph_ops.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_clip/clip_intern.h
branches/soc-2013-rigid_body_sim/source/blender/editors/space_clip/clip_utils.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_clip/space_clip.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_clip/tracking_select.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_file/file_panels.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_file/space_file.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_graph/graph_buttons.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_image/image_buttons.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_logic/logic_buttons.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_logic/logic_window.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_nla/nla_buttons.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_node/drawnode.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_node/node_add.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_node/node_buttons.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_node/node_edit.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_node/node_intern.h
branches/soc-2013-rigid_body_sim/source/blender/editors/space_node/node_ops.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_node/node_relationships.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_node/node_select.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_node/node_toolbar.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_node/node_view.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_node/space_node.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_outliner/outliner_draw.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_outliner/outliner_edit.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_outliner/outliner_intern.h
branches/soc-2013-rigid_body_sim/source/blender/editors/space_outliner/outliner_select.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_outliner/outliner_tools.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_outliner/outliner_tree.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_outliner/space_outliner.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_sequencer/sequencer_buttons.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_time/space_time.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_view3d/drawobject.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_view3d/drawvolume.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_view3d/view3d_iterators.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_view3d/view3d_toolbar.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2013-rigid_body_sim/source/blender/editors/transform/transform.c
branches/soc-2013-rigid_body_sim/source/blender/editors/transform/transform.h
branches/soc-2013-rigid_body_sim/source/blender/editors/transform/transform_conversions.c
branches/soc-2013-rigid_body_sim/source/blender/editors/transform/transform_generics.c
branches/soc-2013-rigid_body_sim/source/blender/editors/transform/transform_orientations.c
branches/soc-2013-rigid_body_sim/source/blender/editors/util/crazyspace.c
branches/soc-2013-rigid_body_sim/source/blender/editors/uvedit/uvedit_draw.c
branches/soc-2013-rigid_body_sim/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2013-rigid_body_sim/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/soc-2013-rigid_body_sim/source/blender/editors/uvedit/uvedit_smart_stitch.c
branches/soc-2013-rigid_body_sim/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/application/AppView.h
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/application/Controller.h
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/blender_interface/BlenderStyleModule.h
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/blender_interface/BlenderTextureManager.h
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/geometry/BBox.h
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/geometry/FastGrid.h
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/geometry/FitCurve.cpp
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/geometry/Grid.h
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/geometry/Noise.h
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/geometry/Polygon.h
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/geometry/SweepLine.h
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/geometry/VecMat.h
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/geometry/normal_cycle.h
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/image/GaussianFilter.h
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/image/Image.h
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/scene_graph/DrawingStyle.h
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/scene_graph/FrsMaterial.h
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/scene_graph/LineRep.h
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/scene_graph/Node.h
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/scene_graph/NodeCamera.h
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/scene_graph/NodeDrawingStyle.h
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/stroke/Module.h
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/stroke/Operators.h
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/stroke/Predicates0D.h
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/stroke/Stroke.h
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/stroke/StrokeRenderer.h
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/stroke/StrokeRep.cpp
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/stroke/StrokeRep.h
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/stroke/StrokeTesselator.h
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/stroke/StyleModule.h
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/system/BaseIterator.h
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/system/BaseObject.h
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/system/Exception.h
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/system/Id.h
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/system/Interpreter.h
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/system/ProgressBar.h
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/system/PseudoNoise.h
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/system/RandGen.h
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/system/RenderMonitor.h
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/system/TimeStamp.h
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/system/TimeUtils.h
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/view_map/BoxGrid.h
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/view_map/FEdgeXDetector.h
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/view_map/Functions1D.h
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/view_map/GridDensityProvider.h
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/view_map/Interface1D.h
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/view_map/OccluderSource.h
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/view_map/SphericalGrid.h
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/view_map/SteerableViewMap.h
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.h
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/view_map/ViewMap.h
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/view_map/ViewMapBuilder.h
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/view_map/ViewMapIO.cpp
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/view_map/ViewMapIterators.h
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/view_map/ViewMapTesselator.h
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/winged_edge/WEdge.h
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/winged_edge/WFillGrid.h
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/winged_edge/WSFillGrid.h
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/winged_edge/WXEdge.h
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.h
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.h
branches/soc-2013-rigid_body_sim/source/blender/gpu/GPU_buffers.h
branches/soc-2013-rigid_body_sim/source/blender/gpu/intern/gpu_buffers.c
branches/soc-2013-rigid_body_sim/source/blender/gpu/intern/gpu_draw.c
branches/soc-2013-rigid_body_sim/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2013-rigid_body_sim/source/blender/imbuf/intern/bmp.c
branches/soc-2013-rigid_body_sim/source/blender/imbuf/intern/colormanagement.c
branches/soc-2013-rigid_body_sim/source/blender/imbuf/intern/indexer.c
branches/soc-2013-rigid_body_sim/source/blender/imbuf/intern/thumbs.c
branches/soc-2013-rigid_body_sim/source/blender/imbuf/intern/util.c
branches/soc-2013-rigid_body_sim/source/blender/makesdna/DNA_ID.h
branches/soc-2013-rigid_body_sim/source/blender/makesdna/DNA_actuator_types.h
branches/soc-2013-rigid_body_sim/source/blender/makesdna/DNA_dynamicpaint_types.h
branches/soc-2013-rigid_body_sim/source/blender/makesdna/DNA_image_types.h
branches/soc-2013-rigid_body_sim/source/blender/makesdna/DNA_mask_types.h
branches/soc-2013-rigid_body_sim/source/blender/makesdna/DNA_mesh_types.h
branches/soc-2013-rigid_body_sim/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2013-rigid_body_sim/source/blender/makesdna/DNA_node_types.h
branches/soc-2013-rigid_body_sim/source/blender/makesdna/DNA_outliner_types.h
branches/soc-2013-rigid_body_sim/source/blender/makesdna/DNA_scene_types.h
branches/soc-2013-rigid_body_sim/source/blender/makesdna/DNA_sound_types.h
branches/soc-2013-rigid_body_sim/source/blender/makesdna/DNA_space_types.h
branches/soc-2013-rigid_body_sim/source/blender/makesdna/DNA_tracking_types.h
branches/soc-2013-rigid_body_sim/source/blender/makesrna/SConscript
branches/soc-2013-rigid_body_sim/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2013-rigid_body_sim/source/blender/makesrna/intern/SConscript
branches/soc-2013-rigid_body_sim/source/blender/makesrna/intern/makesrna.c
branches/soc-2013-rigid_body_sim/source/blender/makesrna/intern/rna_ID.c
branches/soc-2013-rigid_body_sim/source/blender/makesrna/intern/rna_access.c
branches/soc-2013-rigid_body_sim/source/blender/makesrna/intern/rna_actuator.c
branches/soc-2013-rigid_body_sim/source/blender/makesrna/intern/rna_armature.c
branches/soc-2013-rigid_body_sim/source/blender/makesrna/intern/rna_brush.c
branches/soc-2013-rigid_body_sim/source/blender/makesrna/intern/rna_color.c
branches/soc-2013-rigid_body_sim/source/blender/makesrna/intern/rna_curve.c
branches/soc-2013-rigid_body_sim/source/blender/makesrna/intern/rna_define.c
branches/soc-2013-rigid_body_sim/source/blender/makesrna/intern/rna_dynamicpaint.c
branches/soc-2013-rigid_body_sim/source/blender/makesrna/intern/rna_gpencil.c
branches/soc-2013-rigid_body_sim/source/blender/makesrna/intern/rna_internal.h
branches/soc-2013-rigid_body_sim/source/blender/makesrna/intern/rna_mask.c
branches/soc-2013-rigid_body_sim/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2013-rigid_body_sim/source/blender/makesrna/intern/rna_meta.c
branches/soc-2013-rigid_body_sim/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2013-rigid_body_sim/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2013-rigid_body_sim/source/blender/makesrna/intern/rna_object.c
branches/soc-2013-rigid_body_sim/source/blender/makesrna/intern/rna_object_api.c
branches/soc-2013-rigid_body_sim/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2013-rigid_body_sim/source/blender/makesrna/intern/rna_render.c
branches/soc-2013-rigid_body_sim/source/blender/makesrna/intern/rna_scene.c
branches/soc-2013-rigid_body_sim/source/blender/makesrna/intern/rna_tracking.c
branches/soc-2013-rigid_body_sim/source/blender/modifiers/intern/MOD_bevel.c
branches/soc-2013-rigid_body_sim/source/blender/modifiers/intern/MOD_boolean_util.c
branches/soc-2013-rigid_body_sim/source/blender/modifiers/intern/MOD_cloth.c
branches/soc-2013-rigid_body_sim/source/blender/modifiers/intern/MOD_decimate.c
branches/soc-2013-rigid_body_sim/source/blender/modifiers/intern/MOD_edgesplit.c
branches/soc-2013-rigid_body_sim/source/blender/modifiers/intern/MOD_laplaciansmooth.c
branches/soc-2013-rigid_body_sim/source/blender/modifiers/intern/MOD_mirror.c
branches/soc-2013-rigid_body_sim/source/blender/modifiers/intern/MOD_ocean.c
branches/soc-2013-rigid_body_sim/source/blender/modifiers/intern/MOD_simpledeform.c
branches/soc-2013-rigid_body_sim/source/blender/modifiers/intern/MOD_skin.c
branches/soc-2013-rigid_body_sim/source/blender/modifiers/intern/MOD_warp.c
branches/soc-2013-rigid_body_sim/source/blender/modifiers/intern/MOD_weightvg_util.c
branches/soc-2013-rigid_body_sim/source/blender/modifiers/intern/MOD_weightvgedit.c
branches/soc-2013-rigid_body_sim/source/blender/modifiers/intern/MOD_weightvgproximity.c
branches/soc-2013-rigid_body_sim/source/blender/nodes/CMakeLists.txt
branches/soc-2013-rigid_body_sim/source/blender/nodes/NOD_composite.h
branches/soc-2013-rigid_body_sim/source/blender/nodes/NOD_shader.h
branches/soc-2013-rigid_body_sim/source/blender/nodes/NOD_static_types.h
branches/soc-2013-rigid_body_sim/source/blender/nodes/composite/nodes/node_composite_image.c
branches/soc-2013-rigid_body_sim/source/blender/nodes/intern/node_common.c
branches/soc-2013-rigid_body_sim/source/blender/nodes/intern/node_exec.c
branches/soc-2013-rigid_body_sim/source/blender/nodes/shader/nodes/node_shader_light_path.c
branches/soc-2013-rigid_body_sim/source/blender/nodes/shader/nodes/node_shader_math.c
branches/soc-2013-rigid_body_sim/source/blender/nodes/shader/nodes/node_shader_subsurface_scattering.c
branches/soc-2013-rigid_body_sim/source/blender/nodes/texture/node_texture_tree.c
branches/soc-2013-rigid_body_sim/source/blender/nodes/texture/nodes/node_texture_output.c
branches/soc-2013-rigid_body_sim/source/blender/python/bmesh/bmesh_py_ops.c
branches/soc-2013-rigid_body_sim/source/blender/python/bmesh/bmesh_py_types_meshdata.c
branches/soc-2013-rigid_body_sim/source/blender/python/bmesh/bmesh_py_utils.c
branches/soc-2013-rigid_body_sim/source/blender/python/intern/bpy_rna.c
branches/soc-2013-rigid_body_sim/source/blender/quicktime/apple/quicktime_export.c
branches/soc-2013-rigid_body_sim/source/blender/render/intern/include/zbuf.h
branches/soc-2013-rigid_body_sim/source/blender/render/intern/raytrace/rayobject_octree.cpp
branches/soc-2013-rigid_body_sim/source/blender/render/intern/source/bake.c
branches/soc-2013-rigid_body_sim/source/blender/render/intern/source/convertblender.c
branches/soc-2013-rigid_body_sim/source/blender/render/intern/source/envmap.c
branches/soc-2013-rigid_body_sim/source/blender/render/intern/source/external_engine.c
branches/soc-2013-rigid_body_sim/source/blender/render/intern/source/initrender.c
branches/soc-2013-rigid_body_sim/source/blender/render/intern/source/multires_bake.c
branches/soc-2013-rigid_body_sim/source/blender/render/intern/source/occlusion.c
branches/soc-2013-rigid_body_sim/source/blender/render/intern/source/pipeline.c
branches/soc-2013-rigid_body_sim/source/blender/render/intern/source/pointdensity.c
branches/soc-2013-rigid_body_sim/source/blender/render/intern/source/rayshade.c
branches/soc-2013-rigid_body_sim/source/blender/render/intern/source/render_result.c
branches/soc-2013-rigid_body_sim/source/blender/render/intern/source/render_texture.c
branches/soc-2013-rigid_body_sim/source/blender/render/intern/source/shadbuf.c
branches/soc-2013-rigid_body_sim/source/blender/render/intern/source/strand.c
branches/soc-2013-rigid_body_sim/source/blender/render/intern/source/voxeldata.c
branches/soc-2013-rigid_body_sim/source/blender/render/intern/source/zbuf.c
branches/soc-2013-rigid_body_sim/source/blender/windowmanager/WM_api.h
branches/soc-2013-rigid_body_sim/source/blender/windowmanager/intern/wm_draw.c
branches/soc-2013-rigid_body_sim/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2013-rigid_body_sim/source/blender/windowmanager/intern/wm_keymap.c
branches/soc-2013-rigid_body_sim/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2013-rigid_body_sim/source/blender/windowmanager/intern/wm_subwindow.c
branches/soc-2013-rigid_body_sim/source/blender/windowmanager/intern/wm_window.c
branches/soc-2013-rigid_body_sim/source/blender/windowmanager/wm_window.h
branches/soc-2013-rigid_body_sim/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2013-rigid_body_sim/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/soc-2013-rigid_body_sim/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
branches/soc-2013-rigid_body_sim/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
branches/soc-2013-rigid_body_sim/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
branches/soc-2013-rigid_body_sim/source/gameengine/BlenderRoutines/KX_BlenderGL.h
branches/soc-2013-rigid_body_sim/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
branches/soc-2013-rigid_body_sim/source/gameengine/Converter/BL_ActionActuator.cpp
branches/soc-2013-rigid_body_sim/source/gameengine/Converter/BL_ActionActuator.h
branches/soc-2013-rigid_body_sim/source/gameengine/Converter/BL_ArmatureConstraint.cpp
branches/soc-2013-rigid_body_sim/source/gameengine/Converter/BL_ArmatureObject.cpp
branches/soc-2013-rigid_body_sim/source/gameengine/Converter/BL_ArmatureObject.h
branches/soc-2013-rigid_body_sim/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/soc-2013-rigid_body_sim/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/soc-2013-rigid_body_sim/source/gameengine/Converter/KX_ConvertSensors.cpp
branches/soc-2013-rigid_body_sim/source/gameengine/Expressions/FloatValue.cpp
branches/soc-2013-rigid_body_sim/source/gameengine/Expressions/IntValue.cpp
branches/soc-2013-rigid_body_sim/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
branches/soc-2013-rigid_body_sim/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/soc-2013-rigid_body_sim/source/gameengine/GamePlayer/ghost/GPG_Canvas.cpp
branches/soc-2013-rigid_body_sim/source/gameengine/GamePlayer/ghost/GPG_Canvas.h
branches/soc-2013-rigid_body_sim/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2013-rigid_body_sim/source/gameengine/Ketsji/BL_Action.cpp
branches/soc-2013-rigid_body_sim/source/gameengine/Ketsji/BL_Action.h
branches/soc-2013-rigid_body_sim/source/gameengine/Ketsji/BL_ActionManager.cpp
branches/soc-2013-rigid_body_sim/source/gameengine/Ketsji/BL_ActionManager.h
branches/soc-2013-rigid_body_sim/source/gameengine/Ketsji/BL_BlenderShader.h
branches/soc-2013-rigid_body_sim/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/soc-2013-rigid_body_sim/source/gameengine/Ketsji/KX_BlenderMaterial.h
branches/soc-2013-rigid_body_sim/source/gameengine/Ketsji/KX_Camera.cpp
branches/soc-2013-rigid_body_sim/source/gameengine/Ketsji/KX_Camera.h
branches/soc-2013-rigid_body_sim/source/gameengine/Ketsji/KX_Dome.cpp
branches/soc-2013-rigid_body_sim/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2013-rigid_body_sim/source/gameengine/Ketsji/KX_GameObject.h
branches/soc-2013-rigid_body_sim/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/soc-2013-rigid_body_sim/source/gameengine/Ketsji/KX_KetsjiEngine.h
branches/soc-2013-rigid_body_sim/source/gameengine/Ketsji/KX_Light.cpp
branches/soc-2013-rigid_body_sim/source/gameengine/Ketsji/KX_Light.h
branches/soc-2013-rigid_body_sim/source/gameengine/Ketsji/KX_MeshProxy.cpp
branches/soc-2013-rigid_body_sim/source/gameengine/Ketsji/KX_NavMeshObject.cpp
branches/soc-2013-rigid_body_sim/source/gameengine/Ketsji/KX_ObstacleSimulation.cpp
branches/soc-2013-rigid_body_sim/source/gameengine/Ketsji/KX_PolyProxy.h
branches/soc-2013-rigid_body_sim/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2013-rigid_body_sim/source/gameengine/Ketsji/KX_Scene.cpp
branches/soc-2013-rigid_body_sim/source/gameengine/Ketsji/KX_SoundActuator.cpp
branches/soc-2013-rigid_body_sim/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/soc-2013-rigid_body_sim/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
branches/soc-2013-rigid_body_sim/source/gameengine/Rasterizer/RAS_2DFilterManager.h
branches/soc-2013-rigid_body_sim/source/gameengine/Rasterizer/RAS_BucketManager.cpp
branches/soc-2013-rigid_body_sim/source/gameengine/Rasterizer/RAS_ICanvas.h
branches/soc-2013-rigid_body_sim/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageIM.cpp
branches/soc-2013-rigid_body_sim/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVA.cpp
branches/soc-2013-rigid_body_sim/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVBO.cpp
branches/soc-2013-rigid_body_sim/source/gameengine/SceneGraph/SG_Tree.cpp
branches/soc-2013-rigid_body_sim/source/gameengine/VideoTexture/BlendType.h
branches/soc-2013-rigid_body_sim/source/gameengine/VideoTexture/Exception.cpp
branches/soc-2013-rigid_body_sim/source/gameengine/VideoTexture/FilterSource.h
branches/soc-2013-rigid_body_sim/source/gameengine/VideoTexture/ImageMix.h
branches/soc-2013-rigid_body_sim/source/gameengine/VideoTexture/ImageRender.cpp
branches/soc-2013-rigid_body_sim/source/tools/check_style_c.py
Added Paths:
-----------
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/shaders/node_blackbody.osl
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/shaders/node_combine_hsv.osl
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/shaders/node_separate_hsv.osl
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/shaders/node_vector_transform.osl
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/svm/svm_blackbody.h
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/svm/svm_sepcomb_hsv.h
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/svm/svm_vector_transform.h
branches/soc-2013-rigid_body_sim/intern/cycles/render/blackbody.cpp
branches/soc-2013-rigid_body_sim/intern/cycles/render/blackbody.h
branches/soc-2013-rigid_body_sim/release/text/GPL3-license.txt
branches/soc-2013-rigid_body_sim/release/text/jemalloc-license.txt
branches/soc-2013-rigid_body_sim/source/blender/blenlib/BLI_alloca.h
branches/soc-2013-rigid_body_sim/source/blender/blenlib/BLI_linklist_stack.h
branches/soc-2013-rigid_body_sim/source/blender/bmesh/operators/bmo_connect_nonplanar.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/operators/bmo_fill_holes.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/tools/bmesh_edgenet.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/tools/bmesh_edgenet.h
branches/soc-2013-rigid_body_sim/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.cpp
branches/soc-2013-rigid_body_sim/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.h
branches/soc-2013-rigid_body_sim/source/blender/compositor/operations/COM_PlaneTrackCommonOperation.cpp
branches/soc-2013-rigid_body_sim/source/blender/compositor/operations/COM_PlaneTrackCommonOperation.h
branches/soc-2013-rigid_body_sim/source/blender/compositor/operations/COM_PlaneTrackMaskOperation.cpp
branches/soc-2013-rigid_body_sim/source/blender/compositor/operations/COM_PlaneTrackMaskOperation.h
branches/soc-2013-rigid_body_sim/source/blender/compositor/operations/COM_PlaneTrackWarpImageOperation.cpp
branches/soc-2013-rigid_body_sim/source/blender/compositor/operations/COM_PlaneTrackWarpImageOperation.h
branches/soc-2013-rigid_body_sim/source/blender/compositor/operations/COM_SplitOperation.cpp
branches/soc-2013-rigid_body_sim/source/blender/compositor/operations/COM_SplitOperation.h
branches/soc-2013-rigid_body_sim/source/blender/nodes/composite/nodes/node_composite_planetrackdeform.c
branches/soc-2013-rigid_body_sim/source/blender/nodes/shader/nodes/node_shader_blackbody.c
branches/soc-2013-rigid_body_sim/source/blender/nodes/shader/nodes/node_shader_sepcombHSV.c
branches/soc-2013-rigid_body_sim/source/blender/nodes/shader/nodes/node_shader_vectTransform.c
Removed Paths:
-------------
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/BKE_bmesh.h
branches/soc-2013-rigid_body_sim/source/blender/bmesh/tools/BME_bevel.c
branches/soc-2013-rigid_body_sim/source/blender/compositor/operations/COM_SplitViewerOperation.cpp
branches/soc-2013-rigid_body_sim/source/blender/compositor/operations/COM_SplitViewerOperation.h
branches/soc-2013-rigid_body_sim/source/blender/compositor/operations/COM_ViewerBaseOperation.cpp
branches/soc-2013-rigid_body_sim/source/blender/compositor/operations/COM_ViewerBaseOperation.h
Property Changed:
----------------
branches/soc-2013-rigid_body_sim/
branches/soc-2013-rigid_body_sim/source/blender/editors/interface/interface.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_outliner/
Property changes on: branches/soc-2013-rigid_body_sim
___________________________________________________________________
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
/branches/soc-2013-depsgraph_mt:57516
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57395-57521,57525-57642,57644-57984,57986-57990,57992-58488
+ /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
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57395-57521,57525-57642,57644-57984,57986-57990,57992-58488,58495-59227
Modified: branches/soc-2013-rigid_body_sim/CMakeLists.txt
===================================================================
--- branches/soc-2013-rigid_body_sim/CMakeLists.txt 2013-08-18 11:44:51 UTC (rev 59228)
+++ branches/soc-2013-rigid_body_sim/CMakeLists.txt 2013-08-18 12:28:32 UTC (rev 59229)
@@ -416,6 +416,10 @@
set(WITH_HEADLESS ON)
endif()
+if(NOT WITH_PYTHON)
+ set(WITH_CYCLES OFF)
+endif()
+
# enable boost for cycles, booleans, audaspace or i18n
# otherwise if the user disabled
if(NOT WITH_BOOST)
Modified: branches/soc-2013-rigid_body_sim/build_files/build_environment/install_deps.sh
===================================================================
--- branches/soc-2013-rigid_body_sim/build_files/build_environment/install_deps.sh 2013-08-18 11:44:51 UTC (rev 59228)
+++ branches/soc-2013-rigid_body_sim/build_files/build_environment/install_deps.sh 2013-08-18 12:28:32 UTC (rev 59229)
@@ -237,6 +237,7 @@
# Version??
OPENCOLLADA_VERSION="1.3"
OPENCOLLADA_SOURCE="https://github.com/KhronosGroup/OpenCOLLADA.git"
+OPENCOLLADA_REPO_UID="828b60384552b83e55d2af7055f07d2c40b4d3f4"
OPENCOLLADA_FORCE_REBUILD=false
OPENCOLLADA_SKIP=false
@@ -1632,7 +1633,7 @@
compile_OpenCOLLADA() {
# To be changed each time we make edits that would modify the compiled results!
- opencollada_magic=6
+ opencollada_magic=7
_init_opencollada
# Clean install if needed!
@@ -1657,7 +1658,7 @@
git pull origin master
# Stick to same rev as windows' libs...
- git checkout e886e196673222f2f4bc32b936dc96419fff815f
+ git checkout $OPENCOLLADA_REPO_UID
git reset --hard
# Always refresh the whole build!
Modified: branches/soc-2013-rigid_body_sim/build_files/cmake/cmake_static_check_cppcheck.py
===================================================================
--- branches/soc-2013-rigid_body_sim/build_files/cmake/cmake_static_check_cppcheck.py 2013-08-18 11:44:51 UTC (rev 59228)
+++ branches/soc-2013-rigid_body_sim/build_files/cmake/cmake_static_check_cppcheck.py 2013-08-18 12:28:32 UTC (rev 59229)
@@ -52,6 +52,7 @@
def main():
source_info = project_source_info.build_info(ignore_prefix_list=CHECKER_IGNORE_PREFIX)
+ source_defines = project_source_info.build_defines_as_args()
check_commands = []
for c, inc_dirs, defs in source_info:
@@ -59,7 +60,8 @@
CHECKER_ARGS +
[c] +
[("-I%s" % i) for i in inc_dirs] +
- [("-D%s" % d) for d in defs]
+ [("-D%s" % d) for d in defs] +
+ source_defines
)
check_commands.append((c, cmd))
Modified: branches/soc-2013-rigid_body_sim/build_files/cmake/cmake_static_check_smatch.py
===================================================================
--- branches/soc-2013-rigid_body_sim/build_files/cmake/cmake_static_check_smatch.py 2013-08-18 11:44:51 UTC (rev 59228)
+++ branches/soc-2013-rigid_body_sim/build_files/cmake/cmake_static_check_smatch.py 2013-08-18 12:28:32 UTC (rev 59229)
@@ -44,6 +44,7 @@
def main():
source_info = project_source_info.build_info(use_cxx=False, ignore_prefix_list=CHECKER_IGNORE_PREFIX)
+ source_defines = project_source_info.build_defines_as_args()
check_commands = []
for c, inc_dirs, defs in source_info:
@@ -52,7 +53,8 @@
CHECKER_ARGS +
[c] +
[("-I%s" % i) for i in inc_dirs] +
- [("-D%s" % d) for d in defs]
+ [("-D%s" % d) for d in defs] +
+ source_defines
)
check_commands.append((c, cmd))
Modified: branches/soc-2013-rigid_body_sim/build_files/cmake/cmake_static_check_sparse.py
===================================================================
--- branches/soc-2013-rigid_body_sim/build_files/cmake/cmake_static_check_sparse.py 2013-08-18 11:44:51 UTC (rev 59228)
+++ branches/soc-2013-rigid_body_sim/build_files/cmake/cmake_static_check_sparse.py 2013-08-18 12:28:32 UTC (rev 59229)
@@ -42,6 +42,7 @@
def main():
source_info = project_source_info.build_info(use_cxx=False, ignore_prefix_list=CHECKER_IGNORE_PREFIX)
+ source_defines = project_source_info.build_defines_as_args()
check_commands = []
for c, inc_dirs, defs in source_info:
@@ -50,7 +51,8 @@
CHECKER_ARGS +
[c] +
[("-I%s" % i) for i in inc_dirs] +
- [("-D%s" % d) for d in defs]
+ [("-D%s" % d) for d in defs] +
+ source_defines
)
check_commands.append((c, cmd))
Modified: branches/soc-2013-rigid_body_sim/build_files/cmake/project_source_info.py
===================================================================
--- branches/soc-2013-rigid_body_sim/build_files/cmake/project_source_info.py 2013-08-18 11:44:51 UTC (rev 59228)
+++ branches/soc-2013-rigid_body_sim/build_files/cmake/project_source_info.py 2013-08-18 12:28:32 UTC (rev 59229)
@@ -171,6 +171,26 @@
return source
+def build_defines_as_source():
+ """
+ Returns a string formatted as an include:
+ '#defines A=B\n#define....'
+ """
+ import subprocess
+ # works for both gcc and clang
+ cmd = (cmake_cache_var("CMAKE_C_COMPILER"), "-dM", "-E", "-")
+ return subprocess.Popen(cmd,
+ stdout=subprocess.PIPE,
+ stdin=subprocess.DEVNULL,
+ ).stdout.read().strip().decode('ascii')
+
+
+def build_defines_as_args():
+ return [("-D" + "=".join(l.split(maxsplit=2)[1:]))
+ for l in build_defines_as_source().split("\n")
+ if l.startswith('#define')]
+
+
# could be moved elsewhere!, this just happens to be used by scripts that also
# use this module.
def queue_processes(process_funcs, job_total=-1):
Modified: branches/soc-2013-rigid_body_sim/build_files/scons/tools/Blender.py
===================================================================
--- branches/soc-2013-rigid_body_sim/build_files/scons/tools/Blender.py 2013-08-18 11:44:51 UTC (rev 59228)
+++ branches/soc-2013-rigid_body_sim/build_files/scons/tools/Blender.py 2013-08-18 12:28:32 UTC (rev 59229)
@@ -151,12 +151,6 @@
libincs += Split(lenv['BF_JACK_LIBPATH'])
if lenv['WITH_BF_SNDFILE']:
libincs += Split(lenv['BF_SNDFILE_LIBPATH'])
- if lenv['WITH_BF_OPENEXR']:
- libincs += Split(lenv['BF_OPENEXR_LIBPATH'])
- if lenv['WITH_BF_STATICOPENEXR']:
- statlibs += Split(lenv['BF_OPENEXR_LIB_STATIC'])
- if lenv['WITH_BF_ZLIB'] and lenv['WITH_BF_STATICZLIB']:
- statlibs += Split(lenv['BF_ZLIB_LIB_STATIC'])
if lenv['WITH_BF_TIFF']:
libincs += Split(lenv['BF_TIFF_LIBPATH'])
if lenv['WITH_BF_STATICTIFF']:
@@ -212,6 +206,12 @@
libincs += Split(lenv['BF_OIIO_LIBPATH'])
if lenv['WITH_BF_STATICOIIO']:
statlibs += Split(lenv['BF_OIIO_LIB_STATIC'])
+ if lenv['WITH_BF_OPENEXR']:
+ libincs += Split(lenv['BF_OPENEXR_LIBPATH'])
+ if lenv['WITH_BF_STATICOPENEXR']:
+ statlibs += Split(lenv['BF_OPENEXR_LIB_STATIC'])
+ if lenv['WITH_BF_ZLIB'] and lenv['WITH_BF_STATICZLIB']:
+ statlibs += Split(lenv['BF_ZLIB_LIB_STATIC'])
if lenv['WITH_BF_OCIO']:
libincs += Split(lenv['BF_OCIO_LIBPATH'])
Modified: branches/soc-2013-rigid_body_sim/doc/python_api/rst/bge.logic.rst
===================================================================
--- branches/soc-2013-rigid_body_sim/doc/python_api/rst/bge.logic.rst 2013-08-18 11:44:51 UTC (rev 59228)
+++ branches/soc-2013-rigid_body_sim/doc/python_api/rst/bge.logic.rst 2013-08-18 12:28:32 UTC (rev 59229)
@@ -362,9 +362,9 @@
Use / as directory separator in path
You can use '//' at the start of the string to define a relative path;
- Blender replaces that string by the directory of the startup .blend or runtime file
- to make a full path name (doesn't change during the game, even if you load other .blend).
- The function also converts the directory separator to the local file system format.
+ Blender replaces that string by the directory of the current .blend or runtime file
+ to make a full path name. The function also converts the directory separator to
+ the local file system format.
:arg path: The path string to be converted/expanded.
:type path: string
@@ -1114,7 +1114,20 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list