Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Julian Eisel
2017-04-09 22:51:38 +02:00
parent 928f5df1b4 5b873c8c24
commit 15bcfaa36b
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/idprop.c
View File

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