[Bf-blender-cvs] [35716a8f469] temp-dynamic-overrides: Merge branch 'blender2.8' into temp-dynamic-overrides

[Bastien Montagne]

Commit: 35716a8f4698f877e6e5f422065565199f0316e5
Author: Bastien Montagne
Date:   Thu May 17 17:14:48 2018 +0200
Branches: temp-dynamic-overrides
https://developer.blender.org/rB35716a8f4698f877e6e5f422065565199f0316e5

Merge branch 'blender2.8' into temp-dynamic-overrides

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

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



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

diff --cc source/blender/makesrna/intern/rna_rna.c
index 02a2465ff34,234676379ee..1379043face
--- a/source/blender/makesrna/intern/rna_rna.c
+++ b/source/blender/makesrna/intern/rna_rna.c
@@@ -2039,17 -1979,8 +1980,9 @@@ bool rna_property_override_apply_defaul
          PointerRNA *ptr_dst, PointerRNA *ptr_src, PointerRNA *ptr_storage,
          PropertyRNA *prop_dst, PropertyRNA *prop_src, PropertyRNA *prop_storage,
          const int len_dst, const int len_src, const int len_storage,
 -        IDOverrideStaticPropertyOperation *opop)
 +        IDOverrideStaticPropertyOperation *opop, DynamicOverrideProperty *dyn_prop)
  {
- #define RNA_PROPERTY_GET_SINGLE(_typename, _ptr, _prop, _index) \
- 	(is_array ? RNA_property_##_typename##_get_index((_ptr), (_prop), (_index)) : \
- 	            RNA_property_##_typename##_get((_ptr), (_prop)))
- #define RNA_PROPERTY_SET_SINGLE(_typename, _ptr, _prop, _index, _value) \
- 	(is_array ? RNA_property_##_typename##_set_index((_ptr), (_prop), (_index), (_value)) : \
- 	            RNA_property_##_typename##_set((_ptr), (_prop), (_value)))
- 
- 
 +	BLI_assert(opop != NULL || dyn_prop != NULL);
  	BLI_assert(len_dst == len_src && (!ptr_storage || len_dst == len_storage));
  	UNUSED_VARS_NDEBUG(len_src, len_storage);
  
@@@ -2332,11 -2197,10 +2265,13 @@@
  	}
  
  	return false;
 +
 +#undef RNA_PROPERTY_GET_SINGLE
 +#undef RNA_PROPERTY_SET_SINGLE
  }
  
+ #undef RNA_PROPERTY_GET_SINGLE
+ #undef RNA_PROPERTY_SET_SINGLE
  
  
  #else