Merge remote-tracking branch 'origin/master' into GeneratorShapeRefactor

This commit is contained in:
Mattes D
2014-11-20 10:13:10 +01:00
38 changed files with 1493 additions and 603 deletions
+1 -1
View File
@@ -10,7 +10,7 @@
#pragma once
#include "ComposableGenerator.h"
#include "../Noise.h"
#include "../Noise/Noise.h"