[Bf-blender-cvs] [a75059cd445] soc-2018-npr: fixed VC-specific warnings.

[Nick Wu]

Commit: a75059cd4453b71afddbbc4014128ede9a26fe72
Author: Nick Wu
Date:   Thu Jul 5 11:17:36 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rBa75059cd4453b71afddbbc4014128ede9a26fe72

fixed VC-specific warnings.

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

M	source/blender/draw/engines/lanpr/lanpr_all.h
M	source/blender/draw/engines/lanpr/lanpr_engine.c
M	source/blender/draw/engines/lanpr/lanpr_util.c
M	source/blender/draw/engines/lanpr/lanpr_util.h

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

diff --git a/source/blender/draw/engines/lanpr/lanpr_all.h b/source/blender/draw/engines/lanpr/lanpr_all.h
index 5408e908270..512b69184ee 100644
--- a/source/blender/draw/engines/lanpr/lanpr_all.h
+++ b/source/blender/draw/engines/lanpr/lanpr_all.h
@@ -8,7 +8,7 @@
 #include "GPU_shader.h"
 #include "GPU_uniformbuffer.h"
 #include "GPU_viewport.h"
-#include "DNA_listbase.h"
+#include "DNA_listBase.h"
 #include "DRW_render.h"
 #include "BKE_object.h"
 #include "DNA_mesh_types.h"
diff --git a/source/blender/draw/engines/lanpr/lanpr_engine.c b/source/blender/draw/engines/lanpr/lanpr_engine.c
index 1dfa94f5b4c..4358870665b 100644
--- a/source/blender/draw/engines/lanpr/lanpr_engine.c
+++ b/source/blender/draw/engines/lanpr/lanpr_engine.c
@@ -479,6 +479,7 @@ static void lanpr_draw_scene_exec(void *vedata, GPUFrameBuffer* dfb) {
 
 	    GPU_framebuffer_clear(fbl->software_ms, clear_bits, lanpr->background_color, clear_depth, clear_stencil);
 
+		DRW_draw_pass(psl->color_pass);
 		DRW_draw_pass(psl->color_pass);
 		//DRW_draw_pass(psl->software_pass);
 
diff --git a/source/blender/draw/engines/lanpr/lanpr_util.c b/source/blender/draw/engines/lanpr/lanpr_util.c
index 410a99f35e2..8b9362a871a 100644
--- a/source/blender/draw/engines/lanpr/lanpr_util.c
+++ b/source/blender/draw/engines/lanpr/lanpr_util.c
@@ -1293,11 +1293,10 @@ void strCopySized(char *dest, int LenthLim, char *src){
 	if (src && dest)
 		strcpy_s(dest, LenthLim + 1, src);
 }
-#define strAppend strcat_s
 void strPrintFloatAfter(char *dest, int LenthLim, int bits, real data){
 	char temp[64];
-	sprintf_s(temp, LenthLim, "%.*lf", bits, data);
-	strcat_s(dest, LenthLim, temp);
+	sprintf(temp, "%.*lf", bits, data);
+	strcat(dest, temp);
 }
 void strPrintIntAfter(char *dest, int LenthLim, int data){
 	char temp[64];
diff --git a/source/blender/draw/engines/lanpr/lanpr_util.h b/source/blender/draw/engines/lanpr/lanpr_util.h
index ed92d759b90..e0d80c3c44f 100644
--- a/source/blender/draw/engines/lanpr/lanpr_util.h
+++ b/source/blender/draw/engines/lanpr/lanpr_util.h
@@ -522,7 +522,6 @@ void strConvFloat_CString(real src, char *dest, int lenth);
 
 void strCopyFull(char *dest, char *src);
 void strCopySized(char *dest, int LenthLim, char *src);
-#define strAppend strcat_s
 void strPrintFloatAfter(char *dest, int LenthLim, int bits, real data);
 void strPrintIntAfter(char *dest, int LenthLim, int data);
 void strToWideChar(wchar_t *destBuf, char *srcBuf);
@@ -564,7 +563,7 @@ void tMatMakePerspectiveMatrix44d(tnsMatrix44d mProjection, real fFov_rad, real
 void tMatMakeTranslationMatrix44d(tnsMatrix44d mTrans, real x, real y, real z);
 void tMatMakeRotationMatrix44d(tnsMatrix44d m, real angle_rad, real x, real y, real z);
 void tMatMakeScaleMatrix44d(tnsMatrix44d m, real x, real y, real z);
-void tMatMakeViewportMatrix44d(tnsMatrix44d m, real w, real h);
+void tMatMakeViewportMatrix44d(tnsMatrix44d m, real w, real h, real Far, real Near);
 void tMatMultiply44d(tnsMatrix44d result, tnsMatrix44d l, tnsMatrix44d r);
 void tMatInverse44d(tnsMatrix44d inverse, tnsMatrix44d mat);
 void tMatMakeRotationXMatrix44d(tnsMatrix44d m, real angle_rad);