[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60561] branches/vgroup_modifiers: svn merge -r 58000:59000 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Bastien Montagne
montagne29 at wanadoo.fr
Sat Oct 5 12:28:57 CEST 2013
Revision: 60561
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60561
Author: mont29
Date: 2013-10-05 10:28:56 +0000 (Sat, 05 Oct 2013)
Log Message:
-----------
svn merge -r 58000:59000 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Modified Paths:
--------------
branches/vgroup_modifiers/CMakeLists.txt
branches/vgroup_modifiers/build_files/cmake/Modules/FindPythonLibsUnix.cmake
branches/vgroup_modifiers/build_files/cmake/macros.cmake
branches/vgroup_modifiers/doc/python_api/rst/bge.render.rst
branches/vgroup_modifiers/doc/python_api/rst/bge_types/bge.types.KX_Camera.rst
branches/vgroup_modifiers/extern/libmv/libmv-capi.cc
branches/vgroup_modifiers/extern/libmv/libmv-capi.h
branches/vgroup_modifiers/extern/libmv/libmv-capi_stub.cc
branches/vgroup_modifiers/extern/libredcode/codec.c
branches/vgroup_modifiers/extern/libredcode/codec.h
branches/vgroup_modifiers/extern/libredcode/debayer.c
branches/vgroup_modifiers/extern/libredcode/debayer.h
branches/vgroup_modifiers/extern/libredcode/format.c
branches/vgroup_modifiers/extern/libredcode/format.h
branches/vgroup_modifiers/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
branches/vgroup_modifiers/intern/bsp/CMakeLists.txt
branches/vgroup_modifiers/intern/cycles/CMakeLists.txt
branches/vgroup_modifiers/intern/cycles/app/cycles_test.cpp
branches/vgroup_modifiers/intern/cycles/blender/addon/__init__.py
branches/vgroup_modifiers/intern/cycles/blender/addon/presets.py
branches/vgroup_modifiers/intern/cycles/blender/addon/properties.py
branches/vgroup_modifiers/intern/cycles/blender/addon/ui.py
branches/vgroup_modifiers/intern/cycles/blender/blender_mesh.cpp
branches/vgroup_modifiers/intern/cycles/blender/blender_object.cpp
branches/vgroup_modifiers/intern/cycles/blender/blender_session.cpp
branches/vgroup_modifiers/intern/cycles/blender/blender_shader.cpp
branches/vgroup_modifiers/intern/cycles/blender/blender_sync.cpp
branches/vgroup_modifiers/intern/cycles/blender/blender_sync.h
branches/vgroup_modifiers/intern/cycles/bvh/bvh.h
branches/vgroup_modifiers/intern/cycles/device/device_cpu.cpp
branches/vgroup_modifiers/intern/cycles/kernel/CMakeLists.txt
branches/vgroup_modifiers/intern/cycles/kernel/closure/bsdf.h
branches/vgroup_modifiers/intern/cycles/kernel/kernel_accumulate.h
branches/vgroup_modifiers/intern/cycles/kernel/kernel_camera.h
branches/vgroup_modifiers/intern/cycles/kernel/kernel_displace.h
branches/vgroup_modifiers/intern/cycles/kernel/kernel_emission.h
branches/vgroup_modifiers/intern/cycles/kernel/kernel_light.h
branches/vgroup_modifiers/intern/cycles/kernel/kernel_object.h
branches/vgroup_modifiers/intern/cycles/kernel/kernel_passes.h
branches/vgroup_modifiers/intern/cycles/kernel/kernel_path.h
branches/vgroup_modifiers/intern/cycles/kernel/kernel_random.h
branches/vgroup_modifiers/intern/cycles/kernel/kernel_shader.h
branches/vgroup_modifiers/intern/cycles/kernel/kernel_subsurface.h
branches/vgroup_modifiers/intern/cycles/kernel/kernel_types.h
branches/vgroup_modifiers/intern/cycles/kernel/osl/osl_globals.h
branches/vgroup_modifiers/intern/cycles/kernel/osl/osl_services.cpp
branches/vgroup_modifiers/intern/cycles/kernel/osl/osl_services.h
branches/vgroup_modifiers/intern/cycles/kernel/osl/osl_shader.cpp
branches/vgroup_modifiers/intern/cycles/kernel/shaders/CMakeLists.txt
branches/vgroup_modifiers/intern/cycles/kernel/shaders/node_light_path.osl
branches/vgroup_modifiers/intern/cycles/kernel/svm/svm.h
branches/vgroup_modifiers/intern/cycles/kernel/svm/svm_fresnel.h
branches/vgroup_modifiers/intern/cycles/kernel/svm/svm_light_path.h
branches/vgroup_modifiers/intern/cycles/kernel/svm/svm_types.h
branches/vgroup_modifiers/intern/cycles/render/CMakeLists.txt
branches/vgroup_modifiers/intern/cycles/render/buffers.cpp
branches/vgroup_modifiers/intern/cycles/render/film.cpp
branches/vgroup_modifiers/intern/cycles/render/graph.cpp
branches/vgroup_modifiers/intern/cycles/render/graph.h
branches/vgroup_modifiers/intern/cycles/render/light.cpp
branches/vgroup_modifiers/intern/cycles/render/mesh.cpp
branches/vgroup_modifiers/intern/cycles/render/mesh.h
branches/vgroup_modifiers/intern/cycles/render/nodes.cpp
branches/vgroup_modifiers/intern/cycles/render/nodes.h
branches/vgroup_modifiers/intern/cycles/render/session.cpp
branches/vgroup_modifiers/intern/cycles/render/shader.cpp
branches/vgroup_modifiers/intern/cycles/render/shader.h
branches/vgroup_modifiers/intern/cycles/render/svm.cpp
branches/vgroup_modifiers/intern/cycles/render/tables.cpp
branches/vgroup_modifiers/intern/cycles/util/util_math.h
branches/vgroup_modifiers/intern/cycles/util/util_task.cpp
branches/vgroup_modifiers/intern/cycles/util/util_task.h
branches/vgroup_modifiers/intern/cycles/util/util_view.cpp
branches/vgroup_modifiers/intern/dualcon/dualcon.h
branches/vgroup_modifiers/intern/dualcon/intern/GeoCommon.h
branches/vgroup_modifiers/intern/dualcon/intern/MemoryAllocator.h
branches/vgroup_modifiers/intern/dualcon/intern/ModelReader.h
branches/vgroup_modifiers/intern/dualcon/intern/Projections.cpp
branches/vgroup_modifiers/intern/dualcon/intern/Projections.h
branches/vgroup_modifiers/intern/dualcon/intern/Queue.h
branches/vgroup_modifiers/intern/dualcon/intern/cubes.h
branches/vgroup_modifiers/intern/dualcon/intern/dualcon_c_api.cpp
branches/vgroup_modifiers/intern/dualcon/intern/manifold_table.h
branches/vgroup_modifiers/intern/dualcon/intern/marching_cubes_table.h
branches/vgroup_modifiers/intern/dualcon/intern/octree.cpp
branches/vgroup_modifiers/intern/dualcon/intern/octree.h
branches/vgroup_modifiers/intern/ghost/CMakeLists.txt
branches/vgroup_modifiers/intern/ghost/GHOST_C-api.h
branches/vgroup_modifiers/intern/ghost/GHOST_IWindow.h
branches/vgroup_modifiers/intern/ghost/SConscript
branches/vgroup_modifiers/intern/ghost/intern/GHOST_C-api.cpp
branches/vgroup_modifiers/intern/ghost/intern/GHOST_DropTargetWin32.h
branches/vgroup_modifiers/intern/ghost/intern/GHOST_DropTargetX11.cpp
branches/vgroup_modifiers/intern/ghost/intern/GHOST_DropTargetX11.h
branches/vgroup_modifiers/intern/ghost/intern/GHOST_SystemCarbon.cpp
branches/vgroup_modifiers/intern/ghost/intern/GHOST_SystemX11.cpp
branches/vgroup_modifiers/intern/ghost/intern/GHOST_SystemX11.h
branches/vgroup_modifiers/intern/ghost/intern/GHOST_Window.h
branches/vgroup_modifiers/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/vgroup_modifiers/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/vgroup_modifiers/intern/ghost/intern/GHOST_WindowWin32.h
branches/vgroup_modifiers/intern/ghost/intern/GHOST_WindowX11.cpp
branches/vgroup_modifiers/intern/ghost/intern/GHOST_WindowX11.h
branches/vgroup_modifiers/intern/guardedalloc/MEM_guardedalloc.h
branches/vgroup_modifiers/intern/guardedalloc/intern/mallocn.c
branches/vgroup_modifiers/intern/iksolver/CMakeLists.txt
branches/vgroup_modifiers/intern/mikktspace/mikktspace.c
branches/vgroup_modifiers/intern/opencl/OCL_opencl.h
branches/vgroup_modifiers/intern/opencl/intern/OCL_opencl.c
branches/vgroup_modifiers/intern/opencl/intern/clew.c
branches/vgroup_modifiers/intern/rigidbody/rb_bullet_api.cpp
branches/vgroup_modifiers/intern/smoke/CMakeLists.txt
branches/vgroup_modifiers/intern/tools/credits_svn_gen.py
branches/vgroup_modifiers/release/datafiles/LICENSE-droidsans.ttf.txt
branches/vgroup_modifiers/release/datafiles/fonts/droidsans.ttf.gz
branches/vgroup_modifiers/release/datafiles/splash.png
branches/vgroup_modifiers/release/scripts/freestyle/style_modules/ChainingIterators.py
branches/vgroup_modifiers/release/scripts/freestyle/style_modules/parameter_editor.py
branches/vgroup_modifiers/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
branches/vgroup_modifiers/release/scripts/modules/bpy_extras/anim_utils.py
branches/vgroup_modifiers/release/scripts/presets/keyconfig/3dsmax.py
branches/vgroup_modifiers/release/scripts/presets/keyconfig/maya.py
branches/vgroup_modifiers/release/scripts/startup/bl_operators/anim.py
branches/vgroup_modifiers/release/scripts/startup/bl_operators/node.py
branches/vgroup_modifiers/release/scripts/startup/bl_operators/wm.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/__init__.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_data_curve.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_game.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_mask_common.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_object.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_image.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_sequencer.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_userpref.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_view3d.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/vgroup_modifiers/release/scripts/startup/nodeitems_builtins.py
branches/vgroup_modifiers/release/scripts/templates_py/custom_nodes.py
branches/vgroup_modifiers/source/blender/avi/intern/avi.c
branches/vgroup_modifiers/source/blender/avi/intern/avi_mjpeg.c
branches/vgroup_modifiers/source/blender/avi/intern/avi_options.c
branches/vgroup_modifiers/source/blender/blenfont/BLF_api.h
branches/vgroup_modifiers/source/blender/blenfont/intern/blf_font.c
branches/vgroup_modifiers/source/blender/blenkernel/BKE_DerivedMesh.h
branches/vgroup_modifiers/source/blender/blenkernel/BKE_blender.h
branches/vgroup_modifiers/source/blender/blenkernel/BKE_context.h
branches/vgroup_modifiers/source/blender/blenkernel/BKE_curve.h
branches/vgroup_modifiers/source/blender/blenkernel/BKE_dynamicpaint.h
branches/vgroup_modifiers/source/blender/blenkernel/BKE_fcurve.h
branches/vgroup_modifiers/source/blender/blenkernel/BKE_global.h
branches/vgroup_modifiers/source/blender/blenkernel/BKE_key.h
branches/vgroup_modifiers/source/blender/blenkernel/BKE_mesh.h
branches/vgroup_modifiers/source/blender/blenkernel/BKE_node.h
branches/vgroup_modifiers/source/blender/blenkernel/BKE_object.h
branches/vgroup_modifiers/source/blender/blenkernel/BKE_pbvh.h
branches/vgroup_modifiers/source/blender/blenkernel/BKE_scene.h
branches/vgroup_modifiers/source/blender/blenkernel/BKE_sequencer.h
branches/vgroup_modifiers/source/blender/blenkernel/BKE_text.h
branches/vgroup_modifiers/source/blender/blenkernel/CMakeLists.txt
branches/vgroup_modifiers/source/blender/blenkernel/intern/DerivedMesh.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/action.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/anim.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/anim_sys.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/armature.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/blender.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/boids.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/brush.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/camera.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/cdderivedmesh.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/cloth.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/colortools.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/constraint.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/context.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/curve.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/customdata.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/deform.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/depsgraph.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/dynamicpaint.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/editderivedmesh.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/editmesh.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/effect.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/fcurve.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/fmodifier.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/font.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/idprop.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/image.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/image_gen.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/implicit.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/ipo.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/key.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/lattice.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/library.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/linestyle.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/mask.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/mask_rasterize.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/material.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/mball.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/mesh.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/mesh_validate.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/modifier.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/modifiers_bmesh.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/movieclip.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/multires.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/node.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/object.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/packedFile.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/paint.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/particle.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/particle_system.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/pbvh.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/pbvh_bmesh.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/pbvh_intern.h
branches/vgroup_modifiers/source/blender/blenkernel/intern/pointcache.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/property.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/rigidbody.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/scene.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/sequencer.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/shrinkwrap.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/sketch.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/smoke.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/subsurf_ccg.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/text.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/texture.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/tracking.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/unit.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/writeffmpeg.c
branches/vgroup_modifiers/source/blender/blenlib/BLI_array.h
branches/vgroup_modifiers/source/blender/blenlib/BLI_bitmap.h
branches/vgroup_modifiers/source/blender/blenlib/BLI_buffer.h
branches/vgroup_modifiers/source/blender/blenlib/BLI_ghash.h
branches/vgroup_modifiers/source/blender/blenlib/BLI_listbase.h
branches/vgroup_modifiers/source/blender/blenlib/BLI_math_geom.h
branches/vgroup_modifiers/source/blender/blenlib/BLI_math_matrix.h
branches/vgroup_modifiers/source/blender/blenlib/BLI_math_vector.h
branches/vgroup_modifiers/source/blender/blenlib/BLI_memarena.h
branches/vgroup_modifiers/source/blender/blenlib/BLI_mempool.h
branches/vgroup_modifiers/source/blender/blenlib/BLI_path_util.h
branches/vgroup_modifiers/source/blender/blenlib/BLI_string.h
branches/vgroup_modifiers/source/blender/blenlib/BLI_string_utf8.h
branches/vgroup_modifiers/source/blender/blenlib/BLI_threads.h
branches/vgroup_modifiers/source/blender/blenlib/BLI_utildefines.h
branches/vgroup_modifiers/source/blender/blenlib/CMakeLists.txt
branches/vgroup_modifiers/source/blender/blenlib/intern/BLI_ghash.c
branches/vgroup_modifiers/source/blender/blenlib/intern/BLI_heap.c
branches/vgroup_modifiers/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/vgroup_modifiers/source/blender/blenlib/intern/BLI_mempool.c
branches/vgroup_modifiers/source/blender/blenlib/intern/DLRB_tree.c
branches/vgroup_modifiers/source/blender/blenlib/intern/buffer.c
branches/vgroup_modifiers/source/blender/blenlib/intern/fileops.c
branches/vgroup_modifiers/source/blender/blenlib/intern/listbase.c
branches/vgroup_modifiers/source/blender/blenlib/intern/math_color.c
branches/vgroup_modifiers/source/blender/blenlib/intern/math_geom.c
branches/vgroup_modifiers/source/blender/blenlib/intern/math_matrix.c
branches/vgroup_modifiers/source/blender/blenlib/intern/math_rotation.c
branches/vgroup_modifiers/source/blender/blenlib/intern/math_vector.c
branches/vgroup_modifiers/source/blender/blenlib/intern/math_vector_inline.c
branches/vgroup_modifiers/source/blender/blenlib/intern/noise.c
branches/vgroup_modifiers/source/blender/blenlib/intern/path_util.c
branches/vgroup_modifiers/source/blender/blenlib/intern/scanfill.c
branches/vgroup_modifiers/source/blender/blenlib/intern/storage.c
branches/vgroup_modifiers/source/blender/blenlib/intern/string.c
branches/vgroup_modifiers/source/blender/blenlib/intern/string_utf8.c
branches/vgroup_modifiers/source/blender/blenlib/intern/threads.c
branches/vgroup_modifiers/source/blender/blenlib/intern/voronoi.c
branches/vgroup_modifiers/source/blender/blenloader/intern/readfile.c
branches/vgroup_modifiers/source/blender/blenloader/intern/runtime.c
branches/vgroup_modifiers/source/blender/blenloader/intern/versioning_legacy.c
branches/vgroup_modifiers/source/blender/blenloader/intern/writefile.c
branches/vgroup_modifiers/source/blender/bmesh/CMakeLists.txt
branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_construct.c
branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_construct.h
branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_core.c
branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_core.h
branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_edgeloop.c
branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_interp.c
branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_marking.c
branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_mesh.c
branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_mesh_conv.c
branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_mods.c
branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_opdefines.c
branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_operators.c
branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_operators.h
branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_operators_private.h
branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_polygon.c
branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_polygon.h
branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_private.h
branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_queries.c
branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_queries.h
branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_structure.c
branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_structure.h
branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_walkers.c
branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_beautify.c
branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_bridge.c
branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_connect.c
branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_connect_pair.c
branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_create.c
branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_dissolve.c
branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_dupe.c
branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_edgenet.c
branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_extrude.c
branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_fill_edgeloop.c
branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_inset.c
branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_join_triangles.c
branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_similar.c
branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_smooth_laplacian.c
branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_subdivide.c
branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_subdivide_edgering.c
branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_utils.c
branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_wireframe.c
branches/vgroup_modifiers/source/blender/bmesh/tools/bmesh_bevel.c
branches/vgroup_modifiers/source/blender/bmesh/tools/bmesh_decimate.h
branches/vgroup_modifiers/source/blender/bmesh/tools/bmesh_decimate_collapse.c
branches/vgroup_modifiers/source/blender/bmesh/tools/bmesh_decimate_dissolve.c
branches/vgroup_modifiers/source/blender/bmesh/tools/bmesh_triangulate.c
branches/vgroup_modifiers/source/blender/collada/AnimationImporter.cpp
branches/vgroup_modifiers/source/blender/collada/ArmatureImporter.cpp
branches/vgroup_modifiers/source/blender/collada/ArmatureImporter.h
branches/vgroup_modifiers/source/blender/collada/ControllerExporter.cpp
branches/vgroup_modifiers/source/blender/collada/DocumentImporter.cpp
branches/vgroup_modifiers/source/blender/collada/MeshImporter.cpp
branches/vgroup_modifiers/source/blender/collada/SkinInfo.cpp
branches/vgroup_modifiers/source/blender/collada/TransformReader.cpp
branches/vgroup_modifiers/source/blender/collada/TransformWriter.cpp
branches/vgroup_modifiers/source/blender/collada/collada_internal.cpp
branches/vgroup_modifiers/source/blender/collada/collada_internal.h
branches/vgroup_modifiers/source/blender/collada/collada_utils.cpp
branches/vgroup_modifiers/source/blender/collada/collada_utils.h
branches/vgroup_modifiers/source/blender/compositor/CMakeLists.txt
branches/vgroup_modifiers/source/blender/compositor/COM_compositor.h
branches/vgroup_modifiers/source/blender/compositor/intern/COM_ExecutionGroup.cpp
branches/vgroup_modifiers/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
branches/vgroup_modifiers/source/blender/compositor/intern/COM_SocketReader.h
branches/vgroup_modifiers/source/blender/compositor/intern/COM_WorkScheduler.cpp
branches/vgroup_modifiers/source/blender/compositor/nodes/COM_ChromaMatteNode.cpp
branches/vgroup_modifiers/source/blender/compositor/nodes/COM_GroupNode.cpp
branches/vgroup_modifiers/source/blender/compositor/nodes/COM_RenderLayersNode.cpp
branches/vgroup_modifiers/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
branches/vgroup_modifiers/source/blender/compositor/nodes/COM_TextureNode.cpp
branches/vgroup_modifiers/source/blender/compositor/nodes/COM_ZCombineNode.cpp
branches/vgroup_modifiers/source/blender/compositor/operations/COM_BlurBaseOperation.cpp
branches/vgroup_modifiers/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cpp
branches/vgroup_modifiers/source/blender/compositor/operations/COM_ConvertColorToBWOperation.cpp
branches/vgroup_modifiers/source/blender/compositor/operations/COM_ConvertColorToValueProg.cpp
branches/vgroup_modifiers/source/blender/compositor/operations/COM_KeyingScreenOperation.h
branches/vgroup_modifiers/source/blender/compositor/operations/COM_MathBaseOperation.cpp
branches/vgroup_modifiers/source/blender/compositor/operations/COM_MixAddOperation.cpp
branches/vgroup_modifiers/source/blender/compositor/operations/COM_MixBurnOperation.cpp
branches/vgroup_modifiers/source/blender/compositor/operations/COM_MixColorOperation.cpp
branches/vgroup_modifiers/source/blender/compositor/operations/COM_MixDarkenOperation.cpp
branches/vgroup_modifiers/source/blender/compositor/operations/COM_MixDifferenceOperation.cpp
branches/vgroup_modifiers/source/blender/compositor/operations/COM_MixDivideOperation.cpp
branches/vgroup_modifiers/source/blender/compositor/operations/COM_MixDodgeOperation.cpp
branches/vgroup_modifiers/source/blender/compositor/operations/COM_MixHueOperation.cpp
branches/vgroup_modifiers/source/blender/compositor/operations/COM_MixLightenOperation.cpp
branches/vgroup_modifiers/source/blender/compositor/operations/COM_MixLinearLightOperation.cpp
branches/vgroup_modifiers/source/blender/compositor/operations/COM_MixOverlayOperation.cpp
branches/vgroup_modifiers/source/blender/compositor/operations/COM_MixSaturationOperation.cpp
branches/vgroup_modifiers/source/blender/compositor/operations/COM_MixScreenOperation.cpp
branches/vgroup_modifiers/source/blender/compositor/operations/COM_MixSoftLightOperation.cpp
branches/vgroup_modifiers/source/blender/compositor/operations/COM_MixSubtractOperation.cpp
branches/vgroup_modifiers/source/blender/compositor/operations/COM_MixValueOperation.cpp
branches/vgroup_modifiers/source/blender/compositor/operations/COM_TextureOperation.cpp
branches/vgroup_modifiers/source/blender/compositor/operations/COM_TextureOperation.h
branches/vgroup_modifiers/source/blender/compositor/operations/COM_TrackPositionOperation.h
branches/vgroup_modifiers/source/blender/compositor/operations/COM_ViewerOperation.cpp
branches/vgroup_modifiers/source/blender/compositor/operations/COM_ViewerOperation.h
branches/vgroup_modifiers/source/blender/editors/animation/anim_channels_defines.c
branches/vgroup_modifiers/source/blender/editors/animation/anim_channels_edit.c
branches/vgroup_modifiers/source/blender/editors/animation/anim_draw.c
branches/vgroup_modifiers/source/blender/editors/animation/anim_filter.c
branches/vgroup_modifiers/source/blender/editors/animation/anim_intern.h
branches/vgroup_modifiers/source/blender/editors/animation/anim_markers.c
branches/vgroup_modifiers/source/blender/editors/animation/drivers.c
branches/vgroup_modifiers/source/blender/editors/animation/fmodifier_ui.c
branches/vgroup_modifiers/source/blender/editors/animation/keyframes_draw.c
branches/vgroup_modifiers/source/blender/editors/animation/keyframes_general.c
branches/vgroup_modifiers/source/blender/editors/animation/keyframing.c
branches/vgroup_modifiers/source/blender/editors/animation/keyingsets.c
branches/vgroup_modifiers/source/blender/editors/armature/armature_edit.c
branches/vgroup_modifiers/source/blender/editors/armature/armature_intern.h
branches/vgroup_modifiers/source/blender/editors/armature/armature_ops.c
branches/vgroup_modifiers/source/blender/editors/armature/armature_relations.c
branches/vgroup_modifiers/source/blender/editors/armature/armature_select.c
branches/vgroup_modifiers/source/blender/editors/armature/armature_skinning.c
branches/vgroup_modifiers/source/blender/editors/armature/armature_utils.c
branches/vgroup_modifiers/source/blender/editors/armature/pose_select.c
branches/vgroup_modifiers/source/blender/editors/armature/pose_slide.c
branches/vgroup_modifiers/source/blender/editors/armature/pose_transform.c
branches/vgroup_modifiers/source/blender/editors/armature/pose_utils.c
branches/vgroup_modifiers/source/blender/editors/curve/curve_intern.h
branches/vgroup_modifiers/source/blender/editors/curve/curve_ops.c
branches/vgroup_modifiers/source/blender/editors/curve/editcurve.c
branches/vgroup_modifiers/source/blender/editors/curve/editfont.c
branches/vgroup_modifiers/source/blender/editors/gpencil/drawgpencil.c
branches/vgroup_modifiers/source/blender/editors/gpencil/gpencil_edit.c
branches/vgroup_modifiers/source/blender/editors/gpencil/gpencil_paint.c
branches/vgroup_modifiers/source/blender/editors/include/BIF_glutil.h
branches/vgroup_modifiers/source/blender/editors/include/ED_armature.h
branches/vgroup_modifiers/source/blender/editors/include/ED_mesh.h
branches/vgroup_modifiers/source/blender/editors/include/ED_render.h
branches/vgroup_modifiers/source/blender/editors/include/UI_interface.h
branches/vgroup_modifiers/source/blender/editors/interface/interface.c
branches/vgroup_modifiers/source/blender/editors/interface/interface_handlers.c
branches/vgroup_modifiers/source/blender/editors/interface/interface_intern.h
branches/vgroup_modifiers/source/blender/editors/interface/interface_layout.c
branches/vgroup_modifiers/source/blender/editors/interface/interface_ops.c
branches/vgroup_modifiers/source/blender/editors/interface/interface_panel.c
branches/vgroup_modifiers/source/blender/editors/interface/interface_regions.c
branches/vgroup_modifiers/source/blender/editors/interface/interface_templates.c
branches/vgroup_modifiers/source/blender/editors/interface/interface_widgets.c
branches/vgroup_modifiers/source/blender/editors/interface/resources.c
branches/vgroup_modifiers/source/blender/editors/interface/view2d.c
branches/vgroup_modifiers/source/blender/editors/interface/view2d_ops.c
branches/vgroup_modifiers/source/blender/editors/mask/mask_add.c
branches/vgroup_modifiers/source/blender/editors/mask/mask_edit.c
branches/vgroup_modifiers/source/blender/editors/mask/mask_intern.h
branches/vgroup_modifiers/source/blender/editors/mask/mask_ops.c
branches/vgroup_modifiers/source/blender/editors/mask/mask_select.c
branches/vgroup_modifiers/source/blender/editors/mesh/editface.c
branches/vgroup_modifiers/source/blender/editors/mesh/editmesh_add.c
branches/vgroup_modifiers/source/blender/editors/mesh/editmesh_extrude.c
branches/vgroup_modifiers/source/blender/editors/mesh/editmesh_knife.c
branches/vgroup_modifiers/source/blender/editors/mesh/editmesh_loopcut.c
branches/vgroup_modifiers/source/blender/editors/mesh/editmesh_select.c
branches/vgroup_modifiers/source/blender/editors/mesh/editmesh_tools.c
branches/vgroup_modifiers/source/blender/editors/mesh/editmesh_utils.c
branches/vgroup_modifiers/source/blender/editors/mesh/mesh_data.c
branches/vgroup_modifiers/source/blender/editors/mesh/mesh_intern.h
branches/vgroup_modifiers/source/blender/editors/mesh/mesh_navmesh.c
branches/vgroup_modifiers/source/blender/editors/mesh/mesh_ops.c
branches/vgroup_modifiers/source/blender/editors/mesh/meshtools.c
branches/vgroup_modifiers/source/blender/editors/object/object_add.c
branches/vgroup_modifiers/source/blender/editors/object/object_bake.c
branches/vgroup_modifiers/source/blender/editors/object/object_edit.c
branches/vgroup_modifiers/source/blender/editors/object/object_hook.c
branches/vgroup_modifiers/source/blender/editors/object/object_intern.h
branches/vgroup_modifiers/source/blender/editors/object/object_lattice.c
branches/vgroup_modifiers/source/blender/editors/object/object_modifier.c
branches/vgroup_modifiers/source/blender/editors/object/object_ops.c
branches/vgroup_modifiers/source/blender/editors/object/object_relations.c
branches/vgroup_modifiers/source/blender/editors/object/object_transform.c
branches/vgroup_modifiers/source/blender/editors/object/object_vgroup.c
branches/vgroup_modifiers/source/blender/editors/physics/dynamicpaint_ops.c
branches/vgroup_modifiers/source/blender/editors/physics/particle_edit.c
branches/vgroup_modifiers/source/blender/editors/render/render_intern.h
branches/vgroup_modifiers/source/blender/editors/render/render_internal.c
branches/vgroup_modifiers/source/blender/editors/render/render_opengl.c
branches/vgroup_modifiers/source/blender/editors/render/render_preview.c
branches/vgroup_modifiers/source/blender/editors/render/render_shading.c
branches/vgroup_modifiers/source/blender/editors/render/render_update.c
branches/vgroup_modifiers/source/blender/editors/screen/area.c
branches/vgroup_modifiers/source/blender/editors/screen/screen_ops.c
branches/vgroup_modifiers/source/blender/editors/sculpt_paint/paint_hide.c
branches/vgroup_modifiers/source/blender/editors/sculpt_paint/paint_image_proj.c
branches/vgroup_modifiers/source/blender/editors/sculpt_paint/paint_ops.c
branches/vgroup_modifiers/source/blender/editors/sculpt_paint/paint_stroke.c
branches/vgroup_modifiers/source/blender/editors/sculpt_paint/paint_utils.c
branches/vgroup_modifiers/source/blender/editors/sculpt_paint/paint_vertex.c
branches/vgroup_modifiers/source/blender/editors/sculpt_paint/paint_vertex_proj.c
branches/vgroup_modifiers/source/blender/editors/sculpt_paint/sculpt.c
branches/vgroup_modifiers/source/blender/editors/sculpt_paint/sculpt_intern.h
branches/vgroup_modifiers/source/blender/editors/sculpt_paint/sculpt_undo.c
branches/vgroup_modifiers/source/blender/editors/space_action/action_draw.c
branches/vgroup_modifiers/source/blender/editors/space_action/action_edit.c
branches/vgroup_modifiers/source/blender/editors/space_action/action_select.c
branches/vgroup_modifiers/source/blender/editors/space_action/space_action.c
branches/vgroup_modifiers/source/blender/editors/space_buttons/space_buttons.c
branches/vgroup_modifiers/source/blender/editors/space_clip/clip_ops.c
branches/vgroup_modifiers/source/blender/editors/space_clip/space_clip.c
branches/vgroup_modifiers/source/blender/editors/space_clip/tracking_ops.c
branches/vgroup_modifiers/source/blender/editors/space_file/filelist.c
branches/vgroup_modifiers/source/blender/editors/space_file/space_file.c
branches/vgroup_modifiers/source/blender/editors/space_graph/graph_buttons.c
branches/vgroup_modifiers/source/blender/editors/space_graph/space_graph.c
branches/vgroup_modifiers/source/blender/editors/space_image/image_buttons.c
branches/vgroup_modifiers/source/blender/editors/space_image/image_ops.c
branches/vgroup_modifiers/source/blender/editors/space_image/space_image.c
branches/vgroup_modifiers/source/blender/editors/space_info/space_info.c
branches/vgroup_modifiers/source/blender/editors/space_logic/logic_buttons.c
branches/vgroup_modifiers/source/blender/editors/space_logic/logic_window.c
branches/vgroup_modifiers/source/blender/editors/space_nla/nla_buttons.c
branches/vgroup_modifiers/source/blender/editors/space_nla/nla_channels.c
branches/vgroup_modifiers/source/blender/editors/space_nla/nla_draw.c
branches/vgroup_modifiers/source/blender/editors/space_nla/space_nla.c
branches/vgroup_modifiers/source/blender/editors/space_node/drawnode.c
branches/vgroup_modifiers/source/blender/editors/space_node/node_add.c
branches/vgroup_modifiers/source/blender/editors/space_node/node_buttons.c
branches/vgroup_modifiers/source/blender/editors/space_node/node_draw.c
branches/vgroup_modifiers/source/blender/editors/space_node/node_edit.c
branches/vgroup_modifiers/source/blender/editors/space_node/node_intern.h
branches/vgroup_modifiers/source/blender/editors/space_node/node_ops.c
branches/vgroup_modifiers/source/blender/editors/space_node/node_relationships.c
branches/vgroup_modifiers/source/blender/editors/space_node/node_select.c
branches/vgroup_modifiers/source/blender/editors/space_node/node_templates.c
branches/vgroup_modifiers/source/blender/editors/space_node/node_toolbar.c
branches/vgroup_modifiers/source/blender/editors/space_node/node_view.c
branches/vgroup_modifiers/source/blender/editors/space_node/space_node.c
branches/vgroup_modifiers/source/blender/editors/space_outliner/outliner_draw.c
branches/vgroup_modifiers/source/blender/editors/space_outliner/outliner_edit.c
branches/vgroup_modifiers/source/blender/editors/space_outliner/outliner_intern.h
branches/vgroup_modifiers/source/blender/editors/space_outliner/outliner_select.c
branches/vgroup_modifiers/source/blender/editors/space_outliner/outliner_tools.c
branches/vgroup_modifiers/source/blender/editors/space_outliner/outliner_tree.c
branches/vgroup_modifiers/source/blender/editors/space_outliner/space_outliner.c
branches/vgroup_modifiers/source/blender/editors/space_sequencer/sequencer_add.c
branches/vgroup_modifiers/source/blender/editors/space_sequencer/sequencer_buttons.c
branches/vgroup_modifiers/source/blender/editors/space_sequencer/sequencer_draw.c
branches/vgroup_modifiers/source/blender/editors/space_sequencer/sequencer_edit.c
branches/vgroup_modifiers/source/blender/editors/space_text/space_text.c
branches/vgroup_modifiers/source/blender/editors/space_text/text_autocomplete.c
branches/vgroup_modifiers/source/blender/editors/space_time/space_time.c
branches/vgroup_modifiers/source/blender/editors/space_view3d/drawarmature.c
branches/vgroup_modifiers/source/blender/editors/space_view3d/drawmesh.c
branches/vgroup_modifiers/source/blender/editors/space_view3d/drawobject.c
branches/vgroup_modifiers/source/blender/editors/space_view3d/drawvolume.c
branches/vgroup_modifiers/source/blender/editors/space_view3d/space_view3d.c
branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_buttons.c
branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_draw.c
branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_edit.c
branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_fly.c
branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_intern.h
branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_iterators.c
branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_ops.c
branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_ruler.c
branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_select.c
branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_snap.c
branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_toolbar.c
branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_view.c
branches/vgroup_modifiers/source/blender/editors/transform/transform.c
branches/vgroup_modifiers/source/blender/editors/transform/transform.h
branches/vgroup_modifiers/source/blender/editors/transform/transform_constraints.c
branches/vgroup_modifiers/source/blender/editors/transform/transform_conversions.c
branches/vgroup_modifiers/source/blender/editors/transform/transform_generics.c
branches/vgroup_modifiers/source/blender/editors/transform/transform_manipulator.c
branches/vgroup_modifiers/source/blender/editors/transform/transform_orientations.c
branches/vgroup_modifiers/source/blender/editors/util/CMakeLists.txt
branches/vgroup_modifiers/source/blender/editors/util/crazyspace.c
branches/vgroup_modifiers/source/blender/editors/util/numinput.c
branches/vgroup_modifiers/source/blender/editors/util/undo.c
branches/vgroup_modifiers/source/blender/editors/uvedit/uvedit_draw.c
branches/vgroup_modifiers/source/blender/editors/uvedit/uvedit_ops.c
branches/vgroup_modifiers/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/vgroup_modifiers/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/vgroup_modifiers/source/blender/freestyle/intern/application/AppView.h
branches/vgroup_modifiers/source/blender/freestyle/intern/application/Controller.h
branches/vgroup_modifiers/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
branches/vgroup_modifiers/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h
branches/vgroup_modifiers/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h
branches/vgroup_modifiers/source/blender/freestyle/intern/blender_interface/BlenderStyleModule.h
branches/vgroup_modifiers/source/blender/freestyle/intern/blender_interface/BlenderTextureManager.h
branches/vgroup_modifiers/source/blender/freestyle/intern/geometry/BBox.h
branches/vgroup_modifiers/source/blender/freestyle/intern/geometry/FastGrid.h
branches/vgroup_modifiers/source/blender/freestyle/intern/geometry/Grid.h
branches/vgroup_modifiers/source/blender/freestyle/intern/geometry/Noise.h
branches/vgroup_modifiers/source/blender/freestyle/intern/geometry/Polygon.h
branches/vgroup_modifiers/source/blender/freestyle/intern/geometry/SweepLine.h
branches/vgroup_modifiers/source/blender/freestyle/intern/geometry/VecMat.h
branches/vgroup_modifiers/source/blender/freestyle/intern/geometry/normal_cycle.h
branches/vgroup_modifiers/source/blender/freestyle/intern/image/GaussianFilter.h
branches/vgroup_modifiers/source/blender/freestyle/intern/image/Image.h
branches/vgroup_modifiers/source/blender/freestyle/intern/python/BPy_ContextFunctions.cpp
branches/vgroup_modifiers/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp
branches/vgroup_modifiers/source/blender/freestyle/intern/scene_graph/DrawingStyle.h
branches/vgroup_modifiers/source/blender/freestyle/intern/scene_graph/FrsMaterial.h
branches/vgroup_modifiers/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h
branches/vgroup_modifiers/source/blender/freestyle/intern/scene_graph/LineRep.h
branches/vgroup_modifiers/source/blender/freestyle/intern/scene_graph/Node.h
branches/vgroup_modifiers/source/blender/freestyle/intern/scene_graph/NodeCamera.h
branches/vgroup_modifiers/source/blender/freestyle/intern/scene_graph/NodeDrawingStyle.h
branches/vgroup_modifiers/source/blender/freestyle/intern/stroke/Canvas.h
branches/vgroup_modifiers/source/blender/freestyle/intern/stroke/ContextFunctions.cpp
branches/vgroup_modifiers/source/blender/freestyle/intern/stroke/ContextFunctions.h
branches/vgroup_modifiers/source/blender/freestyle/intern/stroke/Module.h
branches/vgroup_modifiers/source/blender/freestyle/intern/stroke/Operators.h
branches/vgroup_modifiers/source/blender/freestyle/intern/stroke/Predicates0D.h
branches/vgroup_modifiers/source/blender/freestyle/intern/stroke/Stroke.h
branches/vgroup_modifiers/source/blender/freestyle/intern/stroke/StrokeRenderer.h
branches/vgroup_modifiers/source/blender/freestyle/intern/stroke/StrokeRep.h
branches/vgroup_modifiers/source/blender/freestyle/intern/stroke/StrokeTesselator.h
branches/vgroup_modifiers/source/blender/freestyle/intern/stroke/StyleModule.h
branches/vgroup_modifiers/source/blender/freestyle/intern/system/BaseIterator.h
branches/vgroup_modifiers/source/blender/freestyle/intern/system/BaseObject.h
branches/vgroup_modifiers/source/blender/freestyle/intern/system/Exception.h
branches/vgroup_modifiers/source/blender/freestyle/intern/system/Id.h
branches/vgroup_modifiers/source/blender/freestyle/intern/system/Interpreter.h
branches/vgroup_modifiers/source/blender/freestyle/intern/system/ProgressBar.h
branches/vgroup_modifiers/source/blender/freestyle/intern/system/PseudoNoise.h
branches/vgroup_modifiers/source/blender/freestyle/intern/system/RandGen.h
branches/vgroup_modifiers/source/blender/freestyle/intern/system/RenderMonitor.h
branches/vgroup_modifiers/source/blender/freestyle/intern/system/TimeStamp.h
branches/vgroup_modifiers/source/blender/freestyle/intern/system/TimeUtils.h
branches/vgroup_modifiers/source/blender/freestyle/intern/view_map/ArbitraryGridDensityProvider.cpp
branches/vgroup_modifiers/source/blender/freestyle/intern/view_map/AverageAreaGridDensityProvider.cpp
branches/vgroup_modifiers/source/blender/freestyle/intern/view_map/BoxGrid.cpp
branches/vgroup_modifiers/source/blender/freestyle/intern/view_map/BoxGrid.h
branches/vgroup_modifiers/source/blender/freestyle/intern/view_map/FEdgeXDetector.h
branches/vgroup_modifiers/source/blender/freestyle/intern/view_map/Functions1D.h
branches/vgroup_modifiers/source/blender/freestyle/intern/view_map/GridDensityProvider.h
branches/vgroup_modifiers/source/blender/freestyle/intern/view_map/Interface1D.h
branches/vgroup_modifiers/source/blender/freestyle/intern/view_map/OccluderSource.h
branches/vgroup_modifiers/source/blender/freestyle/intern/view_map/Pow23GridDensityProvider.cpp
branches/vgroup_modifiers/source/blender/freestyle/intern/view_map/SphericalGrid.cpp
branches/vgroup_modifiers/source/blender/freestyle/intern/view_map/SphericalGrid.h
branches/vgroup_modifiers/source/blender/freestyle/intern/view_map/SteerableViewMap.h
branches/vgroup_modifiers/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.h
branches/vgroup_modifiers/source/blender/freestyle/intern/view_map/ViewMap.cpp
branches/vgroup_modifiers/source/blender/freestyle/intern/view_map/ViewMap.h
branches/vgroup_modifiers/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
branches/vgroup_modifiers/source/blender/freestyle/intern/view_map/ViewMapBuilder.h
branches/vgroup_modifiers/source/blender/freestyle/intern/view_map/ViewMapIterators.h
branches/vgroup_modifiers/source/blender/freestyle/intern/view_map/ViewMapTesselator.h
branches/vgroup_modifiers/source/blender/freestyle/intern/winged_edge/WEdge.h
branches/vgroup_modifiers/source/blender/freestyle/intern/winged_edge/WFillGrid.h
branches/vgroup_modifiers/source/blender/freestyle/intern/winged_edge/WSFillGrid.h
branches/vgroup_modifiers/source/blender/freestyle/intern/winged_edge/WXEdge.h
branches/vgroup_modifiers/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.h
branches/vgroup_modifiers/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.h
branches/vgroup_modifiers/source/blender/gpu/intern/gpu_buffers.c
branches/vgroup_modifiers/source/blender/gpu/intern/gpu_extensions.c
branches/vgroup_modifiers/source/blender/gpu/intern/gpu_material.c
branches/vgroup_modifiers/source/blender/imbuf/intern/anim_movie.c
branches/vgroup_modifiers/source/blender/imbuf/intern/cineon/logImageCore.c
branches/vgroup_modifiers/source/blender/imbuf/intern/cineon/logmemfile.c
branches/vgroup_modifiers/source/blender/imbuf/intern/colormanagement.c
branches/vgroup_modifiers/source/blender/imbuf/intern/indexer.c
branches/vgroup_modifiers/source/blender/imbuf/intern/jpeg.c
branches/vgroup_modifiers/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/vgroup_modifiers/source/blender/imbuf/intern/png.c
branches/vgroup_modifiers/source/blender/imbuf/intern/thumbs.c
branches/vgroup_modifiers/source/blender/imbuf/intern/tiff.c
branches/vgroup_modifiers/source/blender/imbuf/intern/util.c
branches/vgroup_modifiers/source/blender/makesdna/DNA_curve_types.h
branches/vgroup_modifiers/source/blender/makesdna/DNA_dynamicpaint_types.h
branches/vgroup_modifiers/source/blender/makesdna/DNA_mesh_types.h
branches/vgroup_modifiers/source/blender/makesdna/DNA_modifier_types.h
branches/vgroup_modifiers/source/blender/makesdna/DNA_node_types.h
branches/vgroup_modifiers/source/blender/makesdna/DNA_outliner_types.h
branches/vgroup_modifiers/source/blender/makesdna/DNA_particle_types.h
branches/vgroup_modifiers/source/blender/makesdna/DNA_scene_types.h
branches/vgroup_modifiers/source/blender/makesdna/DNA_sound_types.h
branches/vgroup_modifiers/source/blender/makesdna/DNA_space_types.h
branches/vgroup_modifiers/source/blender/makesdna/DNA_view3d_types.h
branches/vgroup_modifiers/source/blender/makesdna/intern/makesdna.c
branches/vgroup_modifiers/source/blender/makesrna/SConscript
branches/vgroup_modifiers/source/blender/makesrna/intern/CMakeLists.txt
branches/vgroup_modifiers/source/blender/makesrna/intern/SConscript
branches/vgroup_modifiers/source/blender/makesrna/intern/makesrna.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_access.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_armature.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_brush.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_color.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_dynamicpaint.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_gpencil.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_image.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_main_api.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_mesh.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_modifier.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_nodetree.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_object.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_object_api.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_object_force.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_particle.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_render.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_scene.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_space.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_texture_api.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_wm.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_wm_api.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_bevel.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_boolean_util.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_cast.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_cloth.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_decimate.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_displace.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_hook.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_laplaciansmooth.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_meshdeform.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_mirror.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_ocean.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_particlesystem.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_screw.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_shapekey.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_shrinkwrap.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_simpledeform.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_skin.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_smooth.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_solidify.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_surface.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_util.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_util.h
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_warp.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_wave.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_weightvg_util.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_weightvgedit.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_weightvgproximity.c
branches/vgroup_modifiers/source/blender/nodes/CMakeLists.txt
branches/vgroup_modifiers/source/blender/nodes/NOD_shader.h
branches/vgroup_modifiers/source/blender/nodes/NOD_static_types.h
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_image.c
branches/vgroup_modifiers/source/blender/nodes/intern/node_common.c
branches/vgroup_modifiers/source/blender/nodes/intern/node_exec.c
branches/vgroup_modifiers/source/blender/nodes/intern/node_socket.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_light_path.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_math.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_particle_info.c
branches/vgroup_modifiers/source/blender/nodes/texture/node_texture_tree.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_math.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_output.c
branches/vgroup_modifiers/source/blender/python/bmesh/bmesh_py_ops.c
branches/vgroup_modifiers/source/blender/python/bmesh/bmesh_py_ops_call.c
branches/vgroup_modifiers/source/blender/python/bmesh/bmesh_py_types.c
branches/vgroup_modifiers/source/blender/python/bmesh/bmesh_py_types_meshdata.c
branches/vgroup_modifiers/source/blender/python/generic/idprop_py_api.c
branches/vgroup_modifiers/source/blender/python/intern/bpy_rna.c
branches/vgroup_modifiers/source/blender/python/intern/bpy_rna_array.c
branches/vgroup_modifiers/source/blender/python/mathutils/mathutils_Color.c
branches/vgroup_modifiers/source/blender/python/mathutils/mathutils_Euler.c
branches/vgroup_modifiers/source/blender/python/mathutils/mathutils_Matrix.c
branches/vgroup_modifiers/source/blender/python/mathutils/mathutils_Quaternion.c
branches/vgroup_modifiers/source/blender/python/mathutils/mathutils_geometry.c
branches/vgroup_modifiers/source/blender/quicktime/apple/quicktime_export.c
branches/vgroup_modifiers/source/blender/render/extern/include/RE_engine.h
branches/vgroup_modifiers/source/blender/render/extern/include/RE_pipeline.h
branches/vgroup_modifiers/source/blender/render/extern/include/RE_shader_ext.h
branches/vgroup_modifiers/source/blender/render/intern/raytrace/rayobject_octree.cpp
branches/vgroup_modifiers/source/blender/render/intern/source/bake.c
branches/vgroup_modifiers/source/blender/render/intern/source/convertblender.c
branches/vgroup_modifiers/source/blender/render/intern/source/envmap.c
branches/vgroup_modifiers/source/blender/render/intern/source/external_engine.c
branches/vgroup_modifiers/source/blender/render/intern/source/initrender.c
branches/vgroup_modifiers/source/blender/render/intern/source/multires_bake.c
branches/vgroup_modifiers/source/blender/render/intern/source/occlusion.c
branches/vgroup_modifiers/source/blender/render/intern/source/pipeline.c
branches/vgroup_modifiers/source/blender/render/intern/source/pointdensity.c
branches/vgroup_modifiers/source/blender/render/intern/source/rayshade.c
branches/vgroup_modifiers/source/blender/render/intern/source/render_result.c
branches/vgroup_modifiers/source/blender/render/intern/source/render_texture.c
branches/vgroup_modifiers/source/blender/render/intern/source/shadbuf.c
branches/vgroup_modifiers/source/blender/render/intern/source/strand.c
branches/vgroup_modifiers/source/blender/render/intern/source/voxeldata.c
branches/vgroup_modifiers/source/blender/render/intern/source/zbuf.c
branches/vgroup_modifiers/source/blender/windowmanager/WM_api.h
branches/vgroup_modifiers/source/blender/windowmanager/intern/wm_draw.c
branches/vgroup_modifiers/source/blender/windowmanager/intern/wm_event_system.c
branches/vgroup_modifiers/source/blender/windowmanager/intern/wm_jobs.c
branches/vgroup_modifiers/source/blender/windowmanager/intern/wm_keymap.c
branches/vgroup_modifiers/source/blender/windowmanager/intern/wm_operators.c
branches/vgroup_modifiers/source/blender/windowmanager/intern/wm_playanim.c
branches/vgroup_modifiers/source/blender/windowmanager/intern/wm_subwindow.c
branches/vgroup_modifiers/source/blender/windowmanager/intern/wm_window.c
branches/vgroup_modifiers/source/blender/windowmanager/wm_event_types.h
branches/vgroup_modifiers/source/blender/windowmanager/wm_window.h
branches/vgroup_modifiers/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/vgroup_modifiers/source/creator/creator.c
branches/vgroup_modifiers/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/vgroup_modifiers/source/gameengine/BlenderRoutines/CMakeLists.txt
branches/vgroup_modifiers/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
branches/vgroup_modifiers/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
branches/vgroup_modifiers/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
branches/vgroup_modifiers/source/gameengine/BlenderRoutines/KX_BlenderGL.h
branches/vgroup_modifiers/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
branches/vgroup_modifiers/source/gameengine/Converter/BL_ArmatureConstraint.cpp
branches/vgroup_modifiers/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/vgroup_modifiers/source/gameengine/Converter/CMakeLists.txt
branches/vgroup_modifiers/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/vgroup_modifiers/source/gameengine/Converter/KX_BlenderSceneConverter.h
branches/vgroup_modifiers/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/vgroup_modifiers/source/gameengine/Converter/KX_ConvertProperties.cpp
branches/vgroup_modifiers/source/gameengine/Converter/KX_ConvertSensors.cpp
branches/vgroup_modifiers/source/gameengine/Expressions/CMakeLists.txt
branches/vgroup_modifiers/source/gameengine/Expressions/FloatValue.cpp
branches/vgroup_modifiers/source/gameengine/Expressions/IntValue.cpp
branches/vgroup_modifiers/source/gameengine/Expressions/KX_HashedPtr.cpp
branches/vgroup_modifiers/source/gameengine/GameLogic/CMakeLists.txt
branches/vgroup_modifiers/source/gameengine/GameLogic/SCA_IScene.cpp
branches/vgroup_modifiers/source/gameengine/GameLogic/SCA_IScene.h
branches/vgroup_modifiers/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
branches/vgroup_modifiers/source/gameengine/GamePlayer/CMakeLists.txt
branches/vgroup_modifiers/source/gameengine/GamePlayer/common/CMakeLists.txt
branches/vgroup_modifiers/source/gameengine/GamePlayer/common/GPC_Canvas.cpp
branches/vgroup_modifiers/source/gameengine/GamePlayer/common/GPC_Canvas.h
branches/vgroup_modifiers/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
branches/vgroup_modifiers/source/gameengine/GamePlayer/common/SConscript
branches/vgroup_modifiers/source/gameengine/GamePlayer/ghost/CMakeLists.txt
branches/vgroup_modifiers/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/vgroup_modifiers/source/gameengine/GamePlayer/ghost/GPG_Canvas.cpp
branches/vgroup_modifiers/source/gameengine/GamePlayer/ghost/GPG_Canvas.h
branches/vgroup_modifiers/source/gameengine/GamePlayer/ghost/GPG_System.h
branches/vgroup_modifiers/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/vgroup_modifiers/source/gameengine/GamePlayer/ghost/SConscript
branches/vgroup_modifiers/source/gameengine/Ketsji/BL_ActionManager.cpp
branches/vgroup_modifiers/source/gameengine/Ketsji/CMakeLists.txt
branches/vgroup_modifiers/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
branches/vgroup_modifiers/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/vgroup_modifiers/source/gameengine/Ketsji/KX_BlenderMaterial.h
branches/vgroup_modifiers/source/gameengine/Ketsji/KX_Camera.cpp
branches/vgroup_modifiers/source/gameengine/Ketsji/KX_Camera.h
branches/vgroup_modifiers/source/gameengine/Ketsji/KX_FontObject.cpp
branches/vgroup_modifiers/source/gameengine/Ketsji/KX_FontObject.h
branches/vgroup_modifiers/source/gameengine/Ketsji/KX_GameObject.cpp
branches/vgroup_modifiers/source/gameengine/Ketsji/KX_IPO_SGController.cpp
branches/vgroup_modifiers/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/vgroup_modifiers/source/gameengine/Ketsji/KX_KetsjiEngine.h
branches/vgroup_modifiers/source/gameengine/Ketsji/KX_MeshProxy.cpp
branches/vgroup_modifiers/source/gameengine/Ketsji/KX_NavMeshObject.cpp
branches/vgroup_modifiers/source/gameengine/Ketsji/KX_ObstacleSimulation.cpp
branches/vgroup_modifiers/source/gameengine/Ketsji/KX_PolyProxy.h
branches/vgroup_modifiers/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/vgroup_modifiers/source/gameengine/Ketsji/KX_PythonInitTypes.cpp
branches/vgroup_modifiers/source/gameengine/Ketsji/KX_PythonSeq.cpp
branches/vgroup_modifiers/source/gameengine/Ketsji/KX_Scene.cpp
branches/vgroup_modifiers/source/gameengine/Ketsji/KX_Scene.h
branches/vgroup_modifiers/source/gameengine/Network/CMakeLists.txt
branches/vgroup_modifiers/source/gameengine/Physics/Bullet/CMakeLists.txt
branches/vgroup_modifiers/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/vgroup_modifiers/source/gameengine/Physics/Dummy/CMakeLists.txt
branches/vgroup_modifiers/source/gameengine/Rasterizer/CMakeLists.txt
branches/vgroup_modifiers/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
branches/vgroup_modifiers/source/gameengine/Rasterizer/RAS_2DFilterManager.h
branches/vgroup_modifiers/source/gameengine/Rasterizer/RAS_ICanvas.h
branches/vgroup_modifiers/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
branches/vgroup_modifiers/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageIM.cpp
branches/vgroup_modifiers/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVA.cpp
branches/vgroup_modifiers/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVBO.cpp
branches/vgroup_modifiers/source/gameengine/SceneGraph/CMakeLists.txt
branches/vgroup_modifiers/source/gameengine/SceneGraph/SG_Tree.cpp
branches/vgroup_modifiers/source/gameengine/VideoTexture/BlendType.h
branches/vgroup_modifiers/source/gameengine/VideoTexture/CMakeLists.txt
branches/vgroup_modifiers/source/gameengine/VideoTexture/Exception.cpp
branches/vgroup_modifiers/source/gameengine/VideoTexture/FilterSource.h
branches/vgroup_modifiers/source/gameengine/VideoTexture/ImageMix.h
branches/vgroup_modifiers/source/gameengine/VideoTexture/ImageRender.cpp
branches/vgroup_modifiers/source/tools/check_style_c.py
Added Paths:
-----------
branches/vgroup_modifiers/intern/cycles/kernel/shaders/node_blackbody.osl
branches/vgroup_modifiers/intern/cycles/kernel/shaders/node_combine_hsv.osl
branches/vgroup_modifiers/intern/cycles/kernel/shaders/node_separate_hsv.osl
branches/vgroup_modifiers/intern/cycles/kernel/shaders/node_vector_transform.osl
branches/vgroup_modifiers/intern/cycles/kernel/svm/svm_blackbody.h
branches/vgroup_modifiers/intern/cycles/kernel/svm/svm_sepcomb_hsv.h
branches/vgroup_modifiers/intern/cycles/kernel/svm/svm_vector_transform.h
branches/vgroup_modifiers/intern/cycles/render/blackbody.cpp
branches/vgroup_modifiers/intern/cycles/render/blackbody.h
branches/vgroup_modifiers/release/scripts/modules/rna_keymap_ui.py
branches/vgroup_modifiers/release/scripts/presets/cycles/sampling/
branches/vgroup_modifiers/source/blender/blenlib/BLI_alloca.h
branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_connect_nonplanar.c
branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_fill_holes.c
branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_normals.c
branches/vgroup_modifiers/source/blender/compositor/operations/COM_SplitOperation.cpp
branches/vgroup_modifiers/source/blender/compositor/operations/COM_SplitOperation.h
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_blackbody.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_sepcombHSV.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_vectTransform.c
Removed Paths:
-------------
branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_userpref_keymap.py
branches/vgroup_modifiers/source/blender/blenkernel/BKE_bmesh.h
branches/vgroup_modifiers/source/blender/bmesh/tools/BME_bevel.c
branches/vgroup_modifiers/source/blender/compositor/operations/COM_SplitViewerOperation.cpp
branches/vgroup_modifiers/source/blender/compositor/operations/COM_SplitViewerOperation.h
branches/vgroup_modifiers/source/blender/compositor/operations/COM_ViewerBaseOperation.cpp
branches/vgroup_modifiers/source/blender/compositor/operations/COM_ViewerBaseOperation.h
branches/vgroup_modifiers/source/gameengine/GamePlayer/common/GPC_Engine.cpp
branches/vgroup_modifiers/source/gameengine/GamePlayer/common/GPC_Engine.h
branches/vgroup_modifiers/source/gameengine/GamePlayer/common/GPC_RawImage.cpp
branches/vgroup_modifiers/source/gameengine/GamePlayer/common/GPC_RawImage.h
branches/vgroup_modifiers/source/gameengine/GamePlayer/common/GPC_RawLoadDotBlendArray.cpp
branches/vgroup_modifiers/source/gameengine/GamePlayer/common/GPC_RawLoadDotBlendArray.h
branches/vgroup_modifiers/source/gameengine/GamePlayer/common/GPC_RawLogoArrays.cpp
branches/vgroup_modifiers/source/gameengine/GamePlayer/common/GPC_RawLogoArrays.h
branches/vgroup_modifiers/source/gameengine/GamePlayer/common/GPC_System.cpp
branches/vgroup_modifiers/source/gameengine/GamePlayer/common/GPC_System.h
branches/vgroup_modifiers/source/gameengine/GamePlayer/common/bmfont.cpp
branches/vgroup_modifiers/source/gameengine/GamePlayer/common/load.blend
branches/vgroup_modifiers/source/gameengine/GamePlayer/common/logo_blender.raw
branches/vgroup_modifiers/source/gameengine/GamePlayer/common/logo_blender3d.raw
branches/vgroup_modifiers/source/gameengine/GamePlayer/common/logo_nan.raw
branches/vgroup_modifiers/source/gameengine/GamePlayer/xembed/
branches/vgroup_modifiers/source/gameengine/Ketsji/KX_PhysicsPropertiesobsolete.h
Property Changed:
----------------
branches/vgroup_modifiers/
branches/vgroup_modifiers/source/blender/editors/interface/interface.c
branches/vgroup_modifiers/source/blender/editors/space_outliner/
Property changes on: branches/vgroup_modifiers
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/branches/soc-2013-depsgraph_mt:57516
/tags/blender-2.67b-release/blender:57122
/trunk/blender:38694-38739,38741-39198,39200-39651,39653-39988,39990-43541,43543-58000
+ /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
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835
/tags/blender-2.67b-release/blender:57122
/trunk/blender:38694-38739,38741-39198,39200-39651,39653-39988,39990-43541,43543-59000
Modified: branches/vgroup_modifiers/CMakeLists.txt
===================================================================
--- branches/vgroup_modifiers/CMakeLists.txt 2013-10-05 10:13:32 UTC (rev 60560)
+++ branches/vgroup_modifiers/CMakeLists.txt 2013-10-05 10:28:56 UTC (rev 60561)
@@ -538,9 +538,6 @@
set(PLATFORM_LINKFLAGS_DEBUG "")
-# disabled for now, not supported
-# option(WITH_WEBPLUGIN "Enable Web Plugin (Unix only)" OFF)
-
# For alternate Python locations the commandline can be used to override detected/default cache settings, e.g:
# On Unix:
# cmake ../blender \
@@ -1874,17 +1871,7 @@
set(REDCODE_INC ${REDCODE})
endif()
-#-----------------------------------------------------------------------------
-# Blender WebPlugin
-if(WITH_WEBPLUGIN)
- set(GECKO_DIR "${CMAKE_SOURCE_DIR}/../gecko-sdk/" CACHE PATH "Gecko SDK path")
- set(WEBPLUGIN_SANDBOX_MODE "apparmor" CACHE STRING "WEB Plugin sandbox mode, can be apparmor, privsep, none")
-
- set(WITH_PLAYER ON)
-endif()
-
-
#-----------------------------------------------------------------------------
# Configure OpenGL.
find_package(OpenGL)
@@ -1977,6 +1964,7 @@
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_NULL -Wnonnull) # C only
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_MISSING_INCLUDE_DIRS -Wmissing-include-dirs)
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_DIV_BY_ZERO -Wno-div-by-zero)
+ ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_TYPE_LIMITS -Wtype-limits)
# gcc 4.2 gives annoying warnings on every file with this
if(NOT "${CMAKE_C_COMPILER_VERSION}" VERSION_LESS "4.3")
@@ -2003,6 +1991,7 @@
ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_INIT_SELF -Winit-self) # needs -Wuninitialized
ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_MISSING_INCLUDE_DIRS -Wmissing-include-dirs)
ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_DIV_BY_ZERO -Wno-div-by-zero)
+ ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_TYPE_LIMITS -Wtype-limits)
# gcc 4.2 gives annoying warnings on every file with this
if(NOT "${CMAKE_C_COMPILER_VERSION}" VERSION_LESS "4.3")
@@ -2053,6 +2042,20 @@
ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_PARAMETER -Wno-unused-parameter)
ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_MACROS -Wno-unused-macros)
+ ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_MISSING_VARIABLE_DECLARATIONS -Wno-missing-variable-declarations)
+ ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_FUNCTION -Wno-unused-function)
+ ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_INT_TO_VOID_POINTER_CAST -Wno-int-to-void-pointer-cast)
+ ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_MISSING_PROTOTYPES -Wno-missing-prototypes)
+ ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_DUPLICATE_ENUM -Wno-duplicate-enum)
+ ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_UNDEF -Wno-undef)
+ ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_MISSING_NORETURN -Wno-missing-noreturn)
+
+ ADD_CHECK_CXX_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS CXX_WARN_NO_UNUSED_PRIVATE_FIELD -Wno-unused-private-field)
+ ADD_CHECK_CXX_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS CXX_WARN_NO_CXX11_NARROWING -Wno-c++11-narrowing)
+ ADD_CHECK_CXX_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS CXX_WARN_NO_NON_VIRTUAL_DTOR -Wno-non-virtual-dtor)
+ ADD_CHECK_CXX_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS CXX_WARN_NO_UNUSED_MACROS -Wno-unused-macros)
+ ADD_CHECK_CXX_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS CXX_WARN_NO_REORDER -Wno-reorder)
+
elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ALL -Wall)
Modified: branches/vgroup_modifiers/build_files/cmake/Modules/FindPythonLibsUnix.cmake
===================================================================
--- branches/vgroup_modifiers/build_files/cmake/Modules/FindPythonLibsUnix.cmake 2013-10-05 10:13:32 UTC (rev 60560)
+++ branches/vgroup_modifiers/build_files/cmake/Modules/FindPythonLibsUnix.cmake 2013-10-05 10:28:56 UTC (rev 60561)
@@ -2,10 +2,12 @@
# Find the native Python includes and library
#
# Note:, This is not _yet_ intended to be a general python module for other
-# projects to use since its hard coded to python 3.2 as blender only supports
-# a single python version.
-# This is for blender/unix python only.
+# projects to use since its hard coded to fixed Python version
+# as Blender only supports a single Python version at the moment.
#
+# Note:
+# this is for Blender/Unix Python only.
+#
# This module defines
# PYTHON_VERSION
# PYTHON_INCLUDE_DIRS
Modified: branches/vgroup_modifiers/build_files/cmake/macros.cmake
===================================================================
--- branches/vgroup_modifiers/build_files/cmake/macros.cmake 2013-10-05 10:13:32 UTC (rev 60560)
+++ branches/vgroup_modifiers/build_files/cmake/macros.cmake 2013-10-05 10:28:56 UTC (rev 60561)
@@ -530,7 +530,9 @@
foreach(_SOURCE ${ARGV})
- if(CMAKE_COMPILER_IS_GNUCC)
+ if(CMAKE_COMPILER_IS_GNUCC OR
+ (CMAKE_CXX_COMPILER_ID MATCHES "Clang"))
+
set_source_files_properties(${_SOURCE}
PROPERTIES
COMPILE_FLAGS "${CC_REMOVE_STRICT_FLAGS}"
Modified: branches/vgroup_modifiers/doc/python_api/rst/bge.render.rst
===================================================================
--- branches/vgroup_modifiers/doc/python_api/rst/bge.render.rst 2013-10-05 10:13:32 UTC (rev 60560)
+++ branches/vgroup_modifiers/doc/python_api/rst/bge.render.rst 2013-10-05 10:28:56 UTC (rev 60561)
@@ -62,7 +62,19 @@
.. data:: KX_BLENDER_GLSL_MATERIAL
Materials approximating blender materials with GLSL.
+
+.. DATA:: VSYNC_OFF
+ Disables vsync
+
+.. DATA:: VSYNC_ON
+
+ Enables vsync
+
+.. DATA:: VSYNC_ADAPTIVE
+
+ Enables adaptive vsync if supported. Adaptive vsync enables vsync if the framerate is above the monitors refresh rate. Otherwise, vsync is diabled if the framerate is too low.
+
*********
Functions
*********
@@ -289,3 +301,15 @@
Disable the motion blur effect.
+.. function:: setVsync(value)
+
+ Set the vsync value
+
+ :arg value: One of VSYNC_OFF, VSYNC_ON, VSYNC_ADAPTIVE
+ :type value: integer
+
+.. function:: getVsync()
+
+ Get the current vsync value
+
+ :rtype: One of VSYNC_OFF, VSYNC_ON, VSYNC_ADAPTIVE
Modified: branches/vgroup_modifiers/doc/python_api/rst/bge_types/bge.types.KX_Camera.rst
===================================================================
--- branches/vgroup_modifiers/doc/python_api/rst/bge_types/bge.types.KX_Camera.rst 2013-10-05 10:13:32 UTC (rev 60560)
+++ branches/vgroup_modifiers/doc/python_api/rst/bge_types/bge.types.KX_Camera.rst 2013-10-05 10:28:56 UTC (rev 60561)
@@ -27,6 +27,12 @@
:type: float
+ .. attribute:: fov
+
+ The camera's field of view value.
+
+ :type: float
+
.. attribute:: ortho_scale
The camera's view scale when in orthographic mode.
Modified: branches/vgroup_modifiers/extern/libmv/libmv-capi.cc
===================================================================
--- branches/vgroup_modifiers/extern/libmv/libmv-capi.cc 2013-10-05 10:13:32 UTC (rev 60560)
+++ branches/vgroup_modifiers/extern/libmv/libmv-capi.cc 2013-10-05 10:28:56 UTC (rev 60561)
@@ -62,7 +62,7 @@
# define snprintf _snprintf
#endif
-typedef struct libmv_Reconstruction {
+struct libmv_Reconstruction {
libmv::EuclideanReconstruction reconstruction;
/* used for per-track average error calculation after reconstruction */
@@ -70,12 +70,12 @@
libmv::CameraIntrinsics intrinsics;
double error;
-} libmv_Reconstruction;
+};
-typedef struct libmv_Features {
+struct libmv_Features {
int count, margin;
libmv::Feature *features;
-} libmv_Features;
+};
/* ************ Logging ************ */
@@ -197,30 +197,30 @@
int x, y;
png_bytep *row_pointers;
- row_pointers= (png_bytep*)malloc(sizeof(png_bytep)*image.Height());
+ row_pointers = (png_bytep *) malloc(sizeof(png_bytep) * image.Height());
for (y = 0; y < image.Height(); y++) {
- row_pointers[y]= (png_bytep)malloc(sizeof(png_byte)*4*image.Width());
+ row_pointers[y] = (png_bytep) malloc(sizeof(png_byte) * 4 * image.Width());
for (x = 0; x < image.Width(); x++) {
if (x0 == x && image.Height() - y0 - 1 == y) {
- row_pointers[y][x*4+0]= 255;
- row_pointers[y][x*4+1]= 0;
- row_pointers[y][x*4+2]= 0;
- row_pointers[y][x*4+3]= 255;
+ row_pointers[y][x * 4 + 0] = 255;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list