[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50697] branches/soc-2012-sushi/source/ blender/blenkernel/intern/snap.c: Disable textured planar snap drawing, was causing problems with windows
luke frisken
l.frisken at gmail.com
Mon Sep 17 17:40:18 CEST 2012
Revision: 50697
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50697
Author: lfrisken
Date: 2012-09-17 15:40:17 +0000 (Mon, 17 Sep 2012)
Log Message:
-----------
Disable textured planar snap drawing, was causing problems with windows
compilation.
Modified Paths:
--------------
branches/soc-2012-sushi/source/blender/blenkernel/intern/snap.c
Modified: branches/soc-2012-sushi/source/blender/blenkernel/intern/snap.c
===================================================================
--- branches/soc-2012-sushi/source/blender/blenkernel/intern/snap.c 2012-09-17 12:07:06 UTC (rev 50696)
+++ branches/soc-2012-sushi/source/blender/blenkernel/intern/snap.c 2012-09-17 15:40:17 UTC (rev 50697)
@@ -1608,22 +1608,6 @@
{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 @@
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 @@
glDisable(GL_TEXTURE_2D);
glDeleteTextures(1, &texture);
- glPopMatrix();
+ glPopMatrix();*/
}
void SnapMesh_snap_vertex(Snap* sm){
More information about the Bf-blender-cvs
mailing list