NVIDIA GameWorks Integration

[anonymous_user_bcf66e2c]

job man! I’m curious about one thing. How can I merge two of your branches?
Not hardcore code rewriting, just your version of 12.5 with Gameworks + Ortho scene capture 2D?
As I can see ortho branch change 3 files only, but I don’t understand how to properly merge them.
I need to copy-paste these files to Gameworks branch, and build whole thing in VS?

In instance, you can just copy the three files across to the GameWorks branch as the GameWorks branch does not touch these files.