CSPublic/Blocks3D
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/andreja6/G3D-Fun

Browse Source
This commit is contained in:
MusicalProgrammer
2018-07-07 20:55:46 -04:00
parent fe65f8945c db4c46cf20
commit 374d3d3627
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
main.cpp
View File

@@ -1566,11 +1566,6 @@ void Demo::onCreate(HWND parentWindow)
int main(int argc, char** argv) { int main(int argc, char** argv) {
try{ try{
hresult = OleInitialize(NULL); hresult = OleInitialize(NULL);
<<<<<<< HEAD
=======
hresult = CoCreateInstance(CLSID_G3d, NULL, CLSCTX_SERVER, IID_IUnknown, (void **)&punk);
hresult = punk->QueryInterface(IID_IDispatch, (void **)&pdisp);
>>>>>>> db4c46cf20d280b99ab13d892c809de8108d4862
if (!AXRegister()) if (!AXRegister())
return 0; return 0;