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

Removed the merge_textures property from PropInstanceMerger.

Browse Source
This commit is contained in:
Relintai 2021-08-10 10:19:03 +02:00
parent 0d4d55278f
commit 7c815f26b0
2 changed files with 0 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
prop_instance_merger.cpp
View File

@ -66,16 +66,6 @@ void PropInstanceMerger::set_job(const Ref<PropInstanceJob> &job) {
_job = job;
}
#ifdef TEXTURE_PACKER_PRESENT
bool PropInstanceMerger::get_merge_textures() const {
return _merge_textures;
}
void PropInstanceMerger::set_merge_textures(const bool value) {
_merge_textures = value;
}
#endif
//Materials
Ref<Material> PropInstanceMerger::material_get(const int index) {
ERR_FAIL_INDEX_V(index, _materials.size(), Ref<Material>(NULL));
@ -624,12 +614,6 @@ void PropInstanceMerger::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_job", "value"), &PropInstanceMerger::set_job);
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "job", PROPERTY_HINT_RESOURCE_TYPE, "PropInstanceJob", 0), "set_job", "get_job");
#ifdef TEXTURE_PACKER_PRESENT
ClassDB::bind_method(D_METHOD("get_merge_textures"), &PropInstanceMerger::get_merge_textures);
ClassDB::bind_method(D_METHOD("set_merge_textures", "value"), &PropInstanceMerger::set_merge_textures);
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "merge_textures"), "set_merge_textures", "get_merge_textures");
#endif
///Materials
ClassDB::bind_method(D_METHOD("material_get", "index"), &PropInstanceMerger::material_get);
ClassDB::bind_method(D_METHOD("material_add", "value"), &PropInstanceMerger::material_add);

9
prop_instance_merger.h
View File

@ -50,11 +50,6 @@ public:
Ref<PropInstanceJob> get_job();
void set_job(const Ref<PropInstanceJob> &job);
#ifdef TEXTURE_PACKER_PRESENT
bool get_merge_textures() const;
void set_merge_textures(const bool value);
#endif
///Materials
Ref<Material> material_get(const int index);
void material_add(const Ref<Material> &value);
@ -141,10 +136,6 @@ private:
Ref<PropInstancePropJob> _job;
#ifdef TEXTURE_PACKER_PRESENT
bool _merge_textures;
#endif
Vector<Ref<Material> > _materials;
Vector<MeshEntry> _meshes;
Vector<ColliderBody> _colliders;