[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51387] trunk/blender: minor changes

[Campbell Barton]

Revision: 51387
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51387
Author:   campbellbarton
Date:     2012-10-17 16:10:04 +0000 (Wed, 17 Oct 2012)
Log Message:
-----------
minor changes
- stub from last commit was incorrect (copied old docs)
- decimator was making copy of quadric for no reason.
- correct typo

Modified Paths:
--------------
    trunk/blender/intern/decimation/intern/LOD_Quadric.h
    trunk/blender/intern/decimation/intern/LOD_QuadricEditor.cpp
    trunk/blender/release/scripts/templates/script_stub.py
    trunk/blender/source/blender/bmesh/operators/bmo_unsubdivide.c

Modified: trunk/blender/intern/decimation/intern/LOD_Quadric.h
===================================================================
--- trunk/blender/intern/decimation/intern/LOD_Quadric.h	2012-10-17 16:01:57 UTC (rev 51386)
+++ trunk/blender/intern/decimation/intern/LOD_Quadric.h	2012-10-17 16:10:04 UTC (rev 51387)
@@ -45,7 +45,7 @@
     MT_Scalar         c2, cd;
     MT_Scalar             d2;
 
-    void init(MT_Scalar a, MT_Scalar b, MT_Scalar c, MT_Scalar d);
+    //void init(MT_Scalar a, MT_Scalar b, MT_Scalar c, MT_Scalar d);
 
 public:
 

Modified: trunk/blender/intern/decimation/intern/LOD_QuadricEditor.cpp
===================================================================
--- trunk/blender/intern/decimation/intern/LOD_QuadricEditor.cpp	2012-10-17 16:01:57 UTC (rev 51386)
+++ trunk/blender/intern/decimation/intern/LOD_QuadricEditor.cpp	2012-10-17 16:10:04 UTC (rev 51387)
@@ -179,7 +179,7 @@
 		MT_Vector3 target = TargetVertex(*edge_it);
 
 		LOD_Edge &e = *edge_it;
-		LOD_Quadric q0 = quadrics[e.m_verts[0]];
+		const LOD_Quadric &q0 = quadrics[e.m_verts[0]];
 		const LOD_Quadric &q1 = quadrics[e.m_verts[1]];
 		
 		e.HeapKey() = -float(q0.Evaluate(target) + q1.Evaluate(target));

Modified: trunk/blender/release/scripts/templates/script_stub.py
===================================================================
--- trunk/blender/release/scripts/templates/script_stub.py	2012-10-17 16:01:57 UTC (rev 51386)
+++ trunk/blender/release/scripts/templates/script_stub.py	2012-10-17 16:10:04 UTC (rev 51387)
@@ -7,5 +7,5 @@
 # Use your own script name here:
 filename = "my_script.py"
 
-filepath = os.path.join(os.path.basename(bpy.data.filepath), filename)
+filepath = os.path.join(os.path.dirname(bpy.data.filepath), filename)
 exec(compile(open(filepath).read(), filepath, 'exec'))

Modified: trunk/blender/source/blender/bmesh/operators/bmo_unsubdivide.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_unsubdivide.c	2012-10-17 16:01:57 UTC (rev 51386)
+++ trunk/blender/source/blender/bmesh/operators/bmo_unsubdivide.c	2012-10-17 16:10:04 UTC (rev 51387)
@@ -218,7 +218,7 @@
 				BM_elem_index_set(v, VERT_INDEX_IGNORE);  /* set_dirty! */
 			}
 		}
-		/* dont with selecting tagged verts */
+		/* done with selecting tagged verts */
 
 
 		/* main loop, keep tagging until we can't tag any more islands */