From fd614efb71daee71d0a7c75d749abc365ec7f087 Mon Sep 17 00:00:00 2001
From: Hans-Christian Helltegen <hanhe945@student.liu.se>
Date: Tue, 2 Dec 2014 09:19:34 +0100
Subject: [PATCH] Merge fix

---
 src/rendering/renderablefieldlines.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/rendering/renderablefieldlines.cpp b/src/rendering/renderablefieldlines.cpp
index 884dd2da00..bd703af98e 100644
--- a/src/rendering/renderablefieldlines.cpp
+++ b/src/rendering/renderablefieldlines.cpp
@@ -89,7 +89,7 @@ RenderableFieldlines::~RenderableFieldlines() {
 }
 
 bool RenderableFieldlines::isReady() const {
-	return _fieldlinesProgram != nullptr;
+	return _shader != nullptr;
 }
 
 bool RenderableFieldlines::initialize() {