diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2020-03-08 16:21:29 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2020-03-11 22:45:39 +0300 |
commit | 6cf4861c3ac09fd65a765e8f8e3584713cc5303b (patch) | |
tree | b2b104fbda65b67c56dd2a39ad812c89bc5b1ee2 /intern/cycles/blender/blender_session.cpp | |
parent | d8aa613d94caf6a3d82a8f4e9e90b9b8f5c61a7d (diff) |
Cleanup: refactor image loading to use abstract ImageLoader base class
Rather than passing around void pointers, various Blender image sources now
subclass this. OIIO is also just another type of image loader.
Also fixes T67718: Cycles viewport render crash editing point density settings
Diffstat (limited to 'intern/cycles/blender/blender_session.cpp')
-rw-r--r-- | intern/cycles/blender/blender_session.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp index ac307743e48..8e01ad9a96d 100644 --- a/intern/cycles/blender/blender_session.cpp +++ b/intern/cycles/blender/blender_session.cpp @@ -138,14 +138,6 @@ void BlenderSession::create_session() scene = new Scene(scene_params, session->device); scene->name = b_scene.name(); - /* setup callbacks for builtin image support */ - scene->image_manager->builtin_image_info_cb = function_bind( - &BlenderSession::builtin_image_info, this, _1, _2, _3); - scene->image_manager->builtin_image_pixels_cb = function_bind( - &BlenderSession::builtin_image_pixels, this, _1, _2, _3, _4, _5, _6, _7); - scene->image_manager->builtin_image_float_pixels_cb = function_bind( - &BlenderSession::builtin_image_float_pixels, this, _1, _2, _3, _4, _5, _6, _7); - session->scene = scene; /* There is no single depsgraph to use for the entire render. |