Cleanup: readfile: avoid some verbose if() checks which are already done in called code.

1 files changed, 32 insertions, 37 deletions

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index e52db00d874..4198568639d 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -2098,6 +2098,7 @@ static void _IDP_DirectLinkGroup_OrFree(IDProperty **prop, int switch_endian, Fi
 /* stub function */
 static void IDP_LibLinkProperty(IDProperty *UNUSED(prop), int UNUSED(switch_endian), FileData *UNUSED(fd))
 {
+	/* Should we do something here, prop should be ensured to be non-NULL first... */
 }
 
 /* ************ READ IMAGE PREVIEW *************** */
@@ -2678,8 +2679,7 @@ static void lib_link_node_socket(FileData *fd, ID *UNUSED(id), bNodeSocket *sock
 {
 	/* Link ID Properties -- and copy this comment EXACTLY for easy finding
 	 * of library blocks that implement this.*/
-	if (sock->prop)
-		IDP_LibLinkProperty(sock->prop, (fd->flags & FD_FLAGS_SWITCH_ENDIAN), fd);
+	IDP_LibLinkProperty(sock->prop, (fd->flags & FD_FLAGS_SWITCH_ENDIAN), fd);
 }
 
 /* singe node tree (also used for material/scene trees), ntree is not NULL */
@@ -2688,15 +2688,14 @@ static void lib_link_ntree(FileData *fd, ID *id, bNodeTree *ntree)
 	bNode *node;
 	bNodeSocket *sock;
 	
-	if (ntree->adt) lib_link_animdata(fd, &ntree->id, ntree->adt);
+	lib_link_animdata(fd, &ntree->id, ntree->adt);
 	
 	ntree->gpd = newlibadr_us(fd, id->lib, ntree->gpd);
 	
 	for (node = ntree->nodes.first; node; node = node->next) {
 		/* Link ID Properties -- and copy this comment EXACTLY for easy finding
 		 * of library blocks that implement this.*/
-		if (node->prop)
-			IDP_LibLinkProperty(node->prop, (fd->flags & FD_FLAGS_SWITCH_ENDIAN), fd);
+		IDP_LibLinkProperty(node->prop, (fd->flags & FD_FLAGS_SWITCH_ENDIAN), fd);
 		
 		node->id= newlibadr_us(fd, id->lib, node->id);
 
@@ -3238,7 +3237,7 @@ static void lib_link_armature(FileData *fd, Main *main)
 	
 	for (arm = main->armature.first; arm; arm = arm->id.next) {
 		if (arm->id.flag & LIB_NEED_LINK) {
-			if (arm->adt) lib_link_animdata(fd, &arm->id, arm->adt);
+			lib_link_animdata(fd, &arm->id, arm->adt);
 			arm->id.flag -= LIB_NEED_LINK;
 		}
 	}
@@ -3287,7 +3286,7 @@ static void lib_link_camera(FileData *fd, Main *main)
 	
 	for (ca = main->camera.first; ca; ca = ca->id.next) {
 		if (ca->id.flag & LIB_NEED_LINK) {
-			if (ca->adt) lib_link_animdata(fd, &ca->id, ca->adt);
+			lib_link_animdata(fd, &ca->id, ca->adt);
 			
 			ca->ipo = newlibadr_us(fd, ca->id.lib, ca->ipo); // XXX deprecated - old animation system
 			
@@ -3315,7 +3314,7 @@ static void lib_link_lamp(FileData *fd, Main *main)
 	
 	for (la = main->lamp.first; la; la = la->id.next) {
 		if (la->id.flag & LIB_NEED_LINK) {
-			if (la->adt) lib_link_animdata(fd, &la->id, la->adt);
+			lib_link_animdata(fd, &la->id, la->adt);
 			
 			for (a = 0; a < MAX_MTEX; a++) {
 				mtex = la->mtex[a];
@@ -3384,7 +3383,7 @@ static void lib_link_key(FileData *fd, Main *main)
 		}
 		
 		if (key->id.flag & LIB_NEED_LINK) {
-			if (key->adt) lib_link_animdata(fd, &key->id, key->adt);
+			lib_link_animdata(fd, &key->id, key->adt);
 			
 			key->ipo = newlibadr_us(fd, key->id.lib, key->ipo); // XXX deprecated - old animation system
 			key->from = newlibadr(fd, key->id.lib, key->from);
@@ -3451,7 +3450,7 @@ static void lib_link_mball(FileData *fd, Main *main)
 	
 	for (mb = main->mball.first; mb; mb = mb->id.next) {
 		if (mb->id.flag & LIB_NEED_LINK) {
-			if (mb->adt) lib_link_animdata(fd, &mb->id, mb->adt);
+			lib_link_animdata(fd, &mb->id, mb->adt);
 			
 			for (a = 0; a < mb->totcol; a++) 
 				mb->mat[a] = newlibadr_us(fd, mb->id.lib, mb->mat[a]);
@@ -3489,7 +3488,7 @@ static void lib_link_world(FileData *fd, Main *main)
 	
 	for (wrld = main->world.first; wrld; wrld = wrld->id.next) {
 		if (wrld->id.flag & LIB_NEED_LINK) {
-			if (wrld->adt) lib_link_animdata(fd, &wrld->id, wrld->adt);
+			lib_link_animdata(fd, &wrld->id, wrld->adt);
 			
 			wrld->ipo = newlibadr_us(fd, wrld->id.lib, wrld->ipo); // XXX deprecated - old animation system
 			
@@ -3613,7 +3612,7 @@ static void lib_link_image(FileData *fd, Main *main)
 	
 	for (ima = main->image.first; ima; ima = ima->id.next) {
 		if (ima->id.flag & LIB_NEED_LINK) {
-			if (ima->id.properties) IDP_LibLinkProperty(ima->id.properties, (fd->flags & FD_FLAGS_SWITCH_ENDIAN), fd);
+			IDP_LibLinkProperty(ima->id.properties, (fd->flags & FD_FLAGS_SWITCH_ENDIAN), fd);
 			
 			ima->id.flag -= LIB_NEED_LINK;
 		}
@@ -3681,7 +3680,7 @@ static void lib_link_curve(FileData *fd, Main *main)
 	
 	for (cu = main->curve.first; cu; cu = cu->id.next) {
 		if (cu->id.flag & LIB_NEED_LINK) {
-			if (cu->adt) lib_link_animdata(fd, &cu->id, cu->adt);
+			lib_link_animdata(fd, &cu->id, cu->adt);
 			
 			for (a = 0; a < cu->totcol; a++) 
 				cu->mat[a] = newlibadr_us(fd, cu->id.lib, cu->mat[a]);
@@ -3773,7 +3772,7 @@ static void lib_link_texture(FileData *fd, Main *main)
 	
 	for (tex = main->tex.first; tex; tex = tex->id.next) {
 		if (tex->id.flag & LIB_NEED_LINK) {
-			if (tex->adt) lib_link_animdata(fd, &tex->id, tex->adt);
+			lib_link_animdata(fd, &tex->id, tex->adt);
 			
 			tex->ima = newlibadr_us(fd, tex->id.lib, tex->ima);
 			tex->ipo = newlibadr_us(fd, tex->id.lib, tex->ipo);
@@ -3853,11 +3852,11 @@ static void lib_link_material(FileData *fd, Main *main)
 	
 	for (ma = main->mat.first; ma; ma = ma->id.next) {
 		if (ma->id.flag & LIB_NEED_LINK) {
-			if (ma->adt) lib_link_animdata(fd, &ma->id, ma->adt);
+			lib_link_animdata(fd, &ma->id, ma->adt);
 			
 			/* Link ID Properties -- and copy this comment EXACTLY for easy finding
 			 * of library blocks that implement this.*/
-			if (ma->id.properties) IDP_LibLinkProperty(ma->id.properties, (fd->flags & FD_FLAGS_SWITCH_ENDIAN), fd);
+			IDP_LibLinkProperty(ma->id.properties, (fd->flags & FD_FLAGS_SWITCH_ENDIAN), fd);
 			
 			ma->ipo = newlibadr_us(fd, ma->id.lib, ma->ipo);
 			ma->group = newlibadr_us(fd, ma->id.lib, ma->group);
@@ -4001,7 +4000,7 @@ static void lib_link_particlesettings(FileData *fd, Main *main)
 	
 	for (part = main->particle.first; part; part = part->id.next) {
 		if (part->id.flag & LIB_NEED_LINK) {
-			if (part->adt) lib_link_animdata(fd, &part->id, part->adt);
+			lib_link_animdata(fd, &part->id, part->adt);
 			part->ipo = newlibadr_us(fd, part->id.lib, part->ipo); // XXX deprecated - old animation system
 			
 			part->dup_ob = newlibadr(fd, part->id.lib, part->dup_ob);
@@ -4308,8 +4307,8 @@ static void lib_link_mesh(FileData *fd, Main *main)
 			
 			/* Link ID Properties -- and copy this comment EXACTLY for easy finding
 			 * of library blocks that implement this.*/
-			if (me->id.properties) IDP_LibLinkProperty(me->id.properties, (fd->flags & FD_FLAGS_SWITCH_ENDIAN), fd);
-			if (me->adt) lib_link_animdata(fd, &me->id, me->adt);
+			IDP_LibLinkProperty(me->id.properties, (fd->flags & FD_FLAGS_SWITCH_ENDIAN), fd);
+			lib_link_animdata(fd, &me->id, me->adt);
 			
 			/* this check added for python created meshes */
 			if (me->mat) {
@@ -4327,9 +4326,10 @@ static void lib_link_mesh(FileData *fd, Main *main)
 			
 			lib_link_customdata_mtface(fd, me, &me->fdata, me->totface);
 			lib_link_customdata_mtpoly(fd, me, &me->pdata, me->totpoly);
-			if (me->mr && me->mr->levels.first)
+			if (me->mr && me->mr->levels.first) {
 				lib_link_customdata_mtface(fd, me, &me->mr->fdata,
-							   ((MultiresLevel*)me->mr->levels.first)->totface);
+				                           ((MultiresLevel*)me->mr->levels.first)->totface);
+			}
 		}
 	}
 
@@ -4584,7 +4584,7 @@ static void lib_link_latt(FileData *fd, Main *main)
 	
 	for (lt = main->latt.first; lt; lt = lt->id.next) {
 		if (lt->id.flag & LIB_NEED_LINK) {
-			if (lt->adt) lib_link_animdata(fd, &lt->id, lt->adt);
+			lib_link_animdata(fd, &lt->id, lt->adt);
 			
 			lt->ipo = newlibadr_us(fd, lt->id.lib, lt->ipo); // XXX deprecated - old animation system
 			lt->key = newlibadr_us(fd, lt->id.lib, lt->key);
@@ -4637,8 +4637,8 @@ static void lib_link_object(FileData *fd, Main *main)
 	
 	for (ob = main->object.first; ob; ob = ob->id.next) {
 		if (ob->id.flag & LIB_NEED_LINK) {
-			if (ob->id.properties) IDP_LibLinkProperty(ob->id.properties, (fd->flags & FD_FLAGS_SWITCH_ENDIAN), fd);
-			if (ob->adt) lib_link_animdata(fd, &ob->id, ob->adt);
+			IDP_LibLinkProperty(ob->id.properties, (fd->flags & FD_FLAGS_SWITCH_ENDIAN), fd);
+			lib_link_animdata(fd, &ob->id, ob->adt);
 			
 // XXX deprecated - old animation system <<<
 			ob->ipo = newlibadr_us(fd, ob->id.lib, ob->ipo);
@@ -5535,8 +5535,8 @@ static void lib_link_scene(FileData *fd, Main *main)
 		if (sce->id.flag & LIB_NEED_LINK) {
 			/* Link ID Properties -- and copy this comment EXACTLY for easy finding
 			 * of library blocks that implement this.*/
-			if (sce->id.properties) IDP_LibLinkProperty(sce->id.properties, (fd->flags & FD_FLAGS_SWITCH_ENDIAN), fd);
-			if (sce->adt) lib_link_animdata(fd, &sce->id, sce->adt);
+			IDP_LibLinkProperty(sce->id.properties, (fd->flags & FD_FLAGS_SWITCH_ENDIAN), fd);
+			lib_link_animdata(fd, &sce->id, sce->adt);
 			
 			lib_link_keyingsets(fd, &sce->id, &sce->keyingsets);
 			
@@ -6097,8 +6097,7 @@ static void lib_link_gpencil(FileData *fd, Main *main)
 		if (gpd->id.flag & LIB_NEED_LINK) {
 			gpd->id.flag -= LIB_NEED_LINK;
 			
-			if (gpd->adt)
-				lib_link_animdata(fd, &gpd->id, gpd->adt);
+			lib_link_animdata(fd, &gpd->id, gpd->adt);
 		}
 	}
 }
@@ -7182,7 +7181,7 @@ static void lib_link_speaker(FileData *fd, Main *main)
 	
 	for (spk = main->speaker.first; spk; spk = spk->id.next) {
 		if (spk->id.flag & LIB_NEED_LINK) {
-			if (spk->adt) lib_link_animdata(fd, &spk->id, spk->adt);
+			lib_link_animdata(fd, &spk->id, spk->adt);
 			
 			spk->sound = newlibadr_us(fd, spk->id.lib, spk->sound);
 			spk->id.flag -= LIB_NEED_LINK;
@@ -7390,8 +7389,7 @@ static void lib_link_movieclip(FileData *fd, Main *main)
 			MovieTracking *tracking = &clip->tracking;
 			MovieTrackingObject *object;
 
-			if (clip->adt)
-				lib_link_animdata(fd, &clip->id, clip->adt);
+			lib_link_animdata(fd, &clip->id, clip->adt);
 			
 			clip->gpd = newlibadr_us(fd, clip->id.lib, clip->gpd);
 			
@@ -7469,8 +7467,7 @@ static void lib_link_mask(FileData *fd, Main *main)
 		if (mask->id.flag & LIB_NEED_LINK) {
 			MaskLayer *masklay;
 
-			if (mask->adt)
-				lib_link_animdata(fd, &mask->id, mask->adt);
+			lib_link_animdata(fd, &mask->id, mask->adt);
 
 			for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {
 				MaskSpline *spline;
@@ -7511,10 +7508,8 @@ static void lib_link_linestyle(FileData *fd, Main *main)
 		if (linestyle->id.flag & LIB_NEED_LINK) {
 			linestyle->id.flag -= LIB_NEED_LINK;
 
-			if (linestyle->id.properties)
-				IDP_LibLinkProperty(linestyle->id.properties, (fd->flags & FD_FLAGS_SWITCH_ENDIAN), fd);
-			if (linestyle->adt)
-				lib_link_animdata(fd, &linestyle->id, linestyle->adt);
+			IDP_LibLinkProperty(linestyle->id.properties, (fd->flags & FD_FLAGS_SWITCH_ENDIAN), fd);
+			lib_link_animdata(fd, &linestyle->id, linestyle->adt);
 			for (m = linestyle->color_modifiers.first; m; m = m->next) {
 				switch (m->type) {
 				case LS_MODIFIER_DISTANCE_FROM_OBJECT: