[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19561] trunk/blender/source: - remove debug printf

[Campbell Barton]

Revision: 19561
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19561
Author:   campbellbarton
Date:     2009-04-06 14:47:15 +0200 (Mon, 06 Apr 2009)

Log Message:
-----------
- remove debug printf
- remove test for importing the module rather then creating a new one (didnt 
mean to commit)
- added constants for the mouse sensor to use.

Modified Paths:
--------------
    trunk/blender/source/blender/python/api2_2x/bpy_internal_import.c
    trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp

Modified: trunk/blender/source/blender/python/api2_2x/bpy_internal_import.c
===================================================================
--- trunk/blender/source/blender/python/api2_2x/bpy_internal_import.c   
2009-04-06 12:07:33 UTC (rev 19560)
+++ trunk/blender/source/blender/python/api2_2x/bpy_internal_import.c   
2009-04-06 12:47:15 UTC (rev 19561)
@@ -70,7 +70,6 @@
        memcpy( &txtname[namelen], ".py", 4 );
 
        for(text = maggie->text.first; text; text = text->id.next) {
-               fprintf(stderr, "%s | %s\n", txtname, text->id.name+2);
                if( !strcmp( txtname, text->id.name+2 ) )
                        break;
        }

Modified: trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp    2009-04-06 
12:07:33 UTC (rev 19560)
+++ trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp    2009-04-06 
12:47:15 UTC (rev 19561)
@@ -924,22 +924,10 @@
        gUseVisibilityTemp=false;
 
        // Create the module and add the functions
-       
-       
-       m = PyImport_ImportModule("GameLogic");
-       
-       if(m==NULL) {
-               printf("Import for the first time!\n");
-               PyErr_Clear();
-               m = Py_InitModule4("GameLogic", game_methods,
+       m = Py_InitModule4("GameLogic", game_methods,
                                           GameLogic_module_documentation,
                                           (PyObject*)NULL,PYTHON_API_VERSION);
-       }
-       else {
-               Py_DECREF(m); /**/
-               printf("Alredy imported!\n");
-               return(m);
-       }
+
        // Add some symbolic constants to the module
        d = PyModule_GetDict(m);
        
@@ -1105,6 +1093,16 @@
        KX_MACRO_addTypesToDict(d, KX_DYN_DISABLE_RIGID_BODY, 
KX_SCA_DynamicActuator::KX_DYN_DISABLE_RIGID_BODY);
        KX_MACRO_addTypesToDict(d, KX_DYN_SET_MASS, 
KX_SCA_DynamicActuator::KX_DYN_SET_MASS);
 
+       /* Input & Mouse Sensor */
+       KX_MACRO_addTypesToDict(d, KX_INPUT_NONE, 
SCA_InputEvent::KX_NO_INPUTSTATUS);
+       KX_MACRO_addTypesToDict(d, KX_INPUT_JUST_ACTIVATED, 
SCA_InputEvent::KX_JUSTACTIVATED);
+       KX_MACRO_addTypesToDict(d, KX_INPUT_ACTIVE, SCA_InputEvent::KX_ACTIVE);
+       KX_MACRO_addTypesToDict(d, KX_INPUT_JUST_RELEASED, 
SCA_InputEvent::KX_JUSTRELEASED);
+       
+       KX_MACRO_addTypesToDict(d, KX_MOUSE_BUT_LEFT, 
SCA_InputEvent::KX_LEFTMOUSE);
+       KX_MACRO_addTypesToDict(d, KX_MOUSE_BUT_MIDDLE, 
SCA_InputEvent::KX_MIDDLEMOUSE);
+       KX_MACRO_addTypesToDict(d, KX_MOUSE_BUT_RIGHT, 
SCA_InputEvent::KX_RIGHTMOUSE);
+
        // Check for errors
        if (PyErr_Occurred())
     {


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs