[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52457] trunk/blender: modify the python stub to include __file__ and __name__, also correct odd indent in KX_KetsjiEngine.cpp

[Campbell Barton]

Revision: 52457
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52457
Author:   campbellbarton
Date:     2012-11-22 05:20:51 +0000 (Thu, 22 Nov 2012)
Log Message:
-----------
modify the python stub to include __file__ and __name__, also correct odd 
indent in KX_KetsjiEngine.cpp

Modified Paths:
--------------
    trunk/blender/release/scripts/templates/script_stub.py
    trunk/blender/source/gameengine/Ketsji/KX_KetsjiEngine.cpp

Modified: trunk/blender/release/scripts/templates/script_stub.py
===================================================================
--- trunk/blender/release/scripts/templates/script_stub.py      2012-11-22 
05:15:52 UTC (rev 52456)
+++ trunk/blender/release/scripts/templates/script_stub.py      2012-11-22 
05:20:51 UTC (rev 52457)
@@ -8,4 +8,5 @@
 filename = "my_script.py"
 
 filepath = os.path.join(os.path.dirname(bpy.data.filepath), filename)
-exec(compile(open(filepath).read(), filepath, 'exec'))
+global_namespace = {"__file__": filepath, "__name__": "__main__"}
+exec(compile(open(filepath).read(), filepath, 'exec'), global_namespace)

Modified: trunk/blender/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_KetsjiEngine.cpp  2012-11-22 
05:15:52 UTC (rev 52456)
+++ trunk/blender/source/gameengine/Ketsji/KX_KetsjiEngine.cpp  2012-11-22 
05:20:51 UTC (rev 52457)
@@ -534,21 +534,20 @@
 {
        double timestep = 1.0/m_ticrate;
        double framestep = timestep;
-//     static hidden::Clock sClock;
+       //      static hidden::Clock sClock;
 
-m_logger->StartLog(tc_services, m_kxsystem->GetTimeInSeconds(),true);
+       m_logger->StartLog(tc_services, m_kxsystem->GetTimeInSeconds(),true);
 
-//float dt = sClock.getTimeMicroseconds() * 0.000001f;
-//sClock.reset();
+       //float dt = sClock.getTimeMicroseconds() * 0.000001f;
+       //sClock.reset();
 
-if (m_bFixedTime)
-       m_clockTime += timestep;
-else
-{
-
-//     m_clockTime += dt;
-       m_clockTime = m_kxsystem->GetTimeInSeconds();
-}
+       if (m_bFixedTime) {
+               m_clockTime += timestep;
+       }
+       else {
+               // m_clockTime += dt;
+               m_clockTime = m_kxsystem->GetTimeInSeconds();
+       }
        
        double deltatime = m_clockTime - m_frameTime;
        if (deltatime<0.f)

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