diff options
| -rw-r--r-- | intern/decimation/intern/LOD_Quadric.h | 2 | ||||
| -rw-r--r-- | intern/decimation/intern/LOD_QuadricEditor.cpp | 2 | ||||
| -rw-r--r-- | release/scripts/templates/script_stub.py | 2 | ||||
| -rw-r--r-- | source/blender/bmesh/operators/bmo_unsubdivide.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/intern/decimation/intern/LOD_Quadric.h b/intern/decimation/intern/LOD_Quadric.h index 9dde0502aa3..fc69530ac43 100644 --- a/intern/decimation/intern/LOD_Quadric.h +++ b/intern/decimation/intern/LOD_Quadric.h @@ -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: diff --git a/intern/decimation/intern/LOD_QuadricEditor.cpp b/intern/decimation/intern/LOD_QuadricEditor.cpp index fbaf0c1180f..9c895ee25f1 100644 --- a/intern/decimation/intern/LOD_QuadricEditor.cpp +++ b/intern/decimation/intern/LOD_QuadricEditor.cpp @@ -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)); diff --git a/release/scripts/templates/script_stub.py b/release/scripts/templates/script_stub.py index 69ecbf48d2c..3b3212892d5 100644 --- a/release/scripts/templates/script_stub.py +++ b/release/scripts/templates/script_stub.py @@ -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')) diff --git a/source/blender/bmesh/operators/bmo_unsubdivide.c b/source/blender/bmesh/operators/bmo_unsubdivide.c index 01a9b6f8416..64b7151aee5 100644 --- a/source/blender/bmesh/operators/bmo_unsubdivide.c +++ b/source/blender/bmesh/operators/bmo_unsubdivide.c @@ -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 */ |