Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-09-18 02:34:42 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-09-18 02:34:42 +0400
commitf6251a1f321d9c35b924bd88b2b786cce035071d (patch)
treef0926be163673fb7b9ffde3876e947be84dc2170 /intern/memutil
parentaff591c6e1233248ad8b4f37c87d6e5ea406a35d (diff)
code cleanup: warning and style
Diffstat (limited to 'intern/memutil')
-rw-r--r--intern/memutil/MEM_CacheLimiter.h13
1 files changed, 8 insertions, 5 deletions
diff --git a/intern/memutil/MEM_CacheLimiter.h b/intern/memutil/MEM_CacheLimiter.h
index 801ee154d40..1f1088ea118 100644
--- a/intern/memutil/MEM_CacheLimiter.h
+++ b/intern/memutil/MEM_CacheLimiter.h
@@ -179,9 +179,10 @@ public:
return;
}
- if(getDataSize) {
+ if (getDataSize) {
mem_in_use = total_size();
- } else {
+ }
+ else {
mem_in_use = MEM_get_memory_in_use();
}
@@ -196,16 +197,18 @@ public:
priority_queue.pop();
- if(getDataSize) {
+ if (getDataSize) {
cur_size = getDataSize(elem->get()->get_data());
- } else {
+ }
+ else {
cur_size = mem_in_use;
}
if (elem->destroy_if_possible()) {
if (getDataSize) {
mem_in_use -= cur_size;
- } else {
+ }
+ else {
mem_in_use -= cur_size - MEM_get_memory_in_use();
}
}