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:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2018-01-29 16:51:22 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2018-01-29 19:07:08 +0300
commitfb941679bb6e537a8fb1e1de69b5a446490e761b (patch)
tree8c99e6dee4bbfff8512d48fa2ad4c0df5b954466 /intern/cycles/device
parent282b3d0fcd0ab32d6f8ae1694bc50599788eb256 (diff)
Fix Cycles allocating too much device memory, after recent memory refactoring.
Spotted by Ha Hyung-jin, thanks!
Diffstat (limited to 'intern/cycles/device')
-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 0f2015ee27c..d8fe41e78bb 100644
--- a/intern/cycles/device/device_memory.h
+++ b/intern/cycles/device/device_memory.h
@@ -247,7 +247,7 @@ public:
void alloc_to_device(size_t num, bool shrink_to_fit = true)
{
- size_t new_size = num*sizeof(T);
+ size_t new_size = num;
bool reallocate;
if(shrink_to_fit) {