mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-03 10:09:40 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/model-opacity

Browse Source 
* Solve conflicts in ghoul, renderablemodel.cpp and iss.asset
This commit is contained in:
Malin E
2023-02-01 14:52:33 +01:00
parent 04c83f0331 5161662928
commit f490fccee6
1528 changed files with 5669 additions and 4104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/base/rendering/screenspaceframebuffer.cpp
View File

@@ -2,7 +2,7 @@
* *
* OpenSpace *
* *
* Copyright (c) 2014-2022 *
* Copyright (c) 2014-2023 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *