Merge branch 'master' into blender2.8

source/blender/blenkernel/intern/idprop.c

@@ -859,6 +859,7 @@ bool IDP_EqualsProperties(IDProperty *prop1, IDProperty *prop2)
  * The union is simple to use; see the top of this header file for its definition.
  * An example of using this function:
  *
+ * \code{.c}
  * IDPropertyTemplate val;
  * IDProperty *group, *idgroup, *color;
  * group = IDP_New(IDP_GROUP, val, "group1"); //groups don't need a template.
@@ -870,6 +871,7 @@ bool IDP_EqualsProperties(IDProperty *prop1, IDProperty *prop2)
  * idgroup = IDP_GetProperties(some_id, 1);
  * IDP_AddToGroup(idgroup, color);
  * IDP_AddToGroup(idgroup, group);
+ * \endcode
  *
  * Note that you MUST either attach the id property to an id property group with
  * IDP_AddToGroup or MEM_freeN the property, doing anything else might result in