[Bf-blender-cvs] [b07e8a24f5c] master: Cleanup: remove unnecessary branch when lib linking constraints
Jacques Lucke
noreply at git.blender.org
Tue Apr 14 11:55:13 CEST 2020
Commit: b07e8a24f5c69578c5ccae31848bb0f51fd18700
Author: Jacques Lucke
Date: Tue Apr 14 11:50:36 2020 +0200
Branches: master
https://developer.blender.org/rBb07e8a24f5c69578c5ccae31848bb0f51fd18700
Cleanup: remove unnecessary branch when lib linking constraints
Differential Revision: https://developer.blender.org/D7386
Reviewers: mont29
===================================================================
M source/blender/blenloader/intern/readfile.c
===================================================================
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 168b4e01e8d..9ff5ab3a648 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -3834,20 +3834,11 @@ typedef struct tConstraintLinkData {
/* callback function used to relink constraint ID-links */
static void lib_link_constraint_cb(bConstraint *UNUSED(con),
ID **idpoin,
- bool is_reference,
+ bool UNUSED(is_reference),
void *userdata)
{
tConstraintLinkData *cld = (tConstraintLinkData *)userdata;
-
- /* for reference types, we need to increment the user-counts on load... */
- if (is_reference) {
- /* reference type - with usercount */
- *idpoin = newlibadr(cld->fd, cld->id->lib, *idpoin);
- }
- else {
- /* target type - no usercount needed */
- *idpoin = newlibadr(cld->fd, cld->id->lib, *idpoin);
- }
+ *idpoin = newlibadr(cld->fd, cld->id->lib, *idpoin);
}
static void lib_link_constraints(FileData *fd, ID *id, ListBase *conlist)
More information about the Bf-blender-cvs
mailing list