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
path: root/intern
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2017-10-25 02:22:16 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2017-10-25 02:22:16 +0300
commit83877632a37af921d94811f47798c65520974a92 (patch)
tree14b907d3ba2e87a2fb513db1b8bbc394b94cf0d3 /intern
parent34fe3f9c069fc93fde5ec5bafcdfb9294348b58f (diff)
Fix one more assert being triggered due to recent changes.
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/device/device_memory.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/device/device_memory.h b/intern/cycles/device/device_memory.h
index 09b6602a102..6bef6a9d5cc 100644
--- a/intern/cycles/device/device_memory.h
+++ b/intern/cycles/device/device_memory.h
@@ -296,13 +296,13 @@ public:
device_free();
host_free(data_pointer, sizeof(T)*data_size);
data_pointer = host_alloc(sizeof(T)*new_size);
+ assert(device_pointer == 0);
}
data_size = new_size;
data_width = width;
data_height = height;
data_depth = depth;
- assert(device_pointer == 0);
return get_data();
}