Skip to content

Commit dcad68d

Browse files
committed
Fix compilation due to merge race
1 parent 25cd416 commit dcad68d

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

crates/re_viewer/src/misc/time_control.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,8 @@ impl TimeControl {
474474

475475
let obj_types = obj_types.collect::<HashSet<_>>();
476476
let obj_types = log_db
477-
.obj_types
477+
.obj_db
478+
.types
478479
.iter()
479480
.filter_map(|(obj_type_path, obj_type)| {
480481
obj_types
@@ -486,7 +487,7 @@ impl TimeControl {
486487
// TODO(cmc): At some point we might want keep a cache of what we've read so far,
487488
// and incrementally query for new messages.
488489
let mut objects = re_data_store::Objects::default();
489-
if let Some(store) = log_db.data_store.get(&self.time_source) {
490+
if let Some(store) = log_db.obj_db.store.get(&self.time_source) {
490491
for (obj_path, obj_store) in store.iter() {
491492
if let Some(obj_type) = obj_types.get(obj_path.obj_type_path()) {
492493
objects.query_object(obj_store, &TimeQuery::EVERYTHING, obj_path, obj_type);

0 commit comments

Comments
 (0)