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:
authorMai Lavelle <mai.lavelle@gmail.com>2017-08-09 11:24:03 +0300
committerMai Lavelle <mai.lavelle@gmail.com>2017-08-09 11:24:03 +0300
commit06bf34227be1aeb27662395b6bfb76f12213e3be (patch)
treed433ad7bb9b84400a10a46488f7976fb1b39ac7e /intern/cycles/render/image.h
parent2190c0c7e52827a80a4b9bab00615bd21ca6c8dd (diff)
Revert "Cycles: Fix crash changing image after recent OpenCL changes"
This reverts commit f2809ae0a671057caa1005e2b9cc91648c33dd1f.
Diffstat (limited to 'intern/cycles/render/image.h')
-rw-r--r--intern/cycles/render/image.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/intern/cycles/render/image.h b/intern/cycles/render/image.h
index abd1abbd729..c86d1cbedbf 100644
--- a/intern/cycles/render/image.h
+++ b/intern/cycles/render/image.h
@@ -160,11 +160,6 @@ private:
DeviceScene *dscene,
ImageDataType type,
int slot);
-
- /* Will do locking when needed and make sure possible memory manager from
- * the device implementation is aware of freed texture.
- */
- void device_tex_free_safe(Device *device, device_memory& mem);
};
CCL_NAMESPACE_END