[Bf-blender-cvs] [2d9bad0] object_nodes: Fix incorrect argument order for vector/color constructor functions.

Lukas Tönne noreply at git.blender.org
Sat May 14 09:55:44 CEST 2016


Commit: 2d9bad03b7203e964d4fd346293387f9d79496ff
Author: Lukas Tönne
Date:   Sat May 14 09:52:38 2016 +0200
Branches: object_nodes
https://developer.blender.org/rB2d9bad03b7203e964d4fd346293387f9d79496ff

Fix incorrect argument order for vector/color constructor functions.

===================================================================

M	source/blender/blenvm/modules/mod_base.h

===================================================================

diff --git a/source/blender/blenvm/modules/mod_base.h b/source/blender/blenvm/modules/mod_base.h
index e1d30e0..4e4f155 100644
--- a/source/blender/blenvm/modules/mod_base.h
+++ b/source/blender/blenvm/modules/mod_base.h
@@ -118,7 +118,7 @@ void SET_FLOAT3(float3 &result, float x, float y, float z)
 }
 
 BVM_MOD_FUNCTION("SET_FLOAT4")
-void GET_ELEM_FLOAT3(float &result, const float3 &f, int index)
+void GET_ELEM_FLOAT3(float &result, int index, const float3 &f)
 {
 	BLI_assert(index >= 0 && index < 3);
 	result = f[index];
@@ -131,7 +131,7 @@ void SET_FLOAT4(float4 &result, float x, float y, float z, float w)
 }
 
 BVM_MOD_FUNCTION("SET_FLOAT4")
-void GET_ELEM_FLOAT4(float &result, const float4 &f, int index)
+void GET_ELEM_FLOAT4(float &result, int index, const float4 &f)
 {
 	BLI_assert(index >= 0 && index < 4);
 	result = f[index];




More information about the Bf-blender-cvs mailing list