[Bf-blender-cvs] [27c559f] master: Cycles: Fix missing underscore in geom_object.h
Lukas Stockner
noreply at git.blender.org
Thu Nov 3 12:42:59 CET 2016
Commit: 27c559f059056ad2973d581354426f458a82e278
Author: Lukas Stockner
Date: Thu Nov 3 12:38:00 2016 +0100
Branches: master
https://developer.blender.org/rB27c559f059056ad2973d581354426f458a82e278
Cycles: Fix missing underscore in geom_object.h
===================================================================
M intern/cycles/kernel/geom/geom_object.h
===================================================================
diff --git a/intern/cycles/kernel/geom/geom_object.h b/intern/cycles/kernel/geom/geom_object.h
index 73dc5a0..9f0fe03 100644
--- a/intern/cycles/kernel/geom/geom_object.h
+++ b/intern/cycles/kernel/geom/geom_object.h
@@ -161,7 +161,7 @@ ccl_device_inline void object_inverse_position_transform(KernelGlobals *kg, cons
ccl_device_inline void object_inverse_normal_transform(KernelGlobals *kg, const ShaderData *sd, float3 *N)
{
-#ifdef __OBJECT_MOTION_
+#ifdef __OBJECT_MOTION__
if((ccl_fetch(sd, object) != OBJECT_NONE) || (ccl_fetch(sd, type) == PRIMITIVE_LAMP)) {
*N = normalize(transform_direction_transposed_auto(&ccl_fetch(sd, ob_tfm), *N));
}
More information about the Bf-blender-cvs
mailing list