Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-03-18 11:38:51 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-03-18 11:38:51 +0400
commit4f19c1a995de507044d1b5ada7fb7398cdb32096 (patch)
treee46c13dd84a493177c80af0715f8f9b09c333943 /source/gameengine/Ketsji/KX_Scene.cpp
parente56f71400060f10f73bed6b5c52fc537e5a0d617 (diff)
spelling cleanup
Diffstat (limited to 'source/gameengine/Ketsji/KX_Scene.cpp')
-rw-r--r--source/gameengine/Ketsji/KX_Scene.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp
index 74a0abe526d..17ef358a4e5 100644
--- a/source/gameengine/Ketsji/KX_Scene.cpp
+++ b/source/gameengine/Ketsji/KX_Scene.cpp
@@ -1889,7 +1889,7 @@ bool KX_Scene::MergeScene(KX_Scene *other)
other->GetLightList()->ReleaseAndRemoveAll();
#ifdef USE_BULLET
- if(env) /* bullet scene? - dummy scenes dont need touching */
+ if(env) /* bullet scene? - dummy scenes don't need touching */
env->MergeEnvironment(env_other);
#endif
@@ -1910,7 +1910,7 @@ bool KX_Scene::MergeScene(KX_Scene *other)
if(evtmgr_other) /* unlikely but possible one scene has a joystick and not the other */
evtmgr_other->Replace_LogicManager(logicmgr);
- /* when merging objects sensors are moved across into the new manager, dont need to do this here */
+ /* when merging objects sensors are moved across into the new manager, don't need to do this here */
}
/* grab any timer properties from the other scene */
@@ -2271,7 +2271,7 @@ KX_PYMETHODDEF_DOC(KX_Scene, addObject,
SCA_IObject* replica = AddReplicaObject((SCA_IObject*)ob, other, time);
// release here because AddReplicaObject AddRef's
- // the object is added to the scene so we dont want python to own a reference
+ // the object is added to the scene so we don't want python to own a reference
replica->Release();
return replica->GetProxy();
}