From d6e7eb27ed555362d380667a2fe6e6a1415ae44d Mon Sep 17 00:00:00 2001 From: Peter Schlaile Date: Mon, 26 Jun 2006 13:22:55 +0000 Subject: == Frameserver == Set SO_REUSEADDR on server-socket, since otherwise, frameserver will barf on second start. --- source/blender/blenkernel/intern/writeframeserver.c | 5 +++++ source/blender/render/intern/source/convertblender.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'source') diff --git a/source/blender/blenkernel/intern/writeframeserver.c b/source/blender/blenkernel/intern/writeframeserver.c index 58d8f82d454..76832922dcf 100644 --- a/source/blender/blenkernel/intern/writeframeserver.c +++ b/source/blender/blenkernel/intern/writeframeserver.c @@ -28,6 +28,7 @@ #else #include #include +#include #include #include #include @@ -90,6 +91,7 @@ static int closesocket(int fd) { void start_frameserver(RenderData *rd, int rectx, int recty) { struct sockaddr_in addr; + int arg = 1; if ((sock = socket(AF_INET, SOCK_STREAM, 0)) < 0) { G.afbreek = 1; /* Abort render */ @@ -97,6 +99,9 @@ void start_frameserver(RenderData *rd, int rectx, int recty) return; } + setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, + (char*) &arg, sizeof(arg)); + addr.sin_family = AF_INET; addr.sin_port = htons(U.frameserverport); addr.sin_addr.s_addr = INADDR_ANY; diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index 2596eb84b15..c7b96ad28f3 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -604,7 +604,7 @@ static void calc_vertexnormals(Render *re, int startvert, int startvlak, int do_ float *v1= vlr->v1->n; float *v2= vlr->v2->n; float *v3= vlr->v3->n; - float *v4= vlr->v4->n; + float *v4= vlr->v4?vlr->v4->n:NULL; float *nor= vlr->n; vlr->puno &= ~15; if ((nor[0]*v1[0] + nor[1]*v1[1] + nor[2]*v1[2]) < -FLT_EPSILON10) vlr->puno= 1; -- cgit v1.2.3