minor changes
authorCampbell Barton <ideasman42@gmail.com>
Wed, 17 Oct 2012 16:10:04 +0000 (16:10 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 17 Oct 2012 16:10:04 +0000 (16:10 +0000)
- stub from last commit was incorrect (copied old docs)
- decimator was making copy of quadric for no reason.
- correct typo

intern/decimation/intern/LOD_Quadric.h
intern/decimation/intern/LOD_QuadricEditor.cpp
release/scripts/templates/script_stub.py
source/blender/bmesh/operators/bmo_unsubdivide.c

index 9dde0502aa31a495b390184408a6d16b4c1e9b1e..fc69530ac439f653eee64f65a71feae1e800b776 100644 (file)
@@ -45,7 +45,7 @@ private:
     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:
 
index fbaf0c1180f47c9e866e37a0c898b08fed6fa202..9c895ee25f1863e053ee94babb6a1b3e142dbdba 100644 (file)
@@ -179,7 +179,7 @@ BuildQuadrics(
                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));
index 69ecbf48d2c2eac87a488c869d51be6c2b77d295..3b3212892d5804d0b43f68314ba222d7509a8797 100644 (file)
@@ -7,5 +7,5 @@ import os
 # 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'))
index 01a9b6f8416d0d2855f39d160fa9e9419b7b654f..64b7151aee568370891dc1fbf15fe30a0788fe22 100644 (file)
@@ -218,7 +218,7 @@ void bmo_unsubdivide_exec(BMesh *bm, BMOperator *op)
                                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 */