diff options
-rw-r--r-- | release/scripts/modules/bpy/path.py | 1 | ||||
-rw-r--r-- | release/scripts/presets/operator/wm.collada_export/sl_plus_open_sim_rigged.py (renamed from release/scripts/presets/operator/wm.collada_export/sl+open_sim_rigged.py) | 0 | ||||
-rw-r--r-- | release/scripts/presets/operator/wm.collada_export/sl_plus_open_sim_static.py (renamed from release/scripts/presets/operator/wm.collada_export/sl+open_sim_static.py) | 0 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/bvhutils.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/library.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/shrinkwrap.c | 2 | ||||
-rw-r--r-- | source/blender/blenloader/intern/writefile.c | 4 |
7 files changed, 6 insertions, 5 deletions
diff --git a/release/scripts/modules/bpy/path.py b/release/scripts/modules/bpy/path.py index e6ccb419059..da1a52e560d 100644 --- a/release/scripts/modules/bpy/path.py +++ b/release/scripts/modules/bpy/path.py @@ -163,6 +163,7 @@ def display_name(name): """ # string replacements name = name.replace("_colon_", ":") + name = name.replace("_plus_", "+") name = name.replace("_", " ") diff --git a/release/scripts/presets/operator/wm.collada_export/sl+open_sim_rigged.py b/release/scripts/presets/operator/wm.collada_export/sl_plus_open_sim_rigged.py index 7825a4d0f32..7825a4d0f32 100644 --- a/release/scripts/presets/operator/wm.collada_export/sl+open_sim_rigged.py +++ b/release/scripts/presets/operator/wm.collada_export/sl_plus_open_sim_rigged.py diff --git a/release/scripts/presets/operator/wm.collada_export/sl+open_sim_static.py b/release/scripts/presets/operator/wm.collada_export/sl_plus_open_sim_static.py index 9e2efcaa727..9e2efcaa727 100644 --- a/release/scripts/presets/operator/wm.collada_export/sl+open_sim_static.py +++ b/release/scripts/presets/operator/wm.collada_export/sl_plus_open_sim_static.py diff --git a/source/blender/blenkernel/intern/bvhutils.c b/source/blender/blenkernel/intern/bvhutils.c index 5b66b8b4cd4..370dbc62ef8 100644 --- a/source/blender/blenkernel/intern/bvhutils.c +++ b/source/blender/blenkernel/intern/bvhutils.c @@ -355,7 +355,7 @@ float nearest_point_in_tri_surface(const float v0[3], const float v1[3], const f /* - * BVH from meshs callbacks + * BVH from meshes callbacks */ /* Callback to bvh tree nearest point. The tree must bust have been built using bvhtree_from_mesh_faces. diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c index dd747ba4e46..9b8d34e651d 100644 --- a/source/blender/blenkernel/intern/library.c +++ b/source/blender/blenkernel/intern/library.c @@ -1411,7 +1411,7 @@ bool new_id(ListBase *lb, ID *id, const char *tname) /* This was in 2.43 and previous releases * however all data in blender should be sorted, not just duplicate names - * sorting should not hurt, but noting just incause it alters the way other + * sorting should not hurt, but noting just incase it alters the way other * functions work, so sort every time */ #if 0 if (result) diff --git a/source/blender/blenkernel/intern/shrinkwrap.c b/source/blender/blenkernel/intern/shrinkwrap.c index 9bc7f4b9e2b..5c9c564998e 100644 --- a/source/blender/blenkernel/intern/shrinkwrap.c +++ b/source/blender/blenkernel/intern/shrinkwrap.c @@ -506,7 +506,7 @@ void shrinkwrapModifier_deform(ShrinkwrapModifierData *smd, Object *ob, DerivedM DerivedMesh *ss_mesh = NULL; ShrinkwrapCalcData calc = NULL_ShrinkwrapCalcData; - /* remove loop dependencies on derived meshs (TODO should this be done elsewhere?) */ + /* remove loop dependencies on derived meshes (TODO should this be done elsewhere?) */ if (smd->target == ob) smd->target = NULL; if (smd->auxTarget == ob) smd->auxTarget = NULL; diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c index f3cf7433251..a2c91969cf8 100644 --- a/source/blender/blenloader/intern/writefile.c +++ b/source/blender/blenloader/intern/writefile.c @@ -1808,7 +1808,7 @@ static void write_customdata(WriteData *wd, ID *id, int count, CustomData *data, CustomData_free(&data_tmp, count); } -static void write_meshs(WriteData *wd, ListBase *idbase) +static void write_meshes(WriteData *wd, ListBase *idbase) { Mesh *mesh; int save_for_old_blender= 0; @@ -3366,7 +3366,7 @@ static int write_file_handle(Main *mainvar, int handle, MemFile *compare, MemFil write_objects (wd, &mainvar->object); write_materials(wd, &mainvar->mat); write_textures (wd, &mainvar->tex); - write_meshs (wd, &mainvar->mesh); + write_meshes (wd, &mainvar->mesh); write_particlesettings(wd, &mainvar->particle); write_nodetrees(wd, &mainvar->nodetree); write_brushes (wd, &mainvar->brush); |