16
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-20 04:29:18 +02:00

Merge branch 'tmj-dev' into milek-dev

This commit is contained in:
milek7
2018-09-16 22:48:53 +02:00
126 changed files with 40430 additions and 6134 deletions

View File

@@ -125,7 +125,7 @@ class TAnimAdvanced
class TAnimModel : public scene::basic_node {
friend opengl_renderer;
friend ui_layer;
friend itemproperties_panel;
public:
// constructors