[Bf-blender-cvs] [e23c508] object_nodes: Fix the module.cc file.

[Lukas Tönne]

Commit: e23c508f1c79cfea7af1cbf6dfef18806a8978b8
Author: Lukas Tönne
Date:   Wed May 11 10:15:50 2016 +0200
Branches: object_nodes
https://developer.blender.org/rBe23c508f1c79cfea7af1cbf6dfef18806a8978b8

Fix the module.cc file.

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

M	source/blender/blenvm/llvm/CMakeLists.txt
M	source/blender/blenvm/modules/modules.cc

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

diff --git a/source/blender/blenvm/llvm/CMakeLists.txt b/source/blender/blenvm/llvm/CMakeLists.txt
index b47d5a0..1e8ecea 100644
--- a/source/blender/blenvm/llvm/CMakeLists.txt
+++ b/source/blender/blenvm/llvm/CMakeLists.txt
@@ -65,9 +65,9 @@ set(LLVM_HEADERS
 	../modules/mod_value.h
 )
 
-#if(NOT WITH_BLENVM_IRMODULES)
-#	list(APPEND SRC ${LLVM_SRC} ${LLVM_HEADERS})
-#endif()
+if(NOT WITH_BLENVM_IRMODULES)
+	list(APPEND SRC ${LLVM_SRC} ${LLVM_HEADERS})
+endif()
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${RTTI_DISABLE_FLAGS}")
 
diff --git a/source/blender/blenvm/modules/modules.cc b/source/blender/blenvm/modules/modules.cc
index 10a2c62..71ee5af 100644
--- a/source/blender/blenvm/modules/modules.cc
+++ b/source/blender/blenvm/modules/modules.cc
@@ -29,6 +29,8 @@
 #include "mod_math.h"
 #include "mod_value.h"
 
+BVM_MOD_NAMESPACE_BEGIN
+
 inline int force_linking()
 {
 	int i = 0;
@@ -38,9 +40,11 @@ inline int force_linking()
 	i += (long int)VALUE_INT;
 	i += (long int)VALUE_MATRIX44;
 	i += (long int)MIX_RGB3;
-	i += (long int)MIX_RGB4;
+	i += (long int)MIX_RGB;
 	
 	return i;
 }
 
 static int f = force_linking();
+
+BVM_MOD_NAMESPACE_END