Cycles: svn merge -r41531:41613 ^/trunk/blender
[blender.git] / source / blender / blenkernel / BKE_subsurf.h
index ef3ad3ad2e90358673f549ad05d6107af3e3360d..dcbd045f62d14b6b9c34f7fae2c88e6766267d51 100644 (file)
@@ -1,5 +1,4 @@
-/* $Id$ 
- *
+/*
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or
 #ifndef BKE_SUBSURF_H
 #define BKE_SUBSURF_H
 
+/** \file BKE_subsurf.h
+ *  \ingroup bke
+ */
+
 struct DMGridAdjacency;
 struct DMGridData;
 struct DerivedMesh;
@@ -50,7 +53,7 @@ struct DerivedMesh *subsurf_make_derived_from_derived(
                                                struct DerivedMesh *dm,
                                                struct SubsurfModifierData *smd,
                                                int useRenderParams, float (*vertCos)[3],
-                                               int isFinalCalc, int editMode);
+                                               int isFinalCalc, int forEditMode, int inEditMode);
 
 void subsurf_calculate_limit_positions(struct Mesh *me, float (*positions_r)[3]);