conflict with upstream/OpenSceneGraph-3.6 resolved

This commit is contained in:
valid-ptr 2021-03-24 17:40:15 +03:00 committed by konstantin.matveyev
parent 927d2f0f10
commit b728587fab