From ff8152b46e7957beffeafca580abc90df47d9d28 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Fri, 21 Mar 2014 21:15:31 +0000
Subject: [PATCH] Merge branch 'trisurf-polyel'

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

diff --git a/src/poly.h b/src/poly.h
index 9bdec52..26dd444 100644
--- a/src/poly.h
+++ b/src/poly.h
@@ -1,11 +1,12 @@
 #ifndef _POLY_H
 #define _POLY_H
+#include"io.h"
 
 #include"general.h"
 
 ts_poly	*init_poly(ts_uint n, ts_vertex *grafted_vtx);
 
-ts_poly_list *init_poly_list(ts_uint n_poly, ts_uint n_mono, ts_vertex_list *vlist);
+ts_poly_list *init_poly_list(ts_uint n_poly, ts_uint n_mono, ts_vertex_list *vlist, ts_vesicle *vesicle);
 
 ts_bool poly_free(ts_poly *poly);
 
@@ -13,4 +14,6 @@
 
 ts_bool poly_assign_spring_const(ts_vesicle *vesicle);
 
+ts_bool poly_assign_filament_xi(ts_vesicle *vesicle, ts_tape *tape);
+
 #endif

--
Gitblit v1.9.3