dmuratshin 9 years ago
parent
commit
c0d42de3a8

BIN
3rdPartyTools/PVRTexToolCLI.exe


+ 0 - 1
oxygine/SDL/qt/oxygine-framework/oxygine-framework.pro

@@ -82,7 +82,6 @@ HEADERS +=  \
   $$SRC/PointerState.h \
   $$SRC/ProgressBar.h \
   $$SRC/RenderState.h \
-  $$SRC/RootActor.h \
   $$SRC/SlidingActor.h \
   $$SRC/Sprite.h \
   $$SRC/TextActor.h \

+ 2 - 0
oxygine/src/core/oxygine.cpp

@@ -721,7 +721,9 @@ namespace oxygine
 
         bool update()
         {
+#ifndef OXYGINE_EDITOR
             key::update();
+#endif
 
             timeMS duration = IVideoDriver::_stats.duration;
             IVideoDriver::_stats = IVideoDriver::Stats();

+ 1 - 1
oxygine/src/oxygine_include.h

@@ -92,7 +92,7 @@ namespace oxygine { namespace log { void error(const char* format, ...); } }
 
 //assert without log::error
 #ifdef OXYGINE_QT
-#   define OX_ASSERT_NL(x) {Q_ASSERT(x);}
+#   define OX_ASSERT_NL(x) { if (!(x)) __asm("int3"); Q_ASSERT(x);}
 #elif !OX_DEBUG || EMSCRIPTEN
 #   define OX_ASSERT_NL(x)
 #else