Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2012-01-19 02:36:12 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2012-01-19 02:36:12 +0400
commit3ce32c3fec896f6e5b71197ec949ea60f97e6a15 (patch)
treed980c233c1d22f3b382a048eb0f4d84129455c1d /intern/cycles/kernel
parent361ffc5784c9eeaf2f213aacc6875fb1d2ac1ad1 (diff)
Fix small code issue pointed out by nico_ga, was doing negation on unsigned type,
didn't seem to break anything though.
Diffstat (limited to 'intern/cycles/kernel')
-rw-r--r--intern/cycles/kernel/kernel_shader.h2
1 files changed, 1 insertions, 1 deletions
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