diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-11-25 00:01:30 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-11-25 00:01:53 +0300 |
commit | 059c119719e04283808d3c7076886e1a58874f6b (patch) | |
tree | 5296776b81111ef62e33687d4a9b4c6ab5e297ff /source/blender/blenkernel/intern | |
parent | fa0fcbe4d6ca3f183f02395fe9ba18fb5ea87748 (diff) | |
parent | e742e0934de6384eeaf271ca4cfe99922ddbe3fb (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r-- | source/blender/blenkernel/intern/main.c | 1 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/object.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/main.c b/source/blender/blenkernel/intern/main.c index 6291e35e968..c063af48186 100644 --- a/source/blender/blenkernel/intern/main.c +++ b/source/blender/blenkernel/intern/main.c @@ -443,4 +443,3 @@ int set_listbasepointers(Main *bmain, ListBase **lb) return (MAX_LIBARRAY - 1); } - diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 5e1dab46811..70a912929e6 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -4058,4 +4058,4 @@ bool BKE_image_empty_visible_in_view3d(const Object *ob, const RegionView3D *rv3 else { return visibility_flag & OB_EMPTY_IMAGE_VISIBLE_ORTHOGRAPHIC; } -}
\ No newline at end of file +} |