TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 09:52:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash reading Camera objects from pre-6.41 bam files

Browse Source
This commit is contained in:
rdb 2016-04-12 20:47:11 +02:00
parent 5a2a9a3020
commit e4b032ea21
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
panda/src/pgraph/camera.cxx
View File

@ -272,8 +272,10 @@ write_datagram(BamWriter *manager, Datagram &dg) {
dg.add_bool(_active); dg.add_bool(_active);
dg.add_uint32(_camera_mask.get_word()); dg.add_uint32(_camera_mask.get_word());
manager->write_pointer(dg, _initial_state); if (manager->get_file_minor_ver() >= 41) {
dg.add_stdfloat(_lod_scale); manager->write_pointer(dg, _initial_state);
dg.add_stdfloat(_lod_scale);
}
} }
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
@ -286,7 +288,10 @@ write_datagram(BamWriter *manager, Datagram &dg) {
int Camera:: int Camera::
complete_pointers(TypedWritable **p_list, BamReader *manager) { complete_pointers(TypedWritable **p_list, BamReader *manager) {
int pi = LensNode::complete_pointers(p_list, manager); int pi = LensNode::complete_pointers(p_list, manager);
_initial_state = DCAST(RenderState, p_list[pi++]);
if (manager->get_file_minor_ver() >= 41) {
_initial_state = DCAST(RenderState, p_list[pi++]);
}
return pi; return pi;
} }