diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-11-09 07:08:02 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-11-09 07:08:02 +0400 |
| commit | 610d746c12c33954774a6fc903e42e03590ecb81 (patch) | |
| tree | f69042808e7ebf472bbe5ef928ca424ec2eb37e7 /intern/cycles/blender/blender_util.h | |
| parent | b537758192abd5657a6e2c7b365db0c1afd50bee (diff) | |
code cleanup: double promotion warnings with new bevel code & wrong use of NULL in cycles.
Diffstat (limited to 'intern/cycles/blender/blender_util.h')
| -rw-r--r-- | intern/cycles/blender/blender_util.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/blender/blender_util.h b/intern/cycles/blender/blender_util.h index 5c47b124642..4feb8b556d5 100644 --- a/intern/cycles/blender/blender_util.h +++ b/intern/cycles/blender/blender_util.h @@ -287,7 +287,7 @@ public: bool is_used(const K& key) { T *data = find(key); - return (data)? used_set.find(data) != used_set.end(): NULL; + return (data) ? used_set.find(data) != used_set.end() : false; } void used(T *data) |