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

Campbell Barton noreply at git.blender.org
Sat May 5 14:52:35 CEST 2018


Commit: 29aa531e5137b9c16b04857a7b66385e78486342
Author: Campbell Barton
Date:   Sat May 5 14:42:10 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB29aa531e5137b9c16b04857a7b66385e78486342

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/blenkernel/BKE_idprop.h
index c686fa41e7e,8a2cdd7b37c..94630eaa7b0
--- a/source/blender/blenkernel/BKE_idprop.h
+++ b/source/blender/blenkernel/BKE_idprop.h
@@@ -152,12 -145,13 +152,17 @@@ void IDP_Reset(IDProperty *prop, const 
  #  define IDP_Id(prop)               ((ID *) (prop)->data.pointer)
  #endif
  
- /* for printout/logging only */
- char *IDP_reprN(const struct IDProperty *prop);
+ /* Format IDProperty as strings */
+ char *IDP_reprN(
+         const struct IDProperty *prop, uint *r_len);
+ void IDP_repr_fn(
+         const IDProperty *prop,
+         void (*str_append_fn)(void *user_data, const char *str, uint str_len),
+         void *user_data);
  void  IDP_print(const struct IDProperty *prop);
  
 +#ifdef __cplusplus
 +}
 +#endif
 +
  #endif /* __BKE_IDPROP_H__ */
diff --cc source/blender/blenkernel/CMakeLists.txt
index fe79f74ef27,723ba347dfb..9e241b7fa81
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@@ -116,9 -115,9 +116,10 @@@ set(SR
  	intern/gpencil.c
  	intern/group.c
  	intern/icons.c
 +	intern/icons_rasterize.c
  	intern/idcode.c
  	intern/idprop.c
+ 	intern/idprop_utils.c
  	intern/image.c
  	intern/image_gen.c
  	intern/ipo.c
diff --cc source/blender/blenkernel/intern/idprop.c
index 1e7f6cf284a,fe00d68b4ea..0c5078e3e36
--- a/source/blender/blenkernel/intern/idprop.c
+++ b/source/blender/blenkernel/intern/idprop.c
@@@ -1094,30 -1067,5 +1094,16 @@@ void IDP_ClearProperty(IDProperty *prop
  	prop->len = prop->totallen = 0;
  }
  
 +void IDP_Reset(IDProperty *prop, const IDProperty *reference)
 +{
 +	if (prop == NULL) {
 +		return;
 +	}
 +	IDP_ClearProperty(prop);
 +	if (reference != NULL) {
 +		IDP_MergeGroup(prop, reference, true);
 +	}
 +}
 +
  /** \} */
  
- /* We could write a C version, see: idprop_py_api.c */
- #ifndef WITH_PYTHON
- char *IDP_reprN(IDProperty *UNUSED(prop))
- {
- 	return BLI_strdup("<unsupported>");
- }
- 
- void IDP_print(IDProperty *prop)
- {
- 	char *repr = IDP_reprN(prop);
- 	printf("IDProperty(%p): %s\n", prop, repr);
- 	MEM_freeN(repr);
- }
- #endif /* WITH_PYTHON */



More information about the Bf-blender-cvs mailing list