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

[Sergey Sharybin]

Commit: be4cf933abfef8c5e8ee02e04a236e414bc11287
Author: Sergey Sharybin
Date:   Tue Jun 13 17:45:36 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBbe4cf933abfef8c5e8ee02e04a236e414bc11287

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/blenkernel/intern/library.c
index 04cd557e68a,75e606bc020..88173ccb98c
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@@ -877,6 -858,60 +877,62 @@@ int set_listbasepointers(Main *main, Li
   * **************************** */
  
  /**
+  * Get allocation size fo a given datablock type and optionally allocation name.
+  */
+ size_t BKE_libblock_get_alloc_info(short type, const char **name)
+ {
+ #define CASE_RETURN(id_code, type)  \
+ 	case id_code:                   \
+ 		do {                        \
+ 			if (name != NULL) {     \
+ 				*name = #type;      \
+ 			}                       \
+ 			return sizeof(type);    \
+ 		} while(0)
+ 
+ 	switch ((ID_Type)type) {
+ 		CASE_RETURN(ID_SCE, Scene);
+ 		CASE_RETURN(ID_LI,  Library);
+ 		CASE_RETURN(ID_OB,  Object);
+ 		CASE_RETURN(ID_ME,  Mesh);
+ 		CASE_RETURN(ID_CU,  Curve);
+ 		CASE_RETURN(ID_MB,  MetaBall);
+ 		CASE_RETURN(ID_MA,  Material);
+ 		CASE_RETURN(ID_TE,  Tex);
+ 		CASE_RETURN(ID_IM,  Image);
+ 		CASE_RETURN(ID_LT,  Lattice);
+ 		CASE_RETURN(ID_LA,  Lamp);
+ 		CASE_RETURN(ID_CA,  Camera);
+ 		CASE_RETURN(ID_IP,  Ipo);
+ 		CASE_RETURN(ID_KE,  Key);
+ 		CASE_RETURN(ID_WO,  World);
+ 		CASE_RETURN(ID_SCR, bScreen);
+ 		CASE_RETURN(ID_VF,  VFont);
+ 		CASE_RETURN(ID_TXT, Text);
+ 		CASE_RETURN(ID_SPK, Speaker);
++		CASE_RETURN(ID_LP,  LightProbe);
+ 		CASE_RETURN(ID_SO,  bSound);
+ 		CASE_RETURN(ID_GR,  Group);
+ 		CASE_RETURN(ID_AR,  bArmature);
+ 		CASE_RETURN(ID_AC,  bAction);
+ 		CASE_RETURN(ID_NT,  bNodeTree);
+ 		CASE_RETURN(ID_BR,  Brush);
+ 		CASE_RETURN(ID_PA,  ParticleSettings);
+ 		CASE_RETURN(ID_WM,  wmWindowManager);
+ 		CASE_RETURN(ID_GD,  bGPdata);
+ 		CASE_RETURN(ID_MC,  MovieClip);
+ 		CASE_RETURN(ID_MSK, Mask);
+ 		CASE_RETURN(ID_LS,  FreestyleLineStyle);
+ 		CASE_RETURN(ID_PAL, Palette);
+ 		CASE_RETURN(ID_PC,  PaintCurve);
+ 		CASE_RETURN(ID_CF,  CacheFile);
++		CASE_RETURN(ID_WS,  WorkSpace);
+ 	}
+ 	return 0;
+ #undef CASE_RETURN
+ }
+ 
+ /**
   * Allocates and returns memory of the right size for the specified block type,
   * initialized to zero.
   */