diff options
author | Luke Frisken <l.frisken@gmail.com> | 2012-09-17 19:40:17 +0400 |
---|---|---|
committer | Luke Frisken <l.frisken@gmail.com> | 2012-09-17 19:40:17 +0400 |
commit | f540a9e96c84ac1c4cc8660ba965f4a949a33629 (patch) | |
tree | 757dfb262e54d5e2932d9a7d30e7132752142f41 /source/blender/blenkernel | |
parent | 4446ff3cd58a69e84657dda9f423cf3d82614a52 (diff) |
Disable textured planar snap drawing, was causing problems with windows
compilation.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/intern/snap.c | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/source/blender/blenkernel/intern/snap.c b/source/blender/blenkernel/intern/snap.c index 40db62f8478..9c0beed8ac6 100644 --- a/source/blender/blenkernel/intern/snap.c +++ b/source/blender/blenkernel/intern/snap.c @@ -1608,22 +1608,6 @@ void SnapMesh_draw_planar_texture(Snap* sm){ {1.0f, 1.0f}, {0.0f, 1.0f}}; - - for(i=0;i<32;i++){ - for(j=0;j<32;j++){ - GLubyte vcol = 0; - if(i%2){ - vcol = 255; - } - if(j%2){ - vcol = vcol? 0:255; - } - pixels[j][i][0] = vcol; - pixels[j][i][1] = vcol; - pixels[j][i][2] = vcol; - } - } - assert(sm_pick_data->ret_data_type == SNAPMESH_RET_DAT_pface); pf = sm_pick_data->ret_data_pface; assert(pf->nverts >= 3); @@ -1631,7 +1615,9 @@ void SnapMesh_draw_planar_texture(Snap* sm){ tri_to_quat(quat, pf->verts[0].co, pf->verts[1].co, pf->verts[2].co); //produce quaternion from existing face user picked - glPushMatrix(); + //Commented code for future reference and experimentation, if going down the road of textured plane display again. + //will remove if not. + /*glPushMatrix(); glEnable(GL_TEXTURE_2D); glGenTextures(1,&texture); @@ -1672,7 +1658,7 @@ void SnapMesh_draw_planar_texture(Snap* sm){ glDisable(GL_TEXTURE_2D); glDeleteTextures(1, &texture); - glPopMatrix(); + glPopMatrix();*/ } void SnapMesh_snap_vertex(Snap* sm){ |