diff options
| author | Lukas Stockner <lukas.stockner@freenet.de> | 2016-05-08 02:44:01 +0300 |
|---|---|---|
| committer | Lukas Stockner <lukas.stockner@freenet.de> | 2016-05-08 18:44:03 +0300 |
| commit | cbaa25eb88a25852791d4f8b18fb9e9137fea401 (patch) | |
| tree | 6c11d0aa36ac2f7aac07868262d38964237d0c10 /intern/cycles/render/camera.cpp | |
| parent | 6100c2d262c58c611ccc75a20cca23bf9f245767 (diff) | |
Cycles: Fix two small memory leaks and deduplicate table freeing
This commit makes remove_table skip the freeing if the offset is
already set to invalid - or, if it wasn't, set it to invalid after freeing.
That's what the current code was already doing in the Manager classes,
this change allows them to just call remove without the additional code.
Also, two potential memory leaks where new tables were always allocated
without freeing the old ones are fixed.
Reviewers: sergey, dingto, brecht
Differential Revision: https://developer.blender.org/D1974
Diffstat (limited to 'intern/cycles/render/camera.cpp')
| -rw-r--r-- | intern/cycles/render/camera.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/intern/cycles/render/camera.cpp b/intern/cycles/render/camera.cpp index 028916c1b8f..ad96473e5d2 100644 --- a/intern/cycles/render/camera.cpp +++ b/intern/cycles/render/camera.cpp @@ -323,6 +323,7 @@ void Camera::device_update(Device *device, DeviceScene *dscene, Scene *scene) #ifdef __CAMERA_MOTION__ kcam->shuttertime = (need_motion == Scene::MOTION_BLUR) ? shuttertime: -1.0f; + scene->lookup_tables->remove_table(&shutter_table_offset); if(need_motion == Scene::MOTION_BLUR) { vector<float> shutter_table; util_cdf_inverted(SHUTTER_TABLE_SIZE, @@ -335,10 +336,6 @@ void Camera::device_update(Device *device, DeviceScene *dscene, Scene *scene) shutter_table); kcam->shutter_table_offset = (int)shutter_table_offset; } - else if(shutter_table_offset != TABLE_OFFSET_INVALID) { - scene->lookup_tables->remove_table(shutter_table_offset); - shutter_table_offset = TABLE_OFFSET_INVALID; - } #else kcam->shuttertime = -1.0f; #endif @@ -425,10 +422,7 @@ void Camera::device_free(Device * /*device*/, DeviceScene * /*dscene*/, Scene *scene) { - if(shutter_table_offset != TABLE_OFFSET_INVALID) { - scene->lookup_tables->remove_table(shutter_table_offset); - shutter_table_offset = TABLE_OFFSET_INVALID; - } + scene->lookup_tables->remove_table(&shutter_table_offset); } bool Camera::modified(const Camera& cam) |