Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 3 Apr 2017 13:15:56 +0000 (15:15 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 3 Apr 2017 13:15:56 +0000 (15:15 +0200)
1  2 
.gitmodules
source/blender/alembic/intern/abc_exporter.cc
source/blender/depsgraph/intern/depsgraph_tag.cc
source/blender/editors/transform/transform_snap_object.c
source/blender/windowmanager/intern/wm_files.c
source/blender/windowmanager/intern/wm_window.c
source/blenderplayer/bad_level_call_stubs/stubs.c

diff --cc .gitmodules
index 02875320630e6240f0801021cf3808ab82484662,2f52bfce372b882b593e2efe06516acfdf769eab..11ce247b455ca380ccb110c16444d3b51388adb6
@@@ -1,20 -1,20 +1,24 @@@
  [submodule "release/scripts/addons"]
        path = release/scripts/addons
        url = ../blender-addons.git
 +      branch = blender2.8
        ignore = all
+       branch = master
  [submodule "release/scripts/addons_contrib"]
        path = release/scripts/addons_contrib
        url = ../blender-addons-contrib.git
 +      branch = master
        ignore = all
+       branch = master
  [submodule "release/datafiles/locale"]
        path = release/datafiles/locale
        url = ../blender-translations.git
 +      branch = master
        ignore = all
+       branch = master
  [submodule "source/tools"]
        path = source/tools
        url = ../blender-dev-tools.git
 +      branch = master
        ignore = all
+       branch = master