diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-04-25 19:24:18 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-04-25 19:24:18 +0400 |
commit | 93f420b6669bd17646255b0990b0904681718da8 (patch) | |
tree | ff2a29c89a70496575e255a6f6a7d66bb4c2d16e | |
parent | 93bc6fb829c4ee1e32f7891ec0b4989d908f45e2 (diff) |
correct typo's
-rw-r--r-- | source/blender/blenlib/intern/path_util.c | 2 | ||||
-rw-r--r-- | source/blender/collada/DocumentImporter.cpp | 2 | ||||
-rw-r--r-- | source/blender/editors/metaball/mball_edit.c | 2 | ||||
-rw-r--r-- | source/blender/editors/object/object_hook.c | 2 | ||||
-rw-r--r-- | source/blender/editors/screen/screen_edit.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_file/filelist.c | 4 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_documentation.h | 2 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_modifier_types.h | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_property.c | 2 | ||||
-rw-r--r-- | source/gameengine/GamePlayer/common/unix/GPU_Engine.h | 2 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_RayCast.cpp | 2 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_Scene.cpp | 2 |
12 files changed, 13 insertions, 13 deletions
diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c index 84868915e6b..454663df1ae 100644 --- a/source/blender/blenlib/intern/path_util.c +++ b/source/blender/blenlib/intern/path_util.c @@ -621,7 +621,7 @@ int BLI_path_abs(char *path, const char *basepath) char *lslash= BLI_last_slash(base); if (lslash) { int baselen= (int) (lslash-base) + 1; - /* use path for for temp storage here, we copy back over it right away */ + /* use path for temp storage here, we copy back over it right away */ BLI_strncpy(path, tmp+2, FILE_MAX); memcpy(tmp, base, baselen); diff --git a/source/blender/collada/DocumentImporter.cpp b/source/blender/collada/DocumentImporter.cpp index fd4c31621c8..3c86d205c6e 100644 --- a/source/blender/collada/DocumentImporter.cpp +++ b/source/blender/collada/DocumentImporter.cpp @@ -3119,7 +3119,7 @@ public: } /** This method will be called if an error in the loading process occurred and the loader cannot - continue to to load. The writer should undo all operations that have been performed. + continue to load. The writer should undo all operations that have been performed. @param errorMessage A message containing informations about the error that occurred. */ virtual void cancel(const COLLADAFW::String& errorMessage) diff --git a/source/blender/editors/metaball/mball_edit.c b/source/blender/editors/metaball/mball_edit.c index 62e424aae9b..62261c3c68f 100644 --- a/source/blender/editors/metaball/mball_edit.c +++ b/source/blender/editors/metaball/mball_edit.c @@ -80,7 +80,7 @@ void make_editMball(Object *obedit) /* This function is called, when MetaBall Object switched from * edit mode to object mode. List od MetaElements is copied - * from object->data->edit_elems to to object->data->elems. */ + * from object->data->edit_elems to object->data->elems. */ void load_editMball(Object *obedit) { MetaBall *mb = (MetaBall*)obedit->data; diff --git a/source/blender/editors/object/object_hook.c b/source/blender/editors/object/object_hook.c index eba6db6bb79..88e463039a1 100644 --- a/source/blender/editors/object/object_hook.c +++ b/source/blender/editors/object/object_hook.c @@ -656,7 +656,7 @@ void OBJECT_OT_hook_reset(wmOperatorType *ot) /* identifiers */ ot->name= "Reset Hook"; - ot->description= "Recalculate and and clear offset transformation"; + ot->description= "Recalculate and clear offset transformation"; ot->idname= "OBJECT_OT_hook_reset"; /* callbacks */ diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c index b75e826c09c..4a0a79b2163 100644 --- a/source/blender/editors/screen/screen_edit.c +++ b/source/blender/editors/screen/screen_edit.c @@ -1492,7 +1492,7 @@ void ED_screen_full_restore(bContext *C, ScrArea *sa) wmWindow *win= CTX_wm_window(C); SpaceLink *sl = sa->spacedata.first; - /* if fullscreen area has a secondary space (such as as file browser or fullscreen render + /* if fullscreen area has a secondary space (such as a file browser or fullscreen render * overlaid on top of a existing setup) then return to the previous space */ if (sl->next) { diff --git a/source/blender/editors/space_file/filelist.c b/source/blender/editors/space_file/filelist.c index 0674568579e..455a5ab951e 100644 --- a/source/blender/editors/space_file/filelist.c +++ b/source/blender/editors/space_file/filelist.c @@ -161,7 +161,7 @@ static int compare_name(const void *a1, const void *a2) { const struct direntry *entry1=a1, *entry2=a2; - /* type is is equal to stat.st_mode */ + /* type is equal to stat.st_mode */ if (S_ISDIR(entry1->type)){ if (S_ISDIR(entry2->type)==0) return (-1); @@ -258,7 +258,7 @@ static int compare_extension(const void *a1, const void *a2) { if (!sufix1) sufix1= nil; if (!sufix2) sufix2= nil; - /* type is is equal to stat.st_mode */ + /* type is equal to stat.st_mode */ if (S_ISDIR(entry1->type)){ if (S_ISDIR(entry2->type)==0) return (-1); diff --git a/source/blender/makesdna/DNA_documentation.h b/source/blender/makesdna/DNA_documentation.h index d0f24eb0010..a911b92c313 100644 --- a/source/blender/makesdna/DNA_documentation.h +++ b/source/blender/makesdna/DNA_documentation.h @@ -44,7 +44,7 @@ * untyped. The parser/dna generator has been modified to explicitly * handle these special cases. Most pointers have been given proper * proto's by now. DNA_space_types.h::Spacefile::returnfuncmay still - * be badly defined. The reason for this is that is is called with + * be badly defined. The reason for this is that it is called with * different types of arguments. It takes a char* at this moment... * * - Path to the header files diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h index 3117536a7dc..15be298f134 100644 --- a/source/blender/makesdna/DNA_modifier_types.h +++ b/source/blender/makesdna/DNA_modifier_types.h @@ -607,7 +607,7 @@ typedef enum { typedef struct FluidsimModifierData { ModifierData modifier; - struct FluidsimSettings *fss; /* definition is is DNA_object_fluidsim.h */ + struct FluidsimSettings *fss; /* definition is in DNA_object_fluidsim.h */ struct PointCache *point_cache; /* definition is in DNA_object_force.h */ } FluidsimModifierData; diff --git a/source/blender/makesrna/intern/rna_property.c b/source/blender/makesrna/intern/rna_property.c index 6de403f28d1..13bb799157c 100644 --- a/source/blender/makesrna/intern/rna_property.c +++ b/source/blender/makesrna/intern/rna_property.c @@ -108,7 +108,7 @@ void RNA_def_gameproperty(BlenderRNA *brna) RNA_def_struct_refine_func(srna, "rna_GameProperty_refine"); prop= RNA_def_property(srna, "name", PROP_STRING, PROP_NONE); - RNA_def_property_ui_text(prop, "Name", "Available as as GameObject attributes in the game engines python api"); + RNA_def_property_ui_text(prop, "Name", "Available as GameObject attributes in the game engines python api"); RNA_def_struct_name_property(srna, prop); RNA_def_property_string_funcs(prop, NULL, NULL, "rna_GameProperty_name_set"); diff --git a/source/gameengine/GamePlayer/common/unix/GPU_Engine.h b/source/gameengine/GamePlayer/common/unix/GPU_Engine.h index d5d8ffdb138..12fb70c84ef 100644 --- a/source/gameengine/GamePlayer/common/unix/GPU_Engine.h +++ b/source/gameengine/GamePlayer/common/unix/GPU_Engine.h @@ -34,7 +34,7 @@ #include <X11/Intrinsic.h> #include <X11/StringDefs.h> -#define Object DNA_Object // tricky stuff !!! but without it it doesn't compile... +#define Object DNA_Object // tricky stuff !!! but without it, it doesn't compile... #include "GPC_Engine.h" diff --git a/source/gameengine/Ketsji/KX_RayCast.cpp b/source/gameengine/Ketsji/KX_RayCast.cpp index 58bb61a51a2..7562265a536 100644 --- a/source/gameengine/Ketsji/KX_RayCast.cpp +++ b/source/gameengine/Ketsji/KX_RayCast.cpp @@ -86,7 +86,7 @@ bool KX_RayCast::RayTest(PHY_IPhysicsEnvironment* physics_environment, const MT_ break; } - // The biggest danger to to endless loop, prevent this by checking that the + // The biggest danger to endless loop, prevent this by checking that the // hit point always progresses along the ray direction.. prevpoint -= callback.m_hitPoint; if (prevpoint.length2() < MT_EPSILON) diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp index 5249c91832e..f805b693d0b 100644 --- a/source/gameengine/Ketsji/KX_Scene.cpp +++ b/source/gameengine/Ketsji/KX_Scene.cpp @@ -530,7 +530,7 @@ KX_GameObject* KX_Scene::AddNodeReplicaObject(class SG_IObject* node, class CVal // replica of the hierarchy in order to make cross-links work properly // ! // It is VERY important that the order of sensors and actuators in -// the replicated object is preserved: it is is used to reconnect the logic. +// the replicated object is preserved: it is used to reconnect the logic. // This method is more robust then using the bricks name in case of complex // group replication. The replication of logic bricks is done in // SCA_IObject::ReParentLogic(), make sure it preserves the order of the bricks. |