merge with/from trunk at r35190
[blender.git] / source / blender / editors / mesh / knifetool.c
index 10143b5af7cfd7363a6019a4311b82b9b01979f7..60910497fad1813cee3d1f85264a6a5c777ec1b8 100755 (executable)
@@ -803,7 +803,7 @@ BMEdgeHit *knife_edge_tri_isect(knifetool_opdata *kcd, BMBVHTree *bmtree, float
        return edges;
 }
 
-knife_bgl_get_mats(knifetool_opdata *kcd, bglMats *mats)
+void knife_bgl_get_mats(knifetool_opdata *kcd, bglMats *mats)
 {
        bgl_get_mats(mats);
        //copy_m4_m4(mats->modelview, kcd->vc.rv3d->viewmat);