[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26061] trunk/blender/source: BGE: Mouse Sensor type defaults to 1 (MOUSELEFT ) + remove camera attribute from Camera objects.

[Dalai Felinto]

Revision: 26061
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26061
Author:   dfelinto
Date:     2010-01-17 22:46:34 +0100 (Sun, 17 Jan 2010)

Log Message:
-----------
BGE: Mouse Sensor type defaults to 1 (MOUSELEFT ) + remove camera attribute from Camera objects.
(if you want to mark your camera objects create a property manually ;)

That way object.getPropertyNames() works consistently across all object types.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/sca.c
    trunk/blender/source/blender/editors/space_logic/logic_window.c
    trunk/blender/source/gameengine/Ketsji/KX_Camera.cpp

Modified: trunk/blender/source/blender/blenkernel/intern/sca.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sca.c	2010-01-17 21:00:07 UTC (rev 26060)
+++ trunk/blender/source/blender/blenkernel/intern/sca.c	2010-01-17 21:46:34 UTC (rev 26061)
@@ -139,7 +139,7 @@
 		break;
 	case SENS_MOUSE:
 		ms=sens->data= MEM_callocN(sizeof(bMouseSensor), "mousesens");
-		//XXX ms->type= LEFTMOUSE;
+		ms->type= 1; // LEFTMOUSE workaround because Mouse Sensor types enum starts in 1
 		break;
 	case SENS_COLLISION:
 		sens->data= MEM_callocN(sizeof(bCollisionSensor), "colsens");

Modified: trunk/blender/source/blender/editors/space_logic/logic_window.c
===================================================================
--- trunk/blender/source/blender/editors/space_logic/logic_window.c	2010-01-17 21:00:07 UTC (rev 26060)
+++ trunk/blender/source/blender/editors/space_logic/logic_window.c	2010-01-17 21:46:34 UTC (rev 26061)
@@ -1436,6 +1436,8 @@
 			
 			/* Line 2: type selection. The number are a bit mangled to get
 			* proper compatibility with older .blend files. */
+			/* Any sensor type default is 0 but the ms enum starts in 1.
+			 * Therefore the mosue sensor is initialized to 1 in sca.c */
 			str= "Type %t|Left button %x1|Middle button %x2|"
 				"Right button %x4|Wheel Up %x5|Wheel Down %x6|Movement %x8|Mouse over %x16|Mouse over any%x32"; 
 			uiDefButS(block, MENU, B_REDR, str, xco+10, yco-44, (width*0.8f)-20, 19,

Modified: trunk/blender/source/gameengine/Ketsji/KX_Camera.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_Camera.cpp	2010-01-17 21:00:07 UTC (rev 26060)
+++ trunk/blender/source/gameengine/Ketsji/KX_Camera.cpp	2010-01-17 21:46:34 UTC (rev 26061)
@@ -57,9 +57,6 @@
 	m_name = "cam";
 	m_projection_matrix.setIdentity();
 	m_modelview_matrix.setIdentity();
-	CValue* val = new CIntValue(1);
-	SetProperty("camera",val);
-	val->Release();
 }