Replace of (id->lib != NULL) check by meaningful macro.

Idea is to replace hard-to-track (id->lib != NULL) 'is linked datablock' check everywhere in Blender
by a macro doing the same thing. This will allow to easily spot those checks in future, and more importantly,
to easily change it (see work done in asset-engine branch).

Note: did not touch to readfile.c, since there most of the time 'id->lib' check actually concerns the pointer,
and not a check whether ID is linked or not. Will have a closer look at it later.

Reviewers: campbellbarton, brecht, sergey

Differential Revision: https://developer.blender.org/D2082

1 files changed, 4 insertions, 4 deletions

diff --git a/source/blender/blenkernel/intern/world.c b/source/blender/blenkernel/intern/world.c
index ec021586be5..c6ab843b38a 100644
--- a/source/blender/blenkernel/intern/world.c
+++ b/source/blender/blenkernel/intern/world.c
@@ -141,7 +141,7 @@ World *BKE_world_copy(World *wrld)
 
 	BLI_listbase_clear(&wrldn->gpumaterial);
 
-	if (wrld->id.lib) {
+	if (ID_IS_LINKED_DATABLOCK(wrld)) {
 		BKE_id_lib_local_paths(G.main, wrld->id.lib, &wrldn->id);
 	}
 
@@ -185,7 +185,7 @@ void BKE_world_make_local(World *wrld)
 	 * - mixed: make copy
 	 */
 	
-	if (wrld->id.lib == NULL) return;
+	if (!ID_IS_LINKED_DATABLOCK(wrld)) return;
 	if (wrld->id.us == 1) {
 		id_clear_lib_data(bmain, &wrld->id);
 		return;
@@ -193,7 +193,7 @@ void BKE_world_make_local(World *wrld)
 	
 	for (sce = bmain->scene.first; sce && ELEM(false, is_lib, is_local); sce = sce->id.next) {
 		if (sce->world == wrld) {
-			if (sce->id.lib) is_lib = true;
+			if (ID_IS_LINKED_DATABLOCK(sce)) is_lib = true;
 			else is_local = true;
 		}
 	}
@@ -210,7 +210,7 @@ void BKE_world_make_local(World *wrld)
 
 		for (sce = bmain->scene.first; sce; sce = sce->id.next) {
 			if (sce->world == wrld) {
-				if (sce->id.lib == NULL) {
+				if (!ID_IS_LINKED_DATABLOCK(sce)) {
 					sce->world = wrld_new;
 					id_us_plus(&wrld_new->id);
 					id_us_min(&wrld->id);