[Bf-blender-cvs] [fd75f7d3e0c] asset-engine: Merge branch 'blender2.8' into asset-engine

[Bastien Montagne]

Commit: fd75f7d3e0c574be88018f21068dcb68937cb795
Author: Bastien Montagne
Date:   Thu Mar 29 14:27:03 2018 +0200
Branches: asset-engine
https://developer.blender.org/rBfd75f7d3e0c574be88018f21068dcb68937cb795

Merge branch 'blender2.8' into asset-engine

Conflicts:
	source/blender/makesrna/intern/rna_ID.c

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



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

diff --cc source/blender/makesrna/intern/rna_ID.c
index b74e9d848e0,c35ca5c42e4..285a4957592
--- a/source/blender/makesrna/intern/rna_ID.c
+++ b/source/blender/makesrna/intern/rna_ID.c
@@@ -793,37 -793,6 +793,29 @@@ static int rna_ID_is_updated_data_get(P
  	return ((data->recalc & ID_RECALC_ALL) != 0);
  }
  
- static PointerRNA rna_ID_override_reference_get(PointerRNA *ptr)
- {
- 	ID *id = (ID *)ptr->data;
- 	ID *reference = (id && id->override_static) ? id->override_static->reference : NULL;
- 
- 	return reference ? rna_pointer_inherit_refine(ptr, ID_code_to_RNA_type(GS(reference->name)), reference) : PointerRNA_NULL;
- }
- 
 +static void rna_ID_asset_dependencies_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
 +{
 +	ID *id = ptr->data;
 +
 +	if (id->uuid && id->lib) {
 +		AssetRef *aref = BKE_library_asset_repository_asset_find(id->lib, id);
 +		if (aref) {
 +			rna_iterator_listbase_begin(iter, &aref->id_list, NULL);
 +			return;
 +		}
 +	}
 +	rna_iterator_listbase_begin(iter, NULL, NULL);
 +}
 +
 +static PointerRNA rna_ID_asset_dependencies_get(CollectionPropertyIterator *iter)
 +{
 +	ListBaseIterator *internal = &iter->internal.listbase;
 +	PointerRNA ptr;
 +
 +	RNA_id_pointer_create((ID *)((LinkData *)internal->link)->data, &ptr);
 +	return ptr;
 +}
 +
  #else
  
  static void rna_def_ID_properties(BlenderRNA *brna)