Resolve conflicts with master

[irrlicht.git] / examples / AutomatedTest / main.cpp

diff --git a/examples/AutomatedTest/main.cpp b/examples/AutomatedTest/main.cpp
index 5df7a291c2700ca67889aba0502d691054407757..96cbc7388b3c7bfac375574cd0b1689269232363 100644 (file)
--- a/examples/AutomatedTest/main.cpp
+++ b/examples/AutomatedTest/main.cpp
@@ -20,6 +20,8 @@ static video::E_DRIVER_TYPE chooseDriver(core::stringc arg_)
                return video::EDT_OGLES2;\r
        if (arg_ == "opengl")\r
                return video::EDT_OPENGL;\r
+       if (arg_ == "opengl3")\r
+               return video::EDT_OPENGL3;\r
        std::cerr << "Unknown driver type: " << arg_.c_str() << ". Trying OpenGL." << std::endl;\r
        return video::EDT_OPENGL;\r
 }\r