Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-12-12 04:55:20 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-12-12 05:02:09 +0300
commit49490e5cfbeb2b0b823aa2042401891001870a6e (patch)
treea1d32562af2dea0c336ebd3d017a387834e936cc /source/blender/blenkernel/intern/idprop.c
parent16fc62e15f0a749d6d64e784ea048e07d6ea3397 (diff)
parente757c4a3bec8b0e8d198531a28327332af00a9ba (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/idprop.c')
-rw-r--r--source/blender/blenkernel/intern/idprop.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/idprop.c b/source/blender/blenkernel/intern/idprop.c
index 8cc40d4e74c..5ea9f9b20f9 100644
--- a/source/blender/blenkernel/intern/idprop.c
+++ b/source/blender/blenkernel/intern/idprop.c
@@ -330,9 +330,9 @@ static IDProperty *IDP_CopyArray(const IDProperty *prop, const int flag)
/**
*
- * \param st The string to assign.
- * \param name The property name.
- * \param maxlen The size of the new string (including the \0 terminator).
+ * \param st: The string to assign.
+ * \param name: The property name.
+ * \param maxlen: The size of the new string (including the \0 terminator).
* \return The new string property.
*/
IDProperty *IDP_NewString(const char *st, const char *name, int maxlen)
@@ -837,7 +837,7 @@ IDProperty *IDP_GetProperties(ID *id, const bool create_if_needed)
}
/**
- * \param is_strict When false treat missing items as a match */
+ * \param is_strict: When false treat missing items as a match */
bool IDP_EqualsProperties_ex(IDProperty *prop1, IDProperty *prop2, const bool is_strict)
{
if (prop1 == NULL && prop2 == NULL)