From bbe7df469c40beb309542c01f25c262340978629 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Thu, 15 Sep 2016 08:04:34 +0000
Subject: [PATCH] Merge branch 'pegs'
---
src/frame.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/frame.c b/src/frame.c
index d81ba7e..68b8a84 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -72,20 +72,23 @@
}
//Add all polymers to cells
+if(vesicle->poly_list!=NULL){
for(i=0;i<vesicle->poly_list->n;i++){
for(j=0;j<vesicle->poly_list->poly[i]->vlist->n;j++){
cellidx=vertex_self_avoidance(vesicle, vesicle->poly_list->poly[i]->vlist->vtx[j]);
cell_add_vertex(vesicle->clist->cell[cellidx],vesicle->poly_list->poly[i]->vlist->vtx[j]);
}
}
+}
//Add all filaments to cells
+if(vesicle->filament_list!=NULL){
for(i=0;i<vesicle->filament_list->n;i++){
for(j=0;j<vesicle->filament_list->poly[i]->vlist->n;j++){
cellidx=vertex_self_avoidance(vesicle, vesicle->filament_list->poly[i]->vlist->vtx[j]);
cell_add_vertex(vesicle->clist->cell[cellidx],vesicle->filament_list->poly[i]->vlist->vtx[j]);
}
}
-
+}
return TS_SUCCESS;
}
--
Gitblit v1.9.3