Control: tags -1 fixed-upstream patch
Matteo,
On Sun, Sep 24, 2017 at 2:45 PM, Matteo F. Vescovi <[email protected]> wrote:
> Hi Mathieu!
>
> On 2017-09-23 at 13:42 (+0200), Matteo F. Vescovi wrote:
>
> [...]
>
>> I'll give blender 2.79 a try, even if I'm not sure it would help yet.
>
> No luck. It fails there too.
>
>> Gonna ping upstream anyway for a possible fix.
>
> My contact there is afk this weekend.
> Gonna ping him next week.
Thanks for your work with upstream. I can confirm that I am able to
build blender 2.79 with the attached patch (grabbed from upstream at:
https://developer.blender.org/rB0d4e519b748c).
I'll re-submit OpenVDB 4.0.2 using abi=4 in next few days.
Regards
Description: <short summary of the patch>
TODO: Put a short summary on the line above and replace this paragraph
with a longer explanation of this change. Complete the meta-information
with other relevant fields (see below for details). To make it easier, the
information below has been extracted from the changelog. Adjust it or drop
it.
.
blender (2.79+dfsg0-1) unstable; urgency=medium
.
* New upstream release
- debian/patches/: patchset updated
- #0003 refreshed
- #0008 -> #0010 dropped (applied upstream)
* debian/: dh bump 9 -> 10
* debian/control:
- drop autotools-dev from b-deps
- S-V bump 4.0.0 -> 4.1.0 (no changes needed)
Author: Matteo F. Vescovi <[email protected]>
---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:
Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: https://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: 2017-09-25
--- blender-2.79+dfsg0.orig/intern/openvdb/intern/openvdb_writer.cc
+++ blender-2.79+dfsg0/intern/openvdb/intern/openvdb_writer.cc
@@ -45,7 +45,11 @@ void OpenVDBWriter::insert(const openvdb
void OpenVDBWriter::insert(const openvdb::GridBase &grid)
{
+#if (OPENVDB_LIBRARY_MAJOR_VERSION_NUMBER == 3)
m_grids->push_back(grid.copyGrid());
+#else
+ m_grids->push_back(grid.copyGridWithNewTree());
+#endif
}
void OpenVDBWriter::insertFloatMeta(const openvdb::Name &name, const float value)
