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

PropInstanceMerger: Set job's cancelled flag in build. Also call job's enter tree in set_job, and call it in enter tree if the job is valid, not the prop.

Browse Source
This commit is contained in:
Relintai 2022-02-14 12:49:12 +01:00
parent ce369408ca
commit 10dbb857ce
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
prop_instance_merger.cpp
View File

@ -123,6 +123,10 @@ Ref<PropInstanceJob> PropInstanceMerger::get_job() {
} }
void PropInstanceMerger::set_job(const Ref<PropInstanceJob> &job) { void PropInstanceMerger::set_job(const Ref<PropInstanceJob> &job) {
_job = job; _job = job;
if (is_inside_tree()) {
_job->prop_instance_enter_tree();
}
} }
//Materials //Materials
@ -540,6 +544,7 @@ void PropInstanceMerger::_build() {
_job->reset(); _job->reset();
_job->set_complete(false); _job->set_complete(false);
_job->set_cancelled(false);
Ref<PropMaterialCache> cache = PropCache::get_singleton()->material_cache_get(_prop_data); Ref<PropMaterialCache> cache = PropCache::get_singleton()->material_cache_get(_prop_data);
@ -760,8 +765,11 @@ PropInstanceMerger::~PropInstanceMerger() {
void PropInstanceMerger::_notification(int p_what) { void PropInstanceMerger::_notification(int p_what) {
switch (p_what) { switch (p_what) {
case NOTIFICATION_ENTER_TREE: { case NOTIFICATION_ENTER_TREE: {
if (_prop_data.is_valid()) { if (_job.is_valid()) {
_job->prop_instance_enter_tree(); _job->prop_instance_enter_tree();
}
if (_prop_data.is_valid()) {
call_deferred("build"); call_deferred("build");
} }