Relintai/texture_packer
1
0
Fork 0
mirror of https://github.com/Relintai/texture_packer.git synced 2025-02-04 16:16:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Hackfix crash on 4.0.

Browse Source
This commit is contained in:
Relintai 2020-05-16 21:34:54 +02:00
parent b29b499adf
commit e3047f7dfa
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
texture_resource/packer_image_resource.cpp
View File

@ -22,6 +22,8 @@ SOFTWARE.
#include "packer_image_resource.h" #include "packer_image_resource.h"
#include "core/version.h"
int PackerImageResource::get_width() const { int PackerImageResource::get_width() const {
if (_image.is_valid()) { if (_image.is_valid()) {
return _image->get_width(); return _image->get_width();
@ -62,8 +64,6 @@ bool PackerImageResource::get_rect_region(const Rect2 &p_rect, const Rect2 &p_sr
} }
void PackerImageResource::set_data(const Ref<Image> &p_image) { void PackerImageResource::set_data(const Ref<Image> &p_image) {
ERR_FAIL_COND(p_image.is_null());
_image = p_image; _image = p_image;
} }
@ -73,7 +73,10 @@ Ref<Image> PackerImageResource::get_data() const {
void PackerImageResource::_bind_methods() { void PackerImageResource::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_data", "image"), &PackerImageResource::set_data); ClassDB::bind_method(D_METHOD("set_data", "image"), &PackerImageResource::set_data);
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "Image"), "set_data", "get_data"); #if VERSION_MAJOR < 4
//for some reason this crashes on 4.0. Not yet sure why
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "Image", PROPERTY_USAGE_DEFAULT), "set_data", "get_data");
#endif
} }
PackerImageResource::PackerImageResource() { PackerImageResource::PackerImageResource() {

1
texture_resource/packer_image_resource.h
View File

@ -27,7 +27,6 @@ SOFTWARE.
#include "scene/resources/texture.h" #include "scene/resources/texture.h"
class PackerImageResource : public Texture { class PackerImageResource : public Texture {
GDCLASS(PackerImageResource, Texture); GDCLASS(PackerImageResource, Texture);
RES_BASE_EXTENSION("restex"); RES_BASE_EXTENSION("restex");