Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 11 Aug 2017 00:33:39 +0000 (10:33 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 11 Aug 2017 00:33:39 +0000 (10:33 +1000)
12 files changed:
1  2 
intern/cycles/blender/addon/properties.py
intern/cycles/blender/addon/ui.py
intern/cycles/blender/blender_object.cpp
intern/cycles/blender/blender_sync.cpp
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/object.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/transform/transform_snap_object.c
source/blender/windowmanager/intern/wm_files.c
source/blender/windowmanager/intern/wm_init_exit.c
source/blender/windowmanager/wm_files.h
tests/python/CMakeLists.txt

Simple merge
index 49f8a41d743560f657467e1d0f0d4dfcdcc24428,0fe121252bed6510e0f321b3257e3606f49b30af..ae4190026f8972f499414dd0bbba4a4e10124627
@@@ -167,13 -162,14 +167,13 @@@ static void iter_snap_objects
         * To solve that problem, we do it first as an exception.
         * */
        if (base_act && base_act->object && base_act->object->mode & OB_MODE_PARTICLE_EDIT) {
 -              sob_callback(sctx, false, base_act->object, base_act->object->obmat, data);
 +              sob_callback(C, sctx, false, base_act->object, base_act->object->obmat, data);
        }
  
 -      for (Base *base = sctx->scene->base.first; base != NULL; base = base->next) {
 -              if ((BASE_VISIBLE_BGMODE(sctx->v3d_data.v3d, sctx->scene, base)) &&
 -                  (base->flag & (BA_HAS_RECALC_OB | BA_HAS_RECALC_DATA)) == 0 &&
 -                  !((snap_select == SNAP_NOT_SELECTED && (base->flag & (SELECT | BA_WAS_SEL))) ||
 +      for (Base *base = sctx->scene_layer->object_bases.first; base != NULL; base = base->next) {
 +              if ((BASE_VISIBLE_NEW(base)) && (base->flag_legacy & (BA_HAS_RECALC_OB | BA_HAS_RECALC_DATA)) == 0 &&
-                       !((snap_select == SNAP_NOT_SELECTED && ((base->flag & BASE_SELECTED) || (base->flag_legacy & BA_WAS_SEL))) ||
-                         (snap_select == SNAP_NOT_ACTIVE && base == base_act)))
++                  !((snap_select == SNAP_NOT_SELECTED && ((base->flag & BASE_SELECTED) || (base->flag_legacy & BA_WAS_SEL))) ||
+                     (snap_select == SNAP_NOT_ACTIVE && base == base_act)))
                {
                        bool use_obedit;
                        Object *obj = base->object;
index 221baeadbee874c0872324d3432655874d7016c1,8c24110dc254f22dfafc9ce9b306809448c4b64d..784cdcc97dda4a63c3f7181d9769dac74fb55252
@@@ -834,9 -839,11 +847,11 @@@ int wm_homefile_read
        /* prevent buggy files that had G_FILE_RELATIVE_REMAP written out by mistake. Screws up autosaves otherwise
         * can remove this eventually, only in a 2.53 and older, now its not written */
        G.fileflags &= ~G_FILE_RELATIVE_REMAP;
--      
-       /* check userdef before open window, keymaps etc */
-       wm_init_userdef(CTX_data_main(C), read_userdef_from_memory);
 -      if (use_userdef) {
++
++      if (use_userdef) {      
+               /* check userdef before open window, keymaps etc */
 -              wm_init_userdef(C, read_userdef_from_memory);
++              wm_init_userdef(CTX_data_main(C), read_userdef_from_memory);
+       }
        
        /* match the read WM with current WM */
        wm_window_match_do(C, &wmbase); 
Simple merge