Fix branch names

assimp · Oct 5, 2023 · 0834691 · 0834691
1 parent b80b225
commit 0834691
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -2,9 +2,9 @@ name: CMake
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -2,9 +2,9 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ "master" ]
+    branches: [ "main" ]
   pull_request:
-    branches: [ "master" ]
+    branches: [ "main" ]
 
 jobs:
   analyze:

diff --git a/contrib/osre b/contrib/osre
+81 −48		CMakeLists.txt
+1 −2		README.md
+1 −1		contrib/cppcore
+0 −8		include/osre/App/World.h
+1 −1		include/osre/Platform/AbstractWindow.h
+22 −21		include/osre/RenderBackend/RenderCommon.h
+1 −1		samples/01_ModelLoading/ModelLoading.cpp
+22 −17		samples/03_Instancing/Instancing.cpp
+12 −10		src/Editor_imgui/src/Gui/UIElements.cpp
+7 −17		src/Editor_imgui/src/OsreEdApp.cpp
+4 −4		src/Engine/App/AppBase.cpp
+2 −2		src/Engine/App/Project.cpp
+0 −18		src/Engine/App/World.cpp
+3 −1		src/Engine/CMakeLists.txt
+1 −1		src/Engine/Common/Logger.cpp
+1 −1		src/Engine/Platform/AbstractPlatformEventQueue.cpp
+5 −4		src/Engine/Platform/PlatformInterface.cpp
+1 −1		src/Engine/Platform/PlatformPluginFactory.cpp
+30 −15		src/Engine/Platform/sdl2/SDL2EventQueue.cpp
+25 −19		src/Engine/Platform/sdl2/SDL2OGLRenderContext.cpp
+13 −13		src/Engine/Platform/sdl2/SDL2OGLRenderContext.h
+2 −1		src/Engine/Platform/sdl2/SDL2Window.cpp
+1 −1		src/Engine/Platform/win32/Win32OGLRenderContext.cpp
+11 −3		src/Engine/RenderBackend/Mesh.cpp
+6 −15		src/Engine/RenderBackend/OGLRenderer/OGLCommon.cpp
+3 −2		src/Engine/RenderBackend/OGLRenderer/OGLRenderEventHandler.cpp
+3 −3		src/Engine/RenderBackend/OGLRenderer/OGLShader.cpp
+2 −2		src/Engine/RenderBackend/OGLRenderer/RenderCmdBuffer.cpp
+9 −2		src/Engine/RenderBackend/RenderCommon.cpp
+2 −0		test/RenderTests/src/AbstractRenderTest.cpp
+2 −1		test/RenderTests/src/Textures/Texture3DRenderTest.cpp
+6 −3		test/UnitTests/src/RenderBackend/RenderCommonTest.cpp