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/Converter
parente56f71400060f10f73bed6b5c52fc537e5a0d617 (diff)
spelling cleanup
Diffstat (limited to 'source/gameengine/Converter')
-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
4 files changed, 9 insertions, 9 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;