From 8162a6c51d28b09791977c9009f79b9a204bb346 Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@gmail.com>
Date: Mon, 18 Mar 2019 14:56:08 +0100
Subject: Cleanup: fix compiler warnings.

---
 intern/cycles/render/light.cpp | 4 ++--
 intern/cycles/render/light.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'intern/cycles/render')

diff --git a/intern/cycles/render/light.cpp b/intern/cycles/render/light.cpp
index 7101d2ab60c..7439f82790d 100644
--- a/intern/cycles/render/light.cpp
+++ b/intern/cycles/render/light.cpp
@@ -191,7 +191,7 @@ bool LightManager::has_background_light(Scene *scene)
 	return false;
 }
 
-void LightManager::disable_ineffective_light(Device * /*device*/, Scene *scene)
+void LightManager::disable_ineffective_light(Scene *scene)
 {
 	/* Make all lights enabled by default, and perform some preliminary checks
 	 * needed for finer-tuning of settings (for example, check whether we've
@@ -873,7 +873,7 @@ void LightManager::device_update(Device *device, DeviceScene *dscene, Scene *sce
 
 	use_light_visibility = false;
 
-	disable_ineffective_light(device, scene);
+	disable_ineffective_light(scene);
 
 	device_update_points(device, dscene, scene);
 	if(progress.get_cancel()) return;
diff --git a/intern/cycles/render/light.h b/intern/cycles/render/light.h
index f4dfe0cadbf..e7c06604fc4 100644
--- a/intern/cycles/render/light.h
+++ b/intern/cycles/render/light.h
@@ -109,7 +109,7 @@ protected:
 	 * which doesn't contribute to the scene or which is only used for MIS
 	 * and scene doesn't need MIS.
 	 */
-	void disable_ineffective_light(Device *device, Scene *scene);
+	void disable_ineffective_light(Scene *scene);
 
 	void device_update_points(Device *device,
 	                          DeviceScene *dscene,
-- 
cgit v1.2.3


From 01df4818a6e1d3b93517e48a617310481abd9339 Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@gmail.com>
Date: Mon, 18 Mar 2019 18:51:24 +0100
Subject: Fix Cycles curve UVs wrong after recent changes.

---
 intern/cycles/render/curves.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'intern/cycles/render')

diff --git a/intern/cycles/render/curves.h b/intern/cycles/render/curves.h
index cf75751c58f..9db411bc04b 100644
--- a/intern/cycles/render/curves.h
+++ b/intern/cycles/render/curves.h
@@ -75,7 +75,7 @@ public:
 	array<int> curve_firstkey;
 	array<int> curve_keynum;
 	array<float> curve_length;
-	array<float3> curve_uv;
+	array<float2> curve_uv;
 	array<float3> curve_vcol;
 
 	array<float3> curvekey_co;
-- 
cgit v1.2.3