Merge pull request #14376 from masa-iwm:3.4
authormasa-iwm <37230118+masa-iwm@users.noreply.github.com>
Mon, 22 Apr 2019 15:50:31 +0000 (00:50 +0900)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 22 Apr 2019 15:50:31 +0000 (18:50 +0300)
commit5c404bb142f82c4e241439c6b4c0a64e1cac8c4b
tree04ee10f7cfe84f7e8583f4d2745060980bcc7160
parent5c0a98cfb63cbbf5c25dc5ad9ba2ece51c191097
Merge pull request #14376 from masa-iwm:3.4

* fix getting platformIDs in initializeContextFromD3D11Device
modules/core/src/directx.cpp