@@ -548,14 +548,12 @@ get_data1i(const unsigned char *pointer) {
PN_uint32 dword = *(const PN_uint32 *)pointer;
return qpGeomVertexData::unpack_abcd_d(dword);
}
- break;
case NT_packed_dabc:
{
return qpGeomVertexData::unpack_abcd_b(dword);
case NT_float32:
return (int)*(const PN_float32 *)pointer;
@@ -237,7 +237,7 @@ complete_pointers(TypedWritable **p_list, BamReader *manager) {
(*si) = slider;
- bool inserted = _sliders_by_name.insert(SlidersByName::value_type(name, slider)).second;
+ bool inserted = _sliders_by_name.insert(SlidersByName::value_type(name, slider.p())).second;
nassertr(inserted, pi);