From 3ce32c3fec896f6e5b71197ec949ea60f97e6a15 Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@pandora.be>
Date: Wed, 18 Jan 2012 22:36:12 +0000
Subject: Fix small code issue pointed out by nico_ga, was doing negation on
 unsigned type, didn't seem to break anything though.

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

(limited to 'intern/cycles/kernel')

diff --git a/intern/cycles/kernel/kernel_shader.h b/intern/cycles/kernel/kernel_shader.h
index 570e0721268..9c59e1566a9 100644
--- a/intern/cycles/kernel/kernel_shader.h
+++ b/intern/cycles/kernel/kernel_shader.h
@@ -151,7 +151,7 @@ __device void shader_setup_from_sample(KernelGlobals *kg, ShaderData *sd,
 			instanced = true;
 		else
 #endif
-			sd->object = -sd->object-1;
+			sd->object = ~sd->object;
 #ifdef __INSTANCING__
 	}
 #endif
-- 
cgit v1.2.3