Merge branch 'master' into blender2.8

2017-07-27 07:35:44 +10:00
parent 48e8a1a167 5c963128ea
commit 11e95fcdd2
6 changed files with 15 additions and 21 deletions
--- 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"]