From b75b8bd15ac472865085a8b6afb7e5a94661cb81 Mon Sep 17 00:00:00 2001
From: Siddhant Prakash <siddhant.prakash@inria.fr>
Date: Mon, 15 Jun 2020 15:01:52 +0200
Subject: [PATCH] fix merge conflicts

---
 renderer/HybridRenderer.cpp | 2 +-
 renderer/HybridView.cpp     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/renderer/HybridRenderer.cpp b/renderer/HybridRenderer.cpp
index ed2385a..e5c4012 100644
--- a/renderer/HybridRenderer.cpp
+++ b/renderer/HybridRenderer.cpp
@@ -582,7 +582,7 @@ void sibr::HybridRenderer::visibleCameraSelection(std::vector<uint>& cam_ids, co
 	}
 }
 
-void sibr::HybridRenderer::createCamData(const std::vector<sibr::InputCamera>& cameras)
+void sibr::HybridRenderer::createCamData(const std::vector<sibr::InputCamera::Ptr>& cameras)
 {
 	_maxNumCams = cameras.size();
 	_camsCount = int(_maxNumCams);
diff --git a/renderer/HybridView.cpp b/renderer/HybridView.cpp
index f9932fc..d9a7e9d 100644
--- a/renderer/HybridView.cpp
+++ b/renderer/HybridView.cpp
@@ -348,7 +348,7 @@ void sibr::HybridView::updateCameras(const sibr::Mesh& mesh,
 	else {
 		const auto& cams = _scene->cameras()->inputCameras();
 		for (size_t cid = 0; cid < cams.size(); ++cid) {
-			if (cams[cid].isActive()) {
+			if (cams[cid]->isActive()) {
 				imgs_ulr.push_back(uint(cid));
 			}
 		}
-- 
GitLab