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

[Sergey Sharybin]

Commit: f9f4e208713ec2b4fa8f8e112fb50cfd1ee6a266
Author: Sergey Sharybin
Date:   Mon Aug 28 11:27:50 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBf9f4e208713ec2b4fa8f8e112fb50cfd1ee6a266

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/blenkernel/intern/icons.c
index db50a04348b,a98a1b13402..a407fd0bae8
--- a/source/blender/blenkernel/intern/icons.c
+++ b/source/blender/blenkernel/intern/icons.c
@@@ -253,8 -252,9 +253,10 @@@ PreviewImage **BKE_previewimg_id_get_p(
  		ID_PRV_CASE(ID_OB, Object);
  		ID_PRV_CASE(ID_GR, Group);
  		ID_PRV_CASE(ID_SCE, Scene);
 +		ID_PRV_CASE(ID_SCR, bScreen);
  #undef ID_PRV_CASE
+ 		default:
+ 			break;
  	}
  
  	return NULL;
diff --cc source/blender/blenloader/intern/readfile.c
index 573ecce3224,ff4c52967f3..857cd9fb4b5
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@@ -10123,8 -9912,7 +10123,9 @@@ void BLO_expand_main(void *fdhandle, Ma
  					case ID_CF:
  						expand_cachefile(fd, mainvar, (CacheFile *)id);
  						break;
 +					case ID_WS:
 +						expand_workspace(fd, mainvar, (WorkSpace *)id);
+ 					default:
  						break;
  					}
  					
diff --cc source/blender/editors/animation/keyingsets.c
index fd73a27c9f6,0a27fe14de7..ce1379f760d
--- a/source/blender/editors/animation/keyingsets.c
+++ b/source/blender/editors/animation/keyingsets.c
@@@ -1050,9 -1049,11 +1050,11 @@@ int ANIM_apply_keyingset(bContext *C, L
  				Object *ob = (Object *)ksp->id;
  				
  				// XXX: only object transforms?
 -				DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
 +				DEG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
  				break;
  			}
+ 			default:
+ 				break;
  		}
  		
  		/* send notifiers for updates (this doesn't require context to work!) */