TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 18:31:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix regression with Actor loading

Browse Source
This commit is contained in:
rdb 2015-01-23 21:24:29 +01:00
parent 7ba0469148
commit c3ca2f1a65
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
panda/src/pgraph/loader.cxx
View File

@ -331,8 +331,13 @@ try_load_file(const Filename &pathname, const LoaderOptions &options,
model_root->set_timestamp(record->get_source_timestamp()); model_root->set_timestamp(record->get_source_timestamp());
if (allow_ram_cache) { if (allow_ram_cache) {
// Store the loaded model in the RAM cache. // Store the loaded model in the RAM cache, and make sure
// we return a copy so that this node can be modified
// independently from the RAM cached version.
ModelPool::add_model(pathname, model_root); ModelPool::add_model(pathname, model_root);
if ((options.get_flags() & LoaderOptions::LF_allow_instance) == 0) {
return model_root->copy_subgraph();
}
} }
} }
return result; return result;
@ -347,9 +352,11 @@ try_load_file(const Filename &pathname, const LoaderOptions &options,
bool cache_only = (options.get_flags() & LoaderOptions::LF_cache_only) != 0; bool cache_only = (options.get_flags() & LoaderOptions::LF_cache_only) != 0;
if (!cache_only) { if (!cache_only) {
// Load the model from disk.
PT(PandaNode) result = requested_type->load_file(pathname, options, record); PT(PandaNode) result = requested_type->load_file(pathname, options, record);
if (result != (PandaNode *)NULL) { if (result != (PandaNode *)NULL) {
if (record != (BamCacheRecord *)NULL) { if (record != (BamCacheRecord *)NULL) {
// Store the loaded model in the model cache.
record->set_data(result, result); record->set_data(result, result);
cache->store(record); cache->store(record);
} }
@ -360,8 +367,13 @@ try_load_file(const Filename &pathname, const LoaderOptions &options,
} }
if (allow_ram_cache && result->is_of_type(ModelRoot::get_class_type())) { if (allow_ram_cache && result->is_of_type(ModelRoot::get_class_type())) {
// Store the loaded model in the RAM cache. // Store the loaded model in the RAM cache, and make sure
// we return a copy so that this node can be modified
// independently from the RAM cached version.
ModelPool::add_model(pathname, DCAST(ModelRoot, result.p())); ModelPool::add_model(pathname, DCAST(ModelRoot, result.p()));
if ((options.get_flags() & LoaderOptions::LF_allow_instance) == 0) {
result = result->copy_subgraph();
}
} }
return result; return result;
} }