[Bf-blender-cvs] [3991d0805c4] soc-2018-npr: Fixed complier-specific errors.

Nick Wu noreply at git.blender.org
Tue Jun 5 07:34:25 CEST 2018


Commit: 3991d0805c4195c20537e0f27225934501ebad46
Author: Nick Wu
Date:   Tue Jun 5 13:34:01 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rB3991d0805c4195c20537e0f27225934501ebad46

Fixed complier-specific errors.

===================================================================

M	source/blender/draw/engines/lanpr/NUL_TNS_EdgeRendering.c

===================================================================

diff --git a/source/blender/draw/engines/lanpr/NUL_TNS_EdgeRendering.c b/source/blender/draw/engines/lanpr/NUL_TNS_EdgeRendering.c
index 957b6165b18..6fc01daedec 100644
--- a/source/blender/draw/engines/lanpr/NUL_TNS_EdgeRendering.c
+++ b/source/blender/draw/engines/lanpr/NUL_TNS_EdgeRendering.c
@@ -908,7 +908,7 @@ void lanpr_remove_sample(LANPR_PrivateData* pd, int Row, int Col) {
 	BLI_addtail(&pd->erased_samples, ts);
 }
 
-int lanpr_grow_snake_r(LANPR_PrivateData* pd, LANPR_LineStrip* ls, LANPR_LineStripPoint* ThisP, int Direction) {
+void lanpr_grow_snake_r(LANPR_PrivateData* pd, LANPR_LineStrip* ls, LANPR_LineStripPoint* ThisP, int Direction) {
 	LANPR_LineStripPoint* NewP = ThisP,*p2;
 	int Length = 5;
 	int l = 0;
@@ -945,7 +945,7 @@ int lanpr_grow_snake_r(LANPR_PrivateData* pd, LANPR_LineStrip* ls, LANPR_LineStr
 		lanpr_append_point(pd, ls, TX, TY, 0);
 }
 
-int lanpr_grow_snake_l(LANPR_PrivateData* pd, LANPR_LineStrip* ls, LANPR_LineStripPoint* ThisP, int Direction) {
+void lanpr_grow_snake_l(LANPR_PrivateData* pd, LANPR_LineStrip* ls, LANPR_LineStripPoint* ThisP, int Direction) {
 	LANPR_LineStripPoint* NewP = ThisP, *p2;
 	int Length = 5;
 	int l = 0;
@@ -1012,7 +1012,7 @@ Gwn_Batch *lanpr_get_snake_batch(LANPR_PrivateData* pd){
 	LANPR_LineStrip* ls;
 	LANPR_LineStripPoint* lsp, *plsp;
 	int i;
-	u32bit *Index_adjacent;
+	//u32bit *Index_adjacent;
 	float* Verts;
 	float* Lengths;
 	float TotalLength=0;



More information about the Bf-blender-cvs mailing list