archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

rename presets not to use '+' character, also some typo fixes.

Browse Source
This commit is contained in:
Campbell Barton
2013-10-05 14:19:39 +00:00
parent 874f68279f
commit b20c3f97a4
7 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
release/scripts/modules/bpy/path.py
View File

@@ -163,6 +163,7 @@ def display_name(name):
"""
# string replacements
name = name.replace("_colon_", ":")
name = name.replace("_plus_", "+")
name = name.replace("_", " ")

0
release/scripts/presets/operator/wm.collada_export/sl+open_sim_rigged.py → release/scripts/presets/operator/wm.collada_export/sl_plus_open_sim_rigged.py
View File

0
release/scripts/presets/operator/wm.collada_export/sl+open_sim_static.py → release/scripts/presets/operator/wm.collada_export/sl_plus_open_sim_static.py
View File

2
source/blender/blenkernel/intern/bvhutils.c
View 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.

2
source/blender/blenkernel/intern/library.c
View 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)

2
source/blender/blenkernel/intern/shrinkwrap.c
View 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;

4
source/blender/blenloader/intern/writefile.c
View 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_meshs (wd, &mainvar->mesh);
write_meshes (wd, &mainvar->mesh);
write_particlesettings(wd, &mainvar->particle);
write_nodetrees(wd, &mainvar->nodetree);
write_brushes (wd, &mainvar->brush);