16
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 11:39:19 +02:00

Merge branch 'tmj-dev'

This commit is contained in:
milek7
2018-02-16 15:25:53 +01:00
113 changed files with 4617 additions and 4057 deletions

View File

@@ -11,11 +11,10 @@ http://mozilla.org/MPL/2.0/.
#include <vector>
#include "Classes.h"
#include "material.h"
#include "vertex.h"
#include "openglgeometrybank.h"
#include "parser.h"
#include "Model3d.h"
struct lighting_data {