diff options
Diffstat (limited to 'source/gameengine')
-rw-r--r-- | source/gameengine/Converter/BL_ActionActuator.cpp | 2 | ||||
-rw-r--r-- | source/gameengine/Converter/KX_BlenderSceneConverter.cpp | 2 | ||||
-rw-r--r-- | source/gameengine/Expressions/PyObjectPlus.cpp | 2 | ||||
-rw-r--r-- | source/gameengine/Expressions/PyObjectPlus.h | 2 | ||||
-rw-r--r-- | source/gameengine/GameLogic/SCA_PythonController.cpp | 4 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_GameObject.cpp | 4 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_PythonInit.cpp | 6 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_Scene.cpp | 2 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_TouchSensor.h | 2 | ||||
-rw-r--r-- | source/gameengine/Rasterizer/RAS_IRasterizer.h | 2 | ||||
-rw-r--r-- | source/gameengine/VideoTexture/ImageRender.cpp | 6 |
11 files changed, 17 insertions, 17 deletions
diff --git a/source/gameengine/Converter/BL_ActionActuator.cpp b/source/gameengine/Converter/BL_ActionActuator.cpp index b06d85f2356..28b03b56370 100644 --- a/source/gameengine/Converter/BL_ActionActuator.cpp +++ b/source/gameengine/Converter/BL_ActionActuator.cpp @@ -370,7 +370,7 @@ PyObject* BL_ActionActuator::PyGetChannel(PyObject* value) obj->GetPose(&m_pose); /* Get the underlying pose from the armature */ } - // get_pose_channel accounts for NULL pose, run on both incase one exists but + // get_pose_channel accounts for NULL pose, run on both in case one exists but // the channel doesnt if( !(pchan=get_pose_channel(m_userpose, string)) && !(pchan=get_pose_channel(m_pose, string)) ) diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp index 3b156c7c01b..72a953247d5 100644 --- a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp +++ b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp @@ -1123,7 +1123,7 @@ bool KX_BlenderSceneConverter::FreeBlendFile(struct Main *maggie) } else { - /* incase the mesh might be refered to later */ + /* in case the mesh might be refered to later */ { CTR_Map<STR_HashedString,void*> &mapStringToMeshes = scene->GetLogicManager()->GetMeshMap(); diff --git a/source/gameengine/Expressions/PyObjectPlus.cpp b/source/gameengine/Expressions/PyObjectPlus.cpp index e772aec28e3..27d955edf44 100644 --- a/source/gameengine/Expressions/PyObjectPlus.cpp +++ b/source/gameengine/Expressions/PyObjectPlus.cpp @@ -199,7 +199,7 @@ PyObject * PyObjectPlus::py_base_new(PyTypeObject *type, PyObject *args, PyObjec base->ptr = NULL; if (ret->ref) ret->ref->m_proxy= NULL; - /* 'base' may be free'd after this func finished but not necessarily + /* 'base' may be freed after this func finished but not necessarily * there is no reference to the BGE data now so it will throw an error on access */ Py_DECREF(base); if (ret->ref) { diff --git a/source/gameengine/Expressions/PyObjectPlus.h b/source/gameengine/Expressions/PyObjectPlus.h index 18afb0a6e78..e3701b8793c 100644 --- a/source/gameengine/Expressions/PyObjectPlus.h +++ b/source/gameengine/Expressions/PyObjectPlus.h @@ -609,7 +609,7 @@ public: static PyObject *GetProxyPlus_Ext(PyObjectPlus *self, PyTypeObject *tp, void *ptr); /* self=NULL => proxy to generic pointer detached from GE object - if py_owns is true, the memory pointed by ptr will be deleted automatially with MEM_freeN + if py_owns is true, the memory pointed by ptr will be deleted automatically with MEM_freeN self!=NULL=> proxy attached to GE object, ptr is optional and point to a struct from which attributes can be defined if py_owns is true, the object will be deleted automatically, ptr will NOT be deleted (assume object destructor takes care of it) */ diff --git a/source/gameengine/GameLogic/SCA_PythonController.cpp b/source/gameengine/GameLogic/SCA_PythonController.cpp index 8a87a734a1c..11ea7e51858 100644 --- a/source/gameengine/GameLogic/SCA_PythonController.cpp +++ b/source/gameengine/GameLogic/SCA_PythonController.cpp @@ -265,7 +265,7 @@ void SCA_PythonController::ErrorPrint(const char *error_msg) /* Added in 2.48a, the last_traceback can reference Objects for example, increasing * their user count. Not to mention holding references to wrapped data. - * This is especially bad when the PyObject for the wrapped data is free'd, after blender + * This is especially bad when the PyObject for the wrapped data is freed, after blender * has already dealocated the pointer */ PySys_SetObject( (char *)"last_traceback", NULL); PyErr_Clear(); /* just to be sure */ @@ -298,7 +298,7 @@ bool SCA_PythonController::Import() //printf("py module modified '%s'\n", m_scriptName.Ptr()); m_bModified= false; - /* incase we re-import */ + /* in case we re-import */ Py_XDECREF(m_function); m_function= NULL; diff --git a/source/gameengine/Ketsji/KX_GameObject.cpp b/source/gameengine/Ketsji/KX_GameObject.cpp index 2740a2921d2..5c758379727 100644 --- a/source/gameengine/Ketsji/KX_GameObject.cpp +++ b/source/gameengine/Ketsji/KX_GameObject.cpp @@ -170,7 +170,7 @@ KX_GameObject::~KX_GameObject() } #ifdef WITH_PYTHON if (m_attr_dict) { - PyDict_Clear(m_attr_dict); /* incase of circular refs or other weird cases */ + PyDict_Clear(m_attr_dict); /* in case of circular refs or other weird cases */ /* Py_CLEAR: Py_DECREF's and NULL's */ Py_CLEAR(m_attr_dict); } @@ -1768,7 +1768,7 @@ static int Map_SetItem(PyObject *self_v, PyObject *key, PyObject *val) if (val==NULL) { /* del ob["key"] */ int del= 0; - /* try remove both just incase */ + /* try remove both just in case */ if(attr_str) del |= (self->RemoveProperty(attr_str)==true) ? 1:0; diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp index 7c47fc59ac5..cbf08a674ef 100644 --- a/source/gameengine/Ketsji/KX_PythonInit.cpp +++ b/source/gameengine/Ketsji/KX_PythonInit.cpp @@ -1736,11 +1736,11 @@ static void backupPySysObjects(void) PyObject *sys_mods= PySys_GetObject("modules"); /* should never fail */ /* paths */ - Py_XDECREF(gp_OrigPythonSysPath); /* just incase its set */ + Py_XDECREF(gp_OrigPythonSysPath); /* just in case its set */ gp_OrigPythonSysPath = PyList_GetSlice(sys_path, 0, INT_MAX); /* copy the list */ /* modules */ - Py_XDECREF(gp_OrigPythonSysModules); /* just incase its set */ + Py_XDECREF(gp_OrigPythonSysModules); /* just in case its set */ gp_OrigPythonSysModules = PyDict_Copy(sys_mods); /* copy the list */ } @@ -2093,7 +2093,7 @@ static PyObject* gPyEventToString(PyObject*, PyObject* value) } } - PyErr_Clear(); // incase there was an error clearing + PyErr_Clear(); // in case there was an error clearing Py_DECREF(mod); if (!ret) PyErr_SetString(PyExc_ValueError, "GameKeys.EventToString(int): expected a valid int keyboard event"); else Py_INCREF(ret); diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp index 56127c7b634..2763dea04ec 100644 --- a/source/gameengine/Ketsji/KX_Scene.cpp +++ b/source/gameengine/Ketsji/KX_Scene.cpp @@ -1048,7 +1048,7 @@ int KX_Scene::NewRemoveObject(class CValue* gameobj) // in case this is a font m_fonts.remove((KX_FontObject*)newobj); - /* currently does nothing, keep incase we need to Unregister something */ + /* currently does nothing, keep in case we need to Unregister something */ #if 0 if (m_sceneConverter) m_sceneConverter->UnregisterGameObject(newobj); diff --git a/source/gameengine/Ketsji/KX_TouchSensor.h b/source/gameengine/Ketsji/KX_TouchSensor.h index df96b75084a..1a22067f9ac 100644 --- a/source/gameengine/Ketsji/KX_TouchSensor.h +++ b/source/gameengine/Ketsji/KX_TouchSensor.h @@ -68,7 +68,7 @@ protected: // Use with m_bTouchPulse to detect changes int m_bLastCount; /* size of m_colliders last tick */ - uint_ptr m_bColliderHash; /* hash collision objects pointers to trigger incase one object collides and another takes its place */ + uint_ptr m_bColliderHash; /* hash collision objects pointers to trigger in case one object collides and another takes its place */ uint_ptr m_bLastColliderHash; SCA_IObject* m_hitObject; diff --git a/source/gameengine/Rasterizer/RAS_IRasterizer.h b/source/gameengine/Rasterizer/RAS_IRasterizer.h index 34ddafbf2cc..592ddbe07d3 100644 --- a/source/gameengine/Rasterizer/RAS_IRasterizer.h +++ b/source/gameengine/Rasterizer/RAS_IRasterizer.h @@ -162,7 +162,7 @@ public: */ virtual bool SetMaterial(const RAS_IPolyMaterial& mat)=0; /** - * Init initialises the renderer. + * Init initializes the renderer. */ virtual bool Init()=0; /** diff --git a/source/gameengine/VideoTexture/ImageRender.cpp b/source/gameengine/VideoTexture/ImageRender.cpp index ef371d05f86..3bdf293b15a 100644 --- a/source/gameengine/VideoTexture/ImageRender.cpp +++ b/source/gameengine/VideoTexture/ImageRender.cpp @@ -459,7 +459,7 @@ static int ImageMirror_init (PyObject * pySelf, PyObject * args, PyObject * kwds else THRWEXCP(SceneInvalid, S_OK); - if(scenePtr==NULL) /* incase the python proxy reference is invalid */ + if(scenePtr==NULL) /* in case the python proxy reference is invalid */ THRWEXCP(SceneInvalid, S_OK); // get observer pointer @@ -471,7 +471,7 @@ static int ImageMirror_init (PyObject * pySelf, PyObject * args, PyObject * kwds else THRWEXCP(ObserverInvalid, S_OK); - if(observerPtr==NULL) /* incase the python proxy reference is invalid */ + if(observerPtr==NULL) /* in case the python proxy reference is invalid */ THRWEXCP(ObserverInvalid, S_OK); // get mirror pointer @@ -481,7 +481,7 @@ static int ImageMirror_init (PyObject * pySelf, PyObject * args, PyObject * kwds else THRWEXCP(MirrorInvalid, S_OK); - if(mirrorPtr==NULL) /* incase the python proxy reference is invalid */ + if(mirrorPtr==NULL) /* in case the python proxy reference is invalid */ THRWEXCP(MirrorInvalid, S_OK); // locate the material in the mirror |