diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2017-11-15 12:11:01 +0300 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2017-11-15 12:40:27 +0300 |
commit | 44517c5f2177d1f260ba691fb59fbacfef576915 (patch) | |
tree | 94d8cefa0a86c2a3de8eae236979d292ddb9d175 /source/blender/makesrna/intern/makesrna.c | |
parent | 258292abc0252360e19654db454c7ef8bd2b63fe (diff) | |
parent | 212a8d9e5ae78a30ed4c35161d91eeca35eaa41f (diff) |
Merge commit '212a8d9e5ae7' into blender2.8
Considerable non-trivial merge conflict fixes.
Diffstat (limited to 'source/blender/makesrna/intern/makesrna.c')
-rw-r--r-- | source/blender/makesrna/intern/makesrna.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c index 720f7324bdb..6c6407789a0 100644 --- a/source/blender/makesrna/intern/makesrna.c +++ b/source/blender/makesrna/intern/makesrna.c @@ -3704,6 +3704,9 @@ 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" +"\n" " PointerRNA ptr;\n" "};\n" "\n" |