asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #67577 from qarmin/fix_exporting_big_templates

Browse source 
Fix exporting with big export templates
This commit is contained in:
Rémi Verschelde 2022-10-31 10:39:08 +01:00
commit 40258bbbe8
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/io/dir_access.cpp
View file

@ -351,7 +351,7 @@ Error DirAccess::copy(String p_from, String p_to, int p_chmod_flags) {
const size_t copy_buffer_limit = 65536; // 64 KB const size_t copy_buffer_limit = 65536; // 64 KB
fsrc->seek_end(0); fsrc->seek_end(0);
int size = fsrc->get_position(); uint64_t size = fsrc->get_position();
fsrc->seek(0); fsrc->seek(0);
err = OK; err = OK;
size_t buffer_size = MIN(size * sizeof(uint8_t), copy_buffer_limit); size_t buffer_size = MIN(size * sizeof(uint8_t), copy_buffer_limit);

16
scene/property_utils.cpp
View file

@ -169,8 +169,10 @@ static bool _collect_inheritance_chain(const Ref<SceneState> &p_state, const Nod
state = state->get_base_scene_state(); state = state->get_base_scene_state();
} }
for (int i = inheritance_states.size() - 1; i >= 0; --i) { if (inheritance_states.size() > 0) {
r_states_stack.push_back(inheritance_states[i]); for (int i = inheritance_states.size() - 1; i >= 0; --i) {
r_states_stack.push_back(inheritance_states[i]);
}
} }
return found; return found;
@ -214,10 +216,12 @@ Vector<SceneState::PackState> PropertyUtils::get_node_states_stack(const Node *p
{ {
states_stack_ret.resize(states_stack.size()); states_stack_ret.resize(states_stack.size());
_FastPackState *ps = states_stack.ptr(); _FastPackState *ps = states_stack.ptr();
for (int i = states_stack.size() - 1; i >= 0; --i) { if (states_stack.size() > 0) {
states_stack_ret.write[i].state.reference_ptr(ps->state); for (int i = states_stack.size() - 1; i >= 0; --i) {
states_stack_ret.write[i].node = ps->node; states_stack_ret.write[i].state.reference_ptr(ps->state);
++ps; states_stack_ret.write[i].node = ps->node;
++ps;
}
} }
} }
return states_stack_ret; return states_stack_ret;