浏览代码

Merge branch '3.8' into 3.9-beta

badlogic 5 年之前
父节点
当前提交
a69d7be17f
共有 1 个文件被更改,包括 3 次插入0 次删除
  1. 3 0
      spine-cpp/spine-cpp/include/spine/HasRendererObject.h

+ 3 - 0
spine-cpp/spine-cpp/include/spine/HasRendererObject.h

@@ -45,6 +45,9 @@ public:
 
 	void* getRendererObject() { return _rendererObject; }
 	void setRendererObject(void* rendererObject, DisposeRendererObject dispose = NULL) {
+        if (_dispose && _rendererObject && _rendererObject != rendererObject)
+            _dispose(_rendererObject);
+        
 		_rendererObject = rendererObject;
 		_dispose = dispose;
 	}