(86a1bac17) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

This commit is contained in:
Joonas Rikkonen
2019-04-04 11:12:46 +03:00
parent 3b35ba056d
commit 6ac3ecd2b2
7 changed files with 1 additions and 248 deletions
@@ -10,8 +10,6 @@ namespace Barotrauma
{
protected Texture2D texture;
private bool preMultipliedAlpha;
public Texture2D Texture
{
get