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 /source | |
| 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 'source')
| -rw-r--r-- | source/blender/makesrna/intern/makesrna.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c index b1143acfbee..af3069cf95e 100644 --- a/source/blender/makesrna/intern/makesrna.c +++ b/source/blender/makesrna/intern/makesrna.c @@ -4653,8 +4653,8 @@ static const char *cpp_classes = " operator void*() { return ptr.data; }\n" " operator bool() { return ptr.data != NULL; }\n" "\n" - " bool operator==(const Pointer &other) { return ptr.data == other.ptr.data; }\n" - " bool operator!=(const Pointer &other) { return ptr.data != other.ptr.data; }\n" + " bool operator==(const Pointer &other) const { return ptr.data == other.ptr.data; }\n" + " bool operator!=(const Pointer &other) const { return ptr.data != other.ptr.data; }\n" "\n" " PointerRNA ptr;\n" "};\n" |