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

[Sybren A. Stüvel]

Commit: 57329304b061efe756e3a4ce1b828e9a7c7f7030
Author: Sybren A. Stüvel
Date:   Thu Apr 5 16:58:41 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB57329304b061efe756e3a4ce1b828e9a7c7f7030

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/makesrna/intern/rna_ID.c
index c35ca5c42e4,bc2c26c2b2b..088b2b67af5
--- a/source/blender/makesrna/intern/rna_ID.c
+++ b/source/blender/makesrna/intern/rna_ID.c
@@@ -772,27 -754,14 +772,35 @@@ static PointerRNA rna_IDPreview_get(Poi
  	return rna_pointer_inherit_refine(ptr, &RNA_ImagePreview, prv_img);
  }
  
 +static int rna_ID_is_updated_get(PointerRNA *ptr)
 +{
 +	ID *id = (ID *)ptr->data;
 +	/* TODO(sergey): Do we need to limit some of flags here? */
 +	return ((id->recalc & ID_RECALC_ALL) != 0);
 +}
 +
 +static int rna_ID_is_updated_data_get(PointerRNA *ptr)
 +{
 +	ID *id = (ID *)ptr->data;
 +	if (GS(id->name) != ID_OB) {
 +		return 0;
 +	}
 +	Object *object = (Object *)id;
 +	ID *data = object->data;
 +	if (data == NULL) {
 +		return 0;
 +	}
 +	return ((data->recalc & ID_RECALC_ALL) != 0);
 +}
 +
+ static IDProperty *rna_IDPropertyWrapPtr_idprops(PointerRNA *ptr, bool UNUSED(create))
+ {
+ 	if (ptr == NULL) {
+ 		return NULL;
+ 	}
+ 	return ptr->data;
+ }
+ 
  #else
  
  static void rna_def_ID_properties(BlenderRNA *brna)