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

Notes:
* Game and sequencer RNA, and sequencer header are now out of date
  a bit after changes in trunk.
* I didn't know how to port these bugfixes, most likely they are
  not needed anymore.
  * Fix "duplicate strip" always increase the user count for ipo.
  * IPO pinning on sequencer strips was lost during Undo.
This commit is contained in:
2009-06-08 20:08:19 +00:00
594 changed files with 28292 additions and 13753 deletions

View File

@@ -1,7 +1,7 @@
#!BPY
"""
Name: 'GameLogic Template'
Blender: 245
Blender: 249
Group: 'ScriptTemplate'
Tooltip: 'Basic template for new game logic scripts'
"""
@@ -14,15 +14,15 @@ script_data = \
def main():
cont = GameLogic.getCurrentController()
own = cont.getOwner()
own = cont.owner
sens = cont.getSensor('mySensor')
actu = cont.getActuator('myActuator')
sens = cont.sensors['mySensor']
actu = cont.actuators['myActuator']
if sens.isPositive():
GameLogic.addActiveActuator(actu, True)
if sens.positive:
cont.activate(actu)
else:
GameLogic.addActiveActuator(actu, False)
cont.deactivate(actu)
main()
'''