merge with 2.5 (not trunk, last merge message said that on accident) at r22252
[blender.git] / source / blender / editors / armature / meshlaplacian.c
index 83179dd3843ae2a9d1ae7c11197148b40e180ad0..b44782fca732242f26af20dd04b3025fb9b25254 100644 (file)
@@ -65,7 +65,7 @@
 
 
 /* ************* XXX *************** */
-static void waitcursor() {}
+static void waitcursor(int val) {}
 static void progress_bar() {}
 static void start_progress_bar() {}
 static void end_progress_bar() {}