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
parente56f71400060f10f73bed6b5c52fc537e5a0d617 (diff)
spelling cleanup
Diffstat (limited to 'source/gameengine')
-rw-r--r--source/gameengine/Converter/BL_BlenderDataConversion.cpp2
-rw-r--r--source/gameengine/Converter/KX_BlenderSceneConverter.cpp12
-rw-r--r--source/gameengine/Converter/KX_ConvertProperties.cpp2
-rw-r--r--source/gameengine/Converter/KX_IpoConvert.cpp2
-rw-r--r--source/gameengine/Expressions/ListValue.cpp6
-rw-r--r--source/gameengine/Expressions/PyObjectPlus.cpp4
-rw-r--r--source/gameengine/Expressions/PyObjectPlus.h2
-rw-r--r--source/gameengine/Expressions/Value.cpp2
-rw-r--r--source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp2
-rw-r--r--source/gameengine/GameLogic/SCA_JoystickSensor.cpp12
-rw-r--r--source/gameengine/GameLogic/SCA_KeyboardSensor.cpp2
-rw-r--r--source/gameengine/GameLogic/SCA_PropertyActuator.cpp2
-rw-r--r--source/gameengine/GameLogic/SCA_PythonController.cpp2
-rw-r--r--source/gameengine/GameLogic/SCA_RandomNumberGenerator.h2
-rw-r--r--source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp2
-rw-r--r--source/gameengine/Ketsji/KX_Dome.cpp4
-rw-r--r--source/gameengine/Ketsji/KX_GameObject.cpp2
-rw-r--r--source/gameengine/Ketsji/KX_KetsjiEngine.h2
-rw-r--r--source/gameengine/Ketsji/KX_PythonInit.cpp12
-rw-r--r--source/gameengine/Ketsji/KX_Scene.cpp6
-rw-r--r--source/gameengine/Physics/Bullet/CcdPhysicsController.cpp4
-rw-r--r--source/gameengine/Rasterizer/RAS_2DFilterManager.cpp2
-rw-r--r--source/gameengine/Rasterizer/RAS_MaterialBucket.h2
-rw-r--r--source/gameengine/Rasterizer/RAS_TexVert.cpp4
24 files changed, 47 insertions, 47 deletions
diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
index 89877261cd7..33cbbe3ee86 100644
--- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp
+++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
@@ -636,7 +636,7 @@ bool ConvertMaterial(
}
}
}
-#if 0 /* this flag isnt used anymore */
+#if 0 /* this flag isn't used anymore */
material->flag[i] |= (BKE_animdata_from_id(mat->id) != NULL) ? HASIPO : 0;
#endif
/// --------------------------------
diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
index 72a953247d5..ee60d2c5bc5 100644
--- a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
+++ b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
@@ -537,7 +537,7 @@ void KX_BlenderSceneConverter::RegisterGameMesh(
RAS_MeshObject *gamemesh,
struct Mesh *for_blendermesh)
{
- if(for_blendermesh) { /* dynamically loaded meshes we dont want to keep lookups for */
+ if(for_blendermesh) { /* dynamically loaded meshes we don't want to keep lookups for */
m_map_mesh_to_gamemesh.insert(CHashedPtr(for_blendermesh),gamemesh);
}
m_meshobjects.push_back(pair<KX_Scene*,RAS_MeshObject*>(m_currentScene,gamemesh));
@@ -859,7 +859,7 @@ void KX_BlenderSceneConverter::WritePhysicsObjectToAnimationIpo(int frameNumber)
if (icu_ry) insert_vert_icu(icu_ry, frameNumber, eulerAngles[1], 1);
if (icu_rz) insert_vert_icu(icu_rz, frameNumber, eulerAngles[2], 1);
- // Handles are corrected at the end, testhandles_ipocurve isnt needed yet
+ // Handles are corrected at the end, testhandles_ipocurve isn't needed yet
#endif
}
}
@@ -953,7 +953,7 @@ bool KX_BlenderSceneConverter::LinkBlendFile(BlendHandle *bpy_openlib, const cha
Main *main_tmp= NULL; /* created only for linking, then freed */
LinkNode *names = NULL;
int idcode= BKE_idcode_from_name(group);
- short flag= 0; /* dont need any special options */
+ short flag= 0; /* don't need any special options */
ReportList reports;
static char err_local[255];
@@ -1059,7 +1059,7 @@ bool KX_BlenderSceneConverter::LinkBlendFile(BlendHandle *bpy_openlib, const cha
KX_Scene* other= m_ketsjiEngine->CreateScene((Scene *)scene);
scene_merge->MergeScene(other);
- // RemoveScene(other); // Dont run this, it frees the entire scene converter data, just delete the scene
+ // RemoveScene(other); // Don't run this, it frees the entire scene converter data, just delete the scene
delete other;
}
@@ -1078,7 +1078,7 @@ bool KX_BlenderSceneConverter::LinkBlendFile(BlendHandle *bpy_openlib, const cha
return true;
}
-/* Note m_map_*** are all ok and dont need to be freed
+/* Note m_map_*** are all ok and don't need to be freed
* most are temp and NewRemoveObject frees m_map_gameobject_to_blender */
bool KX_BlenderSceneConverter::FreeBlendFile(struct Main *maggie)
{
@@ -1231,7 +1231,7 @@ bool KX_BlenderSceneConverter::FreeBlendFile(struct Main *maggie)
#endif
- /* Worlds dont reference original blender data so we need to make a set from them */
+ /* Worlds don't reference original blender data so we need to make a set from them */
typedef std::set<KX_WorldInfo*> KX_WorldInfoSet;
KX_WorldInfoSet worldset;
for (int scene_idx=0;scene_idx<numScenes;scene_idx++)
diff --git a/source/gameengine/Converter/KX_ConvertProperties.cpp b/source/gameengine/Converter/KX_ConvertProperties.cpp
index 8eea39c4956..791f99b53c0 100644
--- a/source/gameengine/Converter/KX_ConvertProperties.cpp
+++ b/source/gameengine/Converter/KX_ConvertProperties.cpp
@@ -141,7 +141,7 @@ void BL_ConvertProperties(Object* object,KX_GameObject* gameobj,SCA_TimeEventMan
}
#ifdef WITH_PYTHON
- /* Warn if we double up on attributes, this isnt quite right since it wont find inherited attributes however there arnt many */
+ /* Warn if we double up on attributes, this isn't quite right since it wont find inherited attributes however there arnt many */
for(PyAttributeDef *attrdef = KX_GameObject::Attributes; attrdef->m_name; attrdef++) {
if(strcmp(prop->name, attrdef->m_name)==0) {
printf("Warning! user defined property name \"%s\" is also a python attribute for object \"%s\"\n\tUse ob[\"%s\"] syntax to avoid conflict\n", prop->name, object->id.name+2, prop->name);
diff --git a/source/gameengine/Converter/KX_IpoConvert.cpp b/source/gameengine/Converter/KX_IpoConvert.cpp
index a56fbe5bef2..d0002f3b3e7 100644
--- a/source/gameengine/Converter/KX_IpoConvert.cpp
+++ b/source/gameengine/Converter/KX_IpoConvert.cpp
@@ -102,7 +102,7 @@ SG_Controller *BL_CreateIPO(struct bAction *action, KX_GameObject* gameobj, KX_B
rotmode = "rotation_axis_angle";
drotmode = "delta_rotation_axis_angle";
break;
- case ROT_MODE_QUAT: /* XXX, this isnt working, currently only eulers are supported [#28853] */
+ case ROT_MODE_QUAT: /* XXX, this isn't working, currently only eulers are supported [#28853] */
rotmode = "rotation_quaternion";
drotmode = "delta_rotation_quaternion";
break;
diff --git a/source/gameengine/Expressions/ListValue.cpp b/source/gameengine/Expressions/ListValue.cpp
index 4e048b1a875..2c8cffbef82 100644
--- a/source/gameengine/Expressions/ListValue.cpp
+++ b/source/gameengine/Expressions/ListValue.cpp
@@ -400,7 +400,7 @@ static PyObject *listvalue_buffer_concat(PyObject * self, PyObject * other)
// and CListValue concatenated to Python Lists
// and CListValue concatenated with another CListValue
- /* Shallow copy, dont use listval->GetReplica(), it will screw up with KX_GameObjects */
+ /* Shallow copy, don't use listval->GetReplica(), it will screw up with KX_GameObjects */
CListValue* listval_new = new CListValue();
if (PyList_Check(other))
@@ -428,7 +428,7 @@ static PyObject *listvalue_buffer_concat(PyObject * self, PyObject * other)
}
if (error) {
- listval_new->Resize(numitems_orig+i); /* resize so we dont try release NULL pointers */
+ listval_new->Resize(numitems_orig+i); /* resize so we don't try release NULL pointers */
listval_new->Release();
return NULL; /* ConvertPythonToValue above sets the error */
}
@@ -446,7 +446,7 @@ static PyObject *listvalue_buffer_concat(PyObject * self, PyObject * other)
numitems = otherval->GetCount();
/* copy the first part of the list */
- listval_new->Resize(numitems_orig + numitems); /* resize so we dont try release NULL pointers */
+ listval_new->Resize(numitems_orig + numitems); /* resize so we don't try release NULL pointers */
for (i=0;i<numitems_orig;i++)
listval_new->SetValue(i, listval->GetValue(i)->AddRef());
diff --git a/source/gameengine/Expressions/PyObjectPlus.cpp b/source/gameengine/Expressions/PyObjectPlus.cpp
index 27d955edf44..65aa3e23dfa 100644
--- a/source/gameengine/Expressions/PyObjectPlus.cpp
+++ b/source/gameengine/Expressions/PyObjectPlus.cpp
@@ -282,7 +282,7 @@ PyObject *PyObjectPlus::py_get_attrdef(PyObject *self_py, const PyAttributeDef *
char* ptr = (attrdef->m_usePtr) ? (char*)BGE_PROXY_PTR(self_py) : (char*)ref;
if(ptr == NULL || (BGE_PROXY_PYREF(self_py) && (ref==NULL || !ref->py_is_valid()))) {
if(attrdef == attr_invalid)
- Py_RETURN_TRUE; // dont bother running the function
+ Py_RETURN_TRUE; // don't bother running the function
PyErr_SetString(PyExc_SystemError, BGE_PROXY_ERROR_MSG);
return NULL;
@@ -698,7 +698,7 @@ int PyObjectPlus::py_set_attrdef(PyObject *self_py, PyObject *value, const PyAtt
{
if ((*attrdef->m_checkFunction)(ref, attrdef) != 0)
{
- // if the checing function didnt set an error then set a generic one here so we dont set an error with no exception
+ // if the checing function didnt set an error then set a generic one here so we don't set an error with no exception
if (PyErr_Occurred()==0)
PyErr_Format(PyExc_AttributeError, "type check error for attribute \"%s\", reasion unknown", attrdef->m_name);
diff --git a/source/gameengine/Expressions/PyObjectPlus.h b/source/gameengine/Expressions/PyObjectPlus.h
index 6de0f3fa8d5..278febee4ac 100644
--- a/source/gameengine/Expressions/PyObjectPlus.h
+++ b/source/gameengine/Expressions/PyObjectPlus.h
@@ -106,7 +106,7 @@ typedef struct PyObjectPlus_Proxy {
# define BGE_PROXY_WKREF(_self) (((PyObjectPlus_Proxy *)_self)->in_weakreflist)
#endif
-/* Note, sometimes we dont care what BGE type this is as long as its a proxy */
+/* Note, sometimes we don't care what BGE type this is as long as its a proxy */
#define BGE_PROXY_CHECK_TYPE(_type) ((_type)->tp_dealloc == PyObjectPlus::py_base_dealloc)
/* Opposite of BGE_PROXY_REF */
diff --git a/source/gameengine/Expressions/Value.cpp b/source/gameengine/Expressions/Value.cpp
index cc7c7f9b281..c0952f29d8f 100644
--- a/source/gameengine/Expressions/Value.cpp
+++ b/source/gameengine/Expressions/Value.cpp
@@ -585,7 +585,7 @@ CValue* CValue::ConvertPythonToValue(PyObject* pyobj, const char *error_prefix)
{
vallie = new CStringValue(_PyUnicode_AsString(pyobj),"");
} else
- if (PyObject_TypeCheck(pyobj, &CValue::Type)) /* Note, dont let these get assigned to GameObject props, must check elsewhere */
+ if (PyObject_TypeCheck(pyobj, &CValue::Type)) /* Note, don't let these get assigned to GameObject props, must check elsewhere */
{
vallie = (static_cast<CValue *>(BGE_PROXY_REF(pyobj)))->AddRef();
} else
diff --git a/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp b/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
index 15aeef242b7..b22246014bf 100644
--- a/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
+++ b/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
@@ -89,7 +89,7 @@ SCA_Joystick *SCA_Joystick::GetInstance( short int joyindex )
{
int i;
// The video subsystem is required for joystick input to work. However,
- // when GHOST is running under SDL, video is initialised elsewhere.
+ // when GHOST is running under SDL, video is initialized elsewhere.
// Do this once only.
# ifdef WITH_GHOST_SDL
if(SDL_InitSubSystem(SDL_INIT_JOYSTICK) == -1 ){
diff --git a/source/gameengine/GameLogic/SCA_JoystickSensor.cpp b/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
index 3612115f90e..3f74b4cd807 100644
--- a/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
+++ b/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
@@ -109,7 +109,7 @@ bool SCA_JoystickSensor::Evaluate()
bool result = false;
bool reset = m_reset && m_level;
- if(js==NULL) /* no joystick - dont do anything */
+ if(js==NULL) /* no joystick - don't do anything */
return false;
m_reset = false;
@@ -129,7 +129,7 @@ bool SCA_JoystickSensor::Evaluate()
with expect a zero index.
*/
- if (!js->IsTrigAxis() && !reset) /* No events from SDL? - dont bother */
+ if (!js->IsTrigAxis() && !reset) /* No events from SDL? - don't bother */
return false;
js->cSetPrecision(m_precision);
@@ -159,8 +159,8 @@ bool SCA_JoystickSensor::Evaluate()
}
case KX_JOYSENSORMODE_AXIS_SINGLE:
{
- /* Like KX_JOYSENSORMODE_AXIS but dont pair up axis */
- if (!js->IsTrigAxis() && !reset) /* No events from SDL? - dont bother */
+ /* Like KX_JOYSENSORMODE_AXIS but don't pair up axis */
+ if (!js->IsTrigAxis() && !reset) /* No events from SDL? - don't bother */
return false;
/* No need for 'm_bAllEvents' check here since were only checking 1 axis */
@@ -182,7 +182,7 @@ bool SCA_JoystickSensor::Evaluate()
/* what is what!
m_button = the actual button in question
*/
- if (!js->IsTrigButton() && !reset) /* No events from SDL? - dont bother */
+ if (!js->IsTrigButton() && !reset) /* No events from SDL? - don't bother */
return false;
if(( m_bAllEvents && js->aAnyButtonPressIsPositive()) || (!m_bAllEvents && js->aButtonPressIsPositive(m_button))) {
@@ -203,7 +203,7 @@ bool SCA_JoystickSensor::Evaluate()
direction= m_hatf -- max 12
*/
- if (!js->IsTrigHat() && !reset) /* No events from SDL? - dont bother */
+ if (!js->IsTrigHat() && !reset) /* No events from SDL? - don't bother */
return false;
if((m_bAllEvents && js->GetHat(m_hat-1)) || js->aHatIsPositive(m_hat-1, m_hatf)) {
diff --git a/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp b/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
index 399ea8d80dd..d7f408d0b4a 100644
--- a/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
+++ b/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
@@ -294,7 +294,7 @@ bool SCA_KeyboardSensor::Evaluate()
}
/* Modify the key state based on qual(s)
- * Tested carefully. dont touch unless your really sure.
+ * Tested carefully. don't touch unless your really sure.
* note, this will only change the results if key modifiers are set.
*
* When all modifiers and keys are positive
diff --git a/source/gameengine/GameLogic/SCA_PropertyActuator.cpp b/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
index 5413638391f..69a37ebe88a 100644
--- a/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
+++ b/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
@@ -83,7 +83,7 @@ bool SCA_PropertyActuator::Update()
if (m_type==KX_ACT_PROP_TOGGLE)
{
- /* dont use */
+ /* don't use */
CValue* newval;
CValue* oldprop = propowner->GetProperty(m_propname);
if (oldprop)
diff --git a/source/gameengine/GameLogic/SCA_PythonController.cpp b/source/gameengine/GameLogic/SCA_PythonController.cpp
index 11ea7e51858..67c813acdc0 100644
--- a/source/gameengine/GameLogic/SCA_PythonController.cpp
+++ b/source/gameengine/GameLogic/SCA_PythonController.cpp
@@ -353,7 +353,7 @@ bool SCA_PythonController::Import()
return false;
}
- m_function_argc = 0; /* rare cases this could be a function that isnt defined in python, assume zero args */
+ m_function_argc = 0; /* rare cases this could be a function that isn't defined in python, assume zero args */
if (PyFunction_Check(m_function)) {
m_function_argc= ((PyCodeObject *)PyFunction_GET_CODE(m_function))->co_argcount;
}
diff --git a/source/gameengine/GameLogic/SCA_RandomNumberGenerator.h b/source/gameengine/GameLogic/SCA_RandomNumberGenerator.h
index a935db94020..4391dcb304b 100644
--- a/source/gameengine/GameLogic/SCA_RandomNumberGenerator.h
+++ b/source/gameengine/GameLogic/SCA_RandomNumberGenerator.h
@@ -53,7 +53,7 @@ class SCA_RandomNumberGenerator {
unsigned long mt[624];
/** mti==N+1 means mt[KX_MT_VectorLenght] is not initialized */
- int mti; /* initialised in the cpp file */
+ int mti; /* initialized in the cpp file */
/** Calculate a start vector */
void SetStartVector(void);
diff --git a/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp b/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
index 28e7f221ce4..46753dcaffe 100644
--- a/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
+++ b/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
@@ -543,7 +543,7 @@ bool KX_ReInstanceBulletShapeFromMesh(KX_GameObject *gameobj, KX_GameObject *fro
CcdShapeConstructionInfo *shapeInfo;
/* if this is the child of a compound shape this can happen
- * dont support compound shapes for now */
+ * don't support compound shapes for now */
if(spc==NULL)
return false;
diff --git a/source/gameengine/Ketsji/KX_Dome.cpp b/source/gameengine/Ketsji/KX_Dome.cpp
index 6e989dd4d7d..4d022b97ba6 100644
--- a/source/gameengine/Ketsji/KX_Dome.cpp
+++ b/source/gameengine/Ketsji/KX_Dome.cpp
@@ -229,7 +229,7 @@ void KX_Dome::CalculateImageSize(void)
{
/*
* - determine the minimum buffer size
- * - reduce the buffer for better performace
+ * - reduce the buffer for better performance
* - create a power of 2 texture bigger than the buffer
*/
canvaswidth = m_canvas->GetWidth();
@@ -734,7 +734,7 @@ void KX_Dome::CreateMeshDome250(void)
* verts_height is the exactly needed height of the cube faces (not always 1.0).
* When we want some horizontal information (e.g. for horizontal 220deg domes) we don't need to create and tesselate the whole cube.
* Therefore the lateral cube faces could be small, and the tesselate mesh would be completely used.
- * (if we always worked with verts_height = 1.0, we would be discarding a lot of the calculated and tesselated geometry).
+ * (if we always worked with verts_height = 1.0, we would be discarding a lot of the calculated and tessellated geometry).
*
* So I came out with this formula:
* verts_height = tan((rad_ang/2) - (MT_PI/2))*sqrt(2.0);
diff --git a/source/gameengine/Ketsji/KX_GameObject.cpp b/source/gameengine/Ketsji/KX_GameObject.cpp
index 43cd16340d0..1bc60ebd337 100644
--- a/source/gameengine/Ketsji/KX_GameObject.cpp
+++ b/source/gameengine/Ketsji/KX_GameObject.cpp
@@ -1788,7 +1788,7 @@ static int Map_SetItem(PyObject *self_v, PyObject *key, PyObject *val)
int set= 0;
/* as CValue */
- if(attr_str && PyObject_TypeCheck(val, &PyObjectPlus::Type)==0) /* dont allow GameObjects for eg to be assigned to CValue props */
+ if(attr_str && PyObject_TypeCheck(val, &PyObjectPlus::Type)==0) /* don't allow GameObjects for eg to be assigned to CValue props */
{
CValue* vallie = self->ConvertPythonToValue(val, ""); /* error unused */
diff --git a/source/gameengine/Ketsji/KX_KetsjiEngine.h b/source/gameengine/Ketsji/KX_KetsjiEngine.h
index b37ebd250a5..0a50ab0a43a 100644
--- a/source/gameengine/Ketsji/KX_KetsjiEngine.h
+++ b/source/gameengine/Ketsji/KX_KetsjiEngine.h
@@ -79,7 +79,7 @@ private:
class KX_ISceneConverter* m_sceneconverter;
class NG_NetworkDeviceInterface* m_networkdevice;
#ifdef WITH_PYTHON
- /* borrowed from sys.modules["__main__"], dont manage ref's */
+ /* borrowed from sys.modules["__main__"], don't manage ref's */
PyObject* m_pythondictionary;
#endif
class SCA_IInputDevice* m_keyboarddevice;
diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp
index 82016e2fff3..b804bacf79e 100644
--- a/source/gameengine/Ketsji/KX_PythonInit.cpp
+++ b/source/gameengine/Ketsji/KX_PythonInit.cpp
@@ -1757,7 +1757,7 @@ static void initPySysObjects__append(PyObject *sys_path, const char *filename)
BLI_split_dir_part(filename, expanded, sizeof(expanded)); /* get the dir part of filename only */
BLI_path_abs(expanded, gp_GamePythonPath); /* filename from lib->filename is (always?) absolute, so this may not be needed but it wont hurt */
- BLI_cleanup_file(gp_GamePythonPath, expanded); /* Dont use BLI_cleanup_dir because it adds a slash - BREAKS WIN32 ONLY */
+ BLI_cleanup_file(gp_GamePythonPath, expanded); /* Don't use BLI_cleanup_dir because it adds a slash - BREAKS WIN32 ONLY */
item= PyUnicode_DecodeFSDefault(expanded);
// printf("SysPath - '%s', '%s', '%s'\n", expanded, filename, gp_GamePythonPath);
@@ -1831,7 +1831,7 @@ static struct _inittab bge_internal_modules[]= {
};
/**
- * Python is not initialised.
+ * Python is not initialized.
* see bpy_interface.c's BPY_python_start() which shares the same functionality in blender.
*/
PyObject* initGamePlayerPythonScripting(const STR_String& progname, TPythonSecurityLevel level, Main *maggie, int argc, char** argv)
@@ -1859,7 +1859,7 @@ PyObject* initGamePlayerPythonScripting(const STR_String& progname, TPythonSecur
Py_Initialize();
- if(argv && first_time) { /* browser plugins dont currently set this */
+ if(argv && first_time) { /* browser plugins don't currently set this */
// Until python support ascii again, we use our own.
// PySys_SetArgv(argc, argv);
int i;
@@ -1874,14 +1874,14 @@ PyObject* initGamePlayerPythonScripting(const STR_String& progname, TPythonSecur
bpy_import_init(PyEval_GetBuiltins());
- /* mathutils types are used by the BGE even if we dont import them */
+ /* mathutils types are used by the BGE even if we don't import them */
{
PyObject *mod= PyImport_ImportModuleLevel((char *)"mathutils", NULL, NULL, NULL, 0);
Py_DECREF(mod);
}
#ifdef WITH_AUDASPACE
- /* accessing a SoundActuator's sound results in a crash if aud is not initialised... */
+ /* accessing a SoundActuator's sound results in a crash if aud is not initialized... */
{
PyObject *mod= PyImport_ImportModuleLevel((char *)"aud", NULL, NULL, NULL, 0);
Py_DECREF(mod);
@@ -1933,7 +1933,7 @@ PyObject* initGamePythonScripting(const STR_String& progname, TPythonSecurityLev
Py_FrozenFlag=1;
#ifdef WITH_AUDASPACE
- /* accessing a SoundActuator's sound results in a crash if aud is not initialised... */
+ /* accessing a SoundActuator's sound results in a crash if aud is not initialized... */
{
PyObject *mod= PyImport_ImportModuleLevel((char *)"aud", NULL, NULL, NULL, 0);
Py_DECREF(mod);
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();
}
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
index cf8a729aa88..0ece33a7f06 100644
--- a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
@@ -1924,7 +1924,7 @@ bool CcdShapeConstructionInfo::UpdateMesh(class KX_GameObject* gameobj, class RA
m_triFaceArray.resize(tot_bt_tris*3);
int *tri_pt= &m_triFaceArray[0];
- /* cant be used for anything useful in this case, since we dont rely on the original mesh
+ /* cant be used for anything useful in this case, since we don't rely on the original mesh
* will just be an array like pythons range(tot_bt_tris) */
m_polygonIndexArray.resize(tot_bt_tris);
@@ -1986,7 +1986,7 @@ bool CcdShapeConstructionInfo::UpdateMesh(class KX_GameObject* gameobj, class RA
/* force recreation of the m_unscaledShape.
* If this has multiple users we cant delete */
if(m_unscaledShape) {
- // dont free now so it can re-allocate under the same location and not break pointers.
+ // don't free now so it can re-allocate under the same location and not break pointers.
// DeleteBulletShape(m_unscaledShape);
m_forceReInstance= true;
}
diff --git a/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp b/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
index 9706de20b79..99346c0a6c6 100644
--- a/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
+++ b/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
@@ -58,7 +58,7 @@ numberoffilters(0), need_tex_update(true)
isshadersupported = GLEW_ARB_shader_objects &&
GLEW_ARB_fragment_shader && GLEW_ARB_multitexture;
- /* used to return before 2.49 but need to initialize values so dont */
+ /* used to return before 2.49 but need to initialize values so don't */
if(!isshadersupported)
std::cout<<"shaders not supported!" << std::endl;
diff --git a/source/gameengine/Rasterizer/RAS_MaterialBucket.h b/source/gameengine/Rasterizer/RAS_MaterialBucket.h
index 4142ebd2e39..cff4d67d44b 100644
--- a/source/gameengine/Rasterizer/RAS_MaterialBucket.h
+++ b/source/gameengine/Rasterizer/RAS_MaterialBucket.h
@@ -82,7 +82,7 @@ class RAS_DisplayArray
public:
vector<RAS_TexVert> m_vertex;
vector<unsigned short> m_index;
- /* LINE currently isnt used */
+ /* LINE currently isn't used */
enum { LINE = 2, TRIANGLE = 3, QUAD = 4 } m_type;
//RAS_MeshSlot *m_origSlot;
diff --git a/source/gameengine/Rasterizer/RAS_TexVert.cpp b/source/gameengine/Rasterizer/RAS_TexVert.cpp
index 454fd8ecc69..f74aa24232b 100644
--- a/source/gameengine/Rasterizer/RAS_TexVert.cpp
+++ b/source/gameengine/Rasterizer/RAS_TexVert.cpp
@@ -123,14 +123,14 @@ bool RAS_TexVert::closeTo(const RAS_TexVert* other)
{
return (
/* m_flag == other->m_flag && */
- /* at the moment the face only stores the smooth/flat setting so dont bother comparing it */
+ /* at the moment the face only stores the smooth/flat setting so don't bother comparing it */
m_rgba == other->m_rgba &&
MT_fuzzyEqual(MT_Vector3(m_normal), MT_Vector3(other->m_normal)) &&
MT_fuzzyEqual(MT_Vector3(m_tangent), MT_Vector3(other->m_tangent)) &&
MT_fuzzyEqual(MT_Vector2(m_uv1), MT_Vector2(other->m_uv1)) &&
MT_fuzzyEqual(MT_Vector2(m_uv2), MT_Vector2(other->m_uv2)) /* &&
MT_fuzzyEqual(MT_Vector3(m_localxyz), MT_Vector3(other->m_localxyz))*/);
- /* dont bother comparing m_localxyz since we know there from the same vert */
+ /* don't bother comparing m_localxyz since we know there from the same vert */
}
short RAS_TexVert::getFlag() const