Merge branch 'master' into temp_remove_particles temp_remove_particles
authorLukas Tönne <lukas.toenne@gmail.com>
Thu, 28 Apr 2016 15:33:19 +0000 (17:33 +0200)
committerLukas Tönne <lukas.toenne@gmail.com>
Thu, 28 Apr 2016 15:33:19 +0000 (17:33 +0200)
commit1f723603c882e6d79ab69bea6e5c034ae21a6ce7
tree098b0133beea06c460c3e9e92010bc669d151e5d
parent3632c4997f5019d2a519996d9e216d474aa05d3b
parenta48d7407986d04492107a2ef16d0ff6f0d012c45
Merge branch 'master' into temp_remove_particles
31 files changed:
release/scripts/startup/bl_ui/properties_data_modifier.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/depsgraph.c
source/blender/blenkernel/intern/pointcache.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/versioning_270.c
source/blender/blenloader/intern/writefile.c
source/blender/depsgraph/intern/depsgraph_build.cc
source/blender/depsgraph/intern/depsgraph_build_nodes.cc
source/blender/depsgraph/intern/depsgraph_tag.cc
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/editors/space_file/filesel.c
source/blender/editors/space_info/info_stats.c
source/blender/editors/space_outliner/outliner_intern.h
source/blender/editors/space_outliner/outliner_tree.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/space_view3d/view3d_select.c
source/blender/editors/transform/transform.h
source/blender/editors/transform/transform_generics.c
source/blender/editors/transform/transform_snap.c
source/blender/editors/transform/transform_snap_object.c
source/blender/editors/util/undo.c
source/blender/gpu/intern/gpu_codegen.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/renderdatabase.c
source/blender/render/intern/source/shadeinput.c
source/blenderplayer/bad_level_call_stubs/stubs.c
source/creator/creator.c