From 114020c20b985a91c32b76736db100b23762f3ae Mon Sep 17 00:00:00 2001 From: David Rose Date: Wed, 16 Apr 2003 22:21:51 +0000 Subject: [PATCH] correctly read version 4.2 bams --- panda/src/gobj/texture.cxx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/panda/src/gobj/texture.cxx b/panda/src/gobj/texture.cxx index 6def4e5307..0f12908325 100644 --- a/panda/src/gobj/texture.cxx +++ b/panda/src/gobj/texture.cxx @@ -733,10 +733,16 @@ make_Texture(const FactoryParams ¶ms) { string name = scan.get_string(); Filename filename = scan.get_string(); Filename alpha_filename = scan.get_string(); + int primary_file_num_channels = 0; int alpha_file_channel = 0; - if (manager->get_file_minor_ver() >= 3) { + if (manager->get_file_minor_ver() == 2) { + // We temporarily had a version that stored the number of channels + // here. + primary_file_num_channels = scan.get_uint8(); + + } else if (manager->get_file_minor_ver() >= 3) { primary_file_num_channels = scan.get_uint8(); alpha_file_channel = scan.get_uint8(); }