From aa2a0e4ab00a803743141af258a1ff1515182420 Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@pandora.be>
Date: Mon, 29 Apr 2013 19:15:56 +0000
Subject: More build fixes for visual studio 2012.

Patch #35019, #35131 and #35152 by Jurgen Herrmann.
---
 source/blender/freestyle/intern/view_map/Functions1D.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source/blender/freestyle/intern/view_map')

diff --git a/source/blender/freestyle/intern/view_map/Functions1D.cpp b/source/blender/freestyle/intern/view_map/Functions1D.cpp
index 5d12c5bb251..c66d8b8bfe7 100644
--- a/source/blender/freestyle/intern/view_map/Functions1D.cpp
+++ b/source/blender/freestyle/intern/view_map/Functions1D.cpp
@@ -220,7 +220,7 @@ void getOccludeeF1D(Interface1D& inter, set<ViewShape*>& oShapes)
 	if (ve) {
 		ViewShape *aShape = ve->aShape();
 		if (aShape == 0) {
-			oShapes.insert(0);
+			oShapes.insert((ViewShape*)0);
 			return;
 		}
 		oShapes.insert(aShape);
-- 
cgit v1.2.3