From 0a8ead1172463e9ab8466b5032c5d78670525530 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= <tomi.korpipaa@theqtcompany.com>
Date: Mon, 20 Apr 2015 12:00:06 +0300
Subject: [PATCH] Fixed incorrectly working vertexAttrib...fv functions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Change-Id: I26bd2ef2cae4baa7786fc5479f8c5bff0ec17e2c
Task-number: QTBUG-45043
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
---
src/imports/qtcanvas3d/context3d.cpp | 8 --------
1 file changed, 8 deletions(-)
diff --git a/src/imports/qtcanvas3d/context3d.cpp b/src/imports/qtcanvas3d/context3d.cpp
index fe2d572..234765a 100644
--- a/src/imports/qtcanvas3d/context3d.cpp
+++ b/src/imports/qtcanvas3d/context3d.cpp
@@ -5469,8 +5469,6 @@ void CanvasContext::vertexAttrib1fva(uint indx, QVariantList values)
<< "(indx" << indx
<< ", values:" << values
<< ")";
- if (!m_currentProgram)
- return;
int size = values.count();
float *arrayData = new float[size];
@@ -5497,8 +5495,6 @@ void CanvasContext::vertexAttrib2fva(uint indx, QVariantList values)
<< "(indx" << indx
<< ", values:" << values
<< ")";
- if (!m_currentProgram)
- return;
int size = values.count();
float *arrayData = new float[size];
@@ -5525,8 +5521,6 @@ void CanvasContext::vertexAttrib3fva(uint indx, QVariantList values)
<< "(indx" << indx
<< ", values:" << values
<< ")";
- if (!m_currentProgram)
- return;
int size = values.count();
float *arrayData = new float[size];
@@ -5553,8 +5547,6 @@ void CanvasContext::vertexAttrib4fva(uint indx, QVariantList values)
<< "(indx" << indx
<< ", values:" << values
<< ")";
- if (!m_currentProgram)
- return;
int size = values.count();
float *arrayData = new float[size];
--
GitLab