diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-07-27 00:35:44 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-07-27 00:35:44 +0300 |
| commit | 11e95fcdd292f4f0c4dfcb05616c181aa9789fd9 (patch) | |
| tree | 833ad8118e1b3a9749c6df364d7faec49ae3ac4e /release | |
| parent | 48e8a1a1670101a38db5aa10970c4aa938bc9451 (diff) | |
| parent | 5c963128ea2435375dbfcc0319e9d49df06881c5 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/templates_py/gamelogic.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/release/scripts/templates_py/gamelogic.py b/release/scripts/templates_py/gamelogic.py index 01ac27c56cd..e589ad43e63 100644 --- a/release/scripts/templates_py/gamelogic.py +++ b/release/scripts/templates_py/gamelogic.py @@ -62,7 +62,7 @@ def main(): # adding to our objects "life" property """ actu_collide = cont.sensors["collision_sens"] - for ob in actu_collide.objectHitList: + for ob in actu_collide.hitObjectList: # Check to see the object has this property if "life" in ob: own["life"] += ob["life"] |