[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60571] trunk/blender: rename presets not to use '+' character, also some typo fixes.

[Campbell Barton]

Revision: 60571
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60571
Author:   campbellbarton
Date:     2013-10-05 14:19:39 +0000 (Sat, 05 Oct 2013)
Log Message:
-----------
rename presets not to use '+' character, also some typo fixes.

Modified Paths:
--------------
    trunk/blender/release/scripts/modules/bpy/path.py
    trunk/blender/source/blender/blenkernel/intern/bvhutils.c
    trunk/blender/source/blender/blenkernel/intern/library.c
    trunk/blender/source/blender/blenkernel/intern/shrinkwrap.c
    trunk/blender/source/blender/blenloader/intern/writefile.c

Added Paths:
-----------
    trunk/blender/release/scripts/presets/operator/wm.collada_export/sl_plus_open_sim_rigged.py
    trunk/blender/release/scripts/presets/operator/wm.collada_export/sl_plus_open_sim_static.py

Removed Paths:
-------------
    trunk/blender/release/scripts/presets/operator/wm.collada_export/sl+open_sim_rigged.py
    trunk/blender/release/scripts/presets/operator/wm.collada_export/sl+open_sim_static.py

Modified: trunk/blender/release/scripts/modules/bpy/path.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy/path.py	2013-10-05 14:10:29 UTC (rev 60570)
+++ trunk/blender/release/scripts/modules/bpy/path.py	2013-10-05 14:19:39 UTC (rev 60571)
@@ -163,6 +163,7 @@
     """
     # string replacements
     name = name.replace("_colon_", ":")
+    name = name.replace("_plus_", "+")
 
     name = name.replace("_", " ")
 

Deleted: trunk/blender/release/scripts/presets/operator/wm.collada_export/sl+open_sim_rigged.py
===================================================================
--- trunk/blender/release/scripts/presets/operator/wm.collada_export/sl+open_sim_rigged.py	2013-10-05 14:10:29 UTC (rev 60570)
+++ trunk/blender/release/scripts/presets/operator/wm.collada_export/sl+open_sim_rigged.py	2013-10-05 14:19:39 UTC (rev 60571)
@@ -1,18 +0,0 @@
-import bpy
-op = bpy.context.active_operator
-
-op.apply_modifiers = True
-op.export_mesh_type = 0
-op.export_mesh_type_selection = 'view'
-op.selected = True
-op.include_children = False
-op.include_armatures = True
-op.include_shapekeys = False
-op.deform_bones_only = True
-op.active_uv_only = True
-op.include_uv_textures = True
-op.use_texture_copies = True
-op.triangulate = True
-op.use_object_instantiation = False
-op.sort_by_name = True
-op.open_sim = True

Deleted: trunk/blender/release/scripts/presets/operator/wm.collada_export/sl+open_sim_static.py
===================================================================
--- trunk/blender/release/scripts/presets/operator/wm.collada_export/sl+open_sim_static.py	2013-10-05 14:10:29 UTC (rev 60570)
+++ trunk/blender/release/scripts/presets/operator/wm.collada_export/sl+open_sim_static.py	2013-10-05 14:19:39 UTC (rev 60571)
@@ -1,18 +0,0 @@
-import bpy
-op = bpy.context.active_operator
-
-op.apply_modifiers = True
-op.export_mesh_type = 0
-op.export_mesh_type_selection = 'view'
-op.selected = True
-op.include_children = False
-op.include_armatures = False
-op.include_shapekeys = False
-op.deform_bones_only = False
-op.active_uv_only = True
-op.include_uv_textures = True
-op.use_texture_copies = True
-op.triangulate = True
-op.use_object_instantiation = False
-op.sort_by_name = True
-op.open_sim = False

Copied: trunk/blender/release/scripts/presets/operator/wm.collada_export/sl_plus_open_sim_rigged.py (from rev 60570, trunk/blender/release/scripts/presets/operator/wm.collada_export/sl+open_sim_rigged.py)
===================================================================
--- trunk/blender/release/scripts/presets/operator/wm.collada_export/sl_plus_open_sim_rigged.py	                        (rev 0)
+++ trunk/blender/release/scripts/presets/operator/wm.collada_export/sl_plus_open_sim_rigged.py	2013-10-05 14:19:39 UTC (rev 60571)
@@ -0,0 +1,18 @@
+import bpy
+op = bpy.context.active_operator
+
+op.apply_modifiers = True
+op.export_mesh_type = 0
+op.export_mesh_type_selection = 'view'
+op.selected = True
+op.include_children = False
+op.include_armatures = True
+op.include_shapekeys = False
+op.deform_bones_only = True
+op.active_uv_only = True
+op.include_uv_textures = True
+op.use_texture_copies = True
+op.triangulate = True
+op.use_object_instantiation = False
+op.sort_by_name = True
+op.open_sim = True

Copied: trunk/blender/release/scripts/presets/operator/wm.collada_export/sl_plus_open_sim_static.py (from rev 60570, trunk/blender/release/scripts/presets/operator/wm.collada_export/sl+open_sim_static.py)
===================================================================
--- trunk/blender/release/scripts/presets/operator/wm.collada_export/sl_plus_open_sim_static.py	                        (rev 0)
+++ trunk/blender/release/scripts/presets/operator/wm.collada_export/sl_plus_open_sim_static.py	2013-10-05 14:19:39 UTC (rev 60571)
@@ -0,0 +1,18 @@
+import bpy
+op = bpy.context.active_operator
+
+op.apply_modifiers = True
+op.export_mesh_type = 0
+op.export_mesh_type_selection = 'view'
+op.selected = True
+op.include_children = False
+op.include_armatures = False
+op.include_shapekeys = False
+op.deform_bones_only = False
+op.active_uv_only = True
+op.include_uv_textures = True
+op.use_texture_copies = True
+op.triangulate = True
+op.use_object_instantiation = False
+op.sort_by_name = True
+op.open_sim = False

Modified: trunk/blender/source/blender/blenkernel/intern/bvhutils.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/bvhutils.c	2013-10-05 14:10:29 UTC (rev 60570)
+++ trunk/blender/source/blender/blenkernel/intern/bvhutils.c	2013-10-05 14:19:39 UTC (rev 60571)
@@ -355,7 +355,7 @@
 
 
 /*
- * 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.

Modified: trunk/blender/source/blender/blenkernel/intern/library.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/library.c	2013-10-05 14:10:29 UTC (rev 60570)
+++ trunk/blender/source/blender/blenkernel/intern/library.c	2013-10-05 14:19:39 UTC (rev 60571)
@@ -1411,7 +1411,7 @@
 
 	/* 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)

Modified: trunk/blender/source/blender/blenkernel/intern/shrinkwrap.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/shrinkwrap.c	2013-10-05 14:10:29 UTC (rev 60570)
+++ trunk/blender/source/blender/blenkernel/intern/shrinkwrap.c	2013-10-05 14:19:39 UTC (rev 60571)
@@ -506,7 +506,7 @@
 	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;
 

Modified: trunk/blender/source/blender/blenloader/intern/writefile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/writefile.c	2013-10-05 14:10:29 UTC (rev 60570)
+++ trunk/blender/source/blender/blenloader/intern/writefile.c	2013-10-05 14:19:39 UTC (rev 60571)
@@ -1808,7 +1808,7 @@
 	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 @@
 	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);