Unity

Merge lp:~vanvugt/unity/fix-1036514 into lp:unity

  1. fix-1036514
  2. Merge into trunk
Proposed by Daniel van Vugt
Status: Merged
Approved by: Sam Spilsbury
Approved revision: no longer in the source branch.
Merged at revision: 2564
Proposed branch: lp:~vanvugt/unity/fix-1036514
Merge into: lp:unity
Diff against target: 14 lines (+2/-2)
1 file modified
unity-shared/IconRenderer.cpp (+2/-2)
To merge this branch: bzr merge lp:~vanvugt/unity/fix-1036514
Reviewer Review Type Date Requested Status
Sam Spilsbury (community) Approve
Review via email: mp+119475@code.launchpad.net

Commit message

Fix uninitialized variable warnings, causing build failure (LP: #1036514)

You'd only see these errors if you build lp:unity with:
  -DUSE_MODERN_COMPIZ_GL=ON

Description of the change

Fix uninitialized variable warnings, causing build failure (LP: #1036514)

You'd only see these errors if you build lp:unity with:
  -DUSE_MODERN_COMPIZ_GL=ON

To post a comment you must log in.
Revision history for this message
Sam Spilsbury (smspillaz) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'unity-shared/IconRenderer.cpp'
--- unity-shared/IconRenderer.cpp 2012-07-30 17:29:12 +0000
+++ unity-shared/IconRenderer.cpp 2012-08-14 06:58:32 +0000
@@ -757,8 +757,8 @@
757 CHECKGL(glBindBufferARB(GL_ARRAY_BUFFER_ARB, 0));757 CHECKGL(glBindBufferARB(GL_ARRAY_BUFFER_ARB, 0));
758 CHECKGL(glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, 0));758 CHECKGL(glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, 0));
759759
760 int VertexLocation;760 int VertexLocation = -1;
761 int TextureCoord0Location;761 int TextureCoord0Location = -1;
762 int FragmentColor = 0;762 int FragmentColor = 0;
763 int ColorifyColor = 0;763 int ColorifyColor = 0;
764 int DesatFactor = 0;764 int DesatFactor = 0;