[Bf-blender-cvs] [d1328feeb12] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: d1328feeb125328615bcf832cbc82d9f9a18e023
Author: Campbell Barton
Date:   Fri Aug 11 10:33:39 2017 +1000
Branches: blender2.8
https://developer.blender.org/rBd1328feeb125328615bcf832cbc82d9f9a18e023

Merge branch 'master' into blender2.8

===================================================================



===================================================================

diff --cc source/blender/editors/transform/transform_snap_object.c
index 49f8a41d743,0fe121252be..ae4190026f8
--- a/source/blender/editors/transform/transform_snap_object.c
+++ b/source/blender/editors/transform/transform_snap_object.c
@@@ -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;
diff --cc source/blender/windowmanager/intern/wm_files.c
index 221baeadbee,8c24110dc25..784cdcc97dd
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@@ -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);