svn merge -r15309:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender/

Note the mail message failed to come through for 15309 which was just a merge from trunk.

1 files changed, 28 insertions, 0 deletions

diff --git a/source/gameengine/Converter/KX_ConvertControllers.cpp b/source/gameengine/Converter/KX_ConvertControllers.cpp
index 179dd9f8478..da490b4ee85 100644
--- a/source/gameengine/Converter/KX_ConvertControllers.cpp
+++ b/source/gameengine/Converter/KX_ConvertControllers.cpp
@@ -35,6 +35,10 @@
 // Controller
 #include "SCA_ANDController.h"
 #include "SCA_ORController.h"
+#include "SCA_NANDController.h"
+#include "SCA_NORController.h"
+#include "SCA_XORController.h"
+#include "SCA_XNORController.h"
 #include "SCA_PythonController.h"
 #include "SCA_ExpressionController.h"
 
@@ -112,6 +116,30 @@ void BL_ConvertControllers(
 				LinkControllerToActuators(gamecontroller,bcontr,logicmgr,converter);
 				break;
 			}
+			case CONT_LOGIC_NAND:
+			{
+				gamecontroller = new SCA_NANDController(gameobj);
+				LinkControllerToActuators(gamecontroller,bcontr,logicmgr,converter);
+				break;
+			}
+			case CONT_LOGIC_NOR:
+			{
+				gamecontroller = new SCA_NORController(gameobj);
+				LinkControllerToActuators(gamecontroller,bcontr,logicmgr,converter);
+				break;
+			}
+			case CONT_LOGIC_XOR:
+			{
+				gamecontroller = new SCA_XORController(gameobj);
+				LinkControllerToActuators(gamecontroller,bcontr,logicmgr,converter);
+				break;
+			}
+			case CONT_LOGIC_XNOR:
+			{
+				gamecontroller = new SCA_XNORController(gameobj);
+				LinkControllerToActuators(gamecontroller,bcontr,logicmgr,converter);
+				break;
+			}
 			case CONT_EXPRESSION:
 			{
 				bExpressionCont* bexpcont = (bExpressionCont*) bcontr->data;