Merge branch 'revgraphics'

Conflicts:
	src/framework/CMakeLists.txt
	src/framework/application.cpp
	src/framework/graphics/graphics.cpp
This commit is contained in:
Eduardo Bart
2011-12-09 12:23:32 -02:00
81 changed files with 1988 additions and 767 deletions

View File

@@ -178,12 +178,6 @@ namespace Fw
LogFatal
};
enum BlendFunc {
BlendDefault,
BlendColorzing,
BlendParticles
};
enum AspectRatioMode {
IgnoreAspectRatio,
KeepAspectRatio,