From 16c2437d702aef5124bd89eebcce6c319523f8c4 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 4 Jul 2019 14:24:08 +0200 Subject: [PATCH] Fix breaking changes --- spine-cocos2dx/src/spine/SkeletonRenderer.h | 2 +- spine-cpp/spine-cpp/include/spine/Atlas.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spine-cocos2dx/src/spine/SkeletonRenderer.h b/spine-cocos2dx/src/spine/SkeletonRenderer.h index 9e2249b47..fb3a48814 100644 --- a/spine-cocos2dx/src/spine/SkeletonRenderer.h +++ b/spine-cocos2dx/src/spine/SkeletonRenderer.h @@ -48,7 +48,7 @@ namespace spine { void update (float deltaTime) override; void draw (cocos2d::Renderer* renderer, const cocos2d::Mat4& transform, uint32_t transformFlags) override; - bool isAutoCulled () const override; + bool isAutoCulled () const; cocos2d::Rect getBoundingBox () const override; void onEnter () override; void onExit () override; diff --git a/spine-cpp/spine-cpp/include/spine/Atlas.h b/spine-cpp/spine-cpp/include/spine/Atlas.h index 56617f901..91f66912e 100644 --- a/spine-cpp/spine-cpp/include/spine/Atlas.h +++ b/spine-cpp/spine-cpp/include/spine/Atlas.h @@ -99,9 +99,9 @@ class TextureLoader; class SP_API Atlas : public SpineObject { public: - Atlas(const String &path, TextureLoader *textureLoader, bool createTexture); + Atlas(const String &path, TextureLoader *textureLoader, bool createTexture = true); - Atlas(const char *data, int length, const char *dir, TextureLoader *textureLoader, bool createTexture); + Atlas(const char *data, int length, const char *dir, TextureLoader *textureLoader, bool createTexture = true); ~Atlas();