← Back to branch summary

~ubuntu-branches/debian/sid/openscenegraph/sid

« back to all changes in this revision

Viewing changes to debian/patches/Upstream-fix-(b801ae)-for-bug-#736350

  • Committer: Package Import Robot
  • Author(s): Alberto Luaces
  • Date: 2014-01-24 21:09:56 UTC
  • Revision ID: package-import@ubuntu.com-20140124210956-un93lmarq3hy5efj
Tags: 3.2.0~rc1-3
http://bugs.debian.org/736350
http://bugs.debian.org/724753
* Fix for texture corruption. Thanks Rebecca Palmer for the patch and
  testing and Markus Wanner for additional testing (Closes: #736350).
* Now depends on xinelib 1.2 (Closes: #724753).

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/Upstream-fix-(b801ae)-for-bug-#736350
 
1
Description: Default to BIND_PER_VERTEX to fix texture corruption
 
2
 
 
3
Bug-Debian: http://bugs.debian.org/736350
 
4
Origin: upstream https://github.com/openscenegraph/osg/commit/b801ae9d499a78889a322b95fbdf9864828349bc
 
5
 
 
6
--- openscenegraph-3.2.0~rc1.orig/OpenSceneGraph/src/osg/Geometry.cpp
 
7
+++ openscenegraph-3.2.0~rc1/OpenSceneGraph/src/osg/Geometry.cpp
 
8
@@ -161,12 +161,14 @@ void Geometry::setTexCoordArray(unsigned
 
9
     if (_texCoordList.size()<=index)
 
10
         _texCoordList.resize(index+1);
 
11
 
 
12
-    if (array && binding!=osg::Array::BIND_UNDEFINED) array->setBinding(binding);
 
13
+    if (array)
 
14
+    {
 
15
+        if (binding!=osg::Array::BIND_UNDEFINED) array->setBinding(binding);
 
16
+        else array->setBinding(osg::Array::BIND_PER_VERTEX);
 
17
+    }
 
18
 
 
19
     _texCoordList[index] = array;
 
20
 
 
21
-    // do we set to array BIND_PER_VERTEX?
 
22
-
 
23
     dirtyDisplayList();
 
24
 
 
25
     if (_useVertexBufferObjects && array)