[Bf-blender-cvs] [fb941679bb6] master: Fix Cycles allocating too much device memory, after recent memory refactoring.
Brecht Van Lommel
noreply at git.blender.org
Mon Jan 29 17:12:42 CET 2018
Commit: fb941679bb6e537a8fb1e1de69b5a446490e761b
Author: Brecht Van Lommel
Date: Mon Jan 29 14:51:22 2018 +0100
Branches: master
https://developer.blender.org/rBfb941679bb6e537a8fb1e1de69b5a446490e761b
Fix Cycles allocating too much device memory, after recent memory refactoring.
Spotted by Ha Hyung-jin, thanks!
===================================================================
M intern/cycles/device/device_memory.h
===================================================================
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) {
More information about the Bf-blender-cvs
mailing list