[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50151] trunk/blender/source/blender/ editors/interface/interface_handlers.c: BGE: When creating a controller by linking a sensor and actuator, the created controller will always be an and controller instead of the last controller type added .

[Mitchell Stokes]

Revision: 50151
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50151
Author:   moguri
Date:     2012-08-23 09:24:59 +0000 (Thu, 23 Aug 2012)
Log Message:
-----------
BGE: When creating a controller by linking a sensor and actuator, the created controller will always be an and controller instead of the last controller type added.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_handlers.c

Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c	2012-08-23 09:20:15 UTC (rev 50150)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c	2012-08-23 09:24:59 UTC (rev 50151)
@@ -838,6 +838,7 @@
 	/* (3) add a new controller */
 	if (WM_operator_name_call(C, "LOGIC_OT_controller_add", WM_OP_EXEC_DEFAULT, NULL) & OPERATOR_FINISHED) {
 		cont = (bController *)ob->controllers.last;
+		cont->type = CONT_LOGIC_AND; /* Quick fix to make sure we always have an AND controller. It might be nicer to make sure the operator gives us the right one though... */
 
 		/* (4) link the sensor->controller->actuator */
 		tmp_but = MEM_callocN(sizeof(uiBut), "uiBut");