From 5ec690fdf8f463a02c4e4d5505d5486b9a5bbd70 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Tue, 08 Jul 2014 16:21:14 +0000
Subject: [PATCH] Merge branch 'master' of bitbucket.org:samop/trisurf-ng into cross-section

---
 src/constvol.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/constvol.h b/src/constvol.h
index 605daa1..5d1eb71 100644
--- a/src/constvol.h
+++ b/src/constvol.h
@@ -1,8 +1,8 @@
 #ifndef _H_CONSTVOL
 #define _H_CONSTVOL
 
-ts_bool constvolume(ts_vesicle *vesicle, ts_vertex *vtx_avoid, ts_double Vol, ts_double *retEnergy, ts_vertex *vtx_moved, ts_vertex *vtx_backup);
+ts_bool constvolume(ts_vesicle *vesicle, ts_vertex *vtx_avoid, ts_double Vol, ts_double *retEnergy, ts_vertex **vtx_moved_retval, ts_vertex **vtx_backup);
 ts_bool constvolConstraintCheck(ts_vesicle *vesicle, ts_vertex *vtx);
 ts_bool constvolumerestore(ts_vertex *vtx_moved, ts_vertex *vtx_backup);
-ts_bool constvolumeaccept(ts_vertex *vtx_moved, ts_vertex *vtx_backup);
+ts_bool constvolumeaccept(ts_vesicle *vesicle, ts_vertex *vtx_moved, ts_vertex *vtx_backup);
 #endif

--
Gitblit v1.9.3