diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-04-01 04:34:00 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-04-01 08:22:28 +0400 |
commit | 617557b08ea94e2b65a1697ddf0b79651204d92b (patch) | |
tree | 50b24bab075b42fa20456140c9a9681cfb01325b /source/blender/blenkernel/intern/world.c | |
parent | 2c00ecc738c04dc5dc22d4a6b81a1e937526ba6d (diff) |
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
Diffstat (limited to 'source/blender/blenkernel/intern/world.c')
-rw-r--r-- | source/blender/blenkernel/intern/world.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/world.c b/source/blender/blenkernel/intern/world.c index 0104efb4892..5065c3ae04f 100644 --- a/source/blender/blenkernel/intern/world.c +++ b/source/blender/blenkernel/intern/world.c @@ -75,7 +75,7 @@ void BKE_world_free_ex(World *wrld, bool do_id_user) void BKE_world_free(World *wrld) { - BKE_world_free_ex(wrld, TRUE); + BKE_world_free_ex(wrld, true); } World *add_world(Main *bmain, const char *name) @@ -166,7 +166,7 @@ void BKE_world_make_local(World *wrld) { Main *bmain = G.main; Scene *sce; - int is_local = FALSE, is_lib = FALSE; + bool is_local = false, is_lib = false; /* - only lib users: do nothing * - only local users: set flag @@ -179,14 +179,14 @@ void BKE_world_make_local(World *wrld) return; } - for (sce = bmain->scene.first; sce && ELEM(FALSE, is_lib, is_local); sce = sce->id.next) { + 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; - else is_local = TRUE; + if (sce->id.lib) is_lib = true; + else is_local = true; } } - if (is_local && is_lib == FALSE) { + if (is_local && is_lib == false) { id_clear_lib_data(bmain, &wrld->id); } else if (is_local && is_lib) { |