rename presets not to use '+' character, also some typo fixes.
authorCampbell Barton <ideasman42@gmail.com>
Sat, 5 Oct 2013 14:19:39 +0000 (14:19 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 5 Oct 2013 14:19:39 +0000 (14:19 +0000)
release/scripts/modules/bpy/path.py
release/scripts/presets/operator/wm.collada_export/sl_plus_open_sim_rigged.py [moved from release/scripts/presets/operator/wm.collada_export/sl+open_sim_rigged.py with 100% similarity]
release/scripts/presets/operator/wm.collada_export/sl_plus_open_sim_static.py [moved from release/scripts/presets/operator/wm.collada_export/sl+open_sim_static.py with 100% similarity]
source/blender/blenkernel/intern/bvhutils.c
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/shrinkwrap.c
source/blender/blenloader/intern/writefile.c

index e6ccb4190593496195ba7949d9be9acc4e5db64d..da1a52e560dc43bd18ea1dc05ffa2a0f62bfee3f 100644 (file)
@@ -163,6 +163,7 @@ def display_name(name):
     """
     # string replacements
     name = name.replace("_colon_", ":")
+    name = name.replace("_plus_", "+")
 
     name = name.replace("_", " ")
 
index 5b66b8b4cd46db3497b9ca8332203db56ffd1575..370dbc62ef8b44b7272924c38df0db963edd2273 100644 (file)
@@ -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.
index dd747ba4e461614ce0cb8f517bfcabfc625a11d4..9b8d34e651dbf694ec3d20ad2e92ea072f5329c0 100644 (file)
@@ -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)
index 9bc7f4b9e2b7825fce62e58f31bad804184edeb9..5c9c564998e6cd104b794ab990826e3383c04048 100644 (file)
@@ -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;
 
index f3cf7433251feb71b573c98ee9a4fee65e2165f8..a2c91969cf89aca17cea0dabc7edd7d6fdb1d0a7 100644 (file)
@@ -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_mesh   (wd, &mainvar->mesh);
+       write_meshes   (wd, &mainvar->mesh);
        write_particlesettings(wd, &mainvar->particle);
        write_nodetrees(wd, &mainvar->nodetree);
        write_brushes  (wd, &mainvar->brush);