Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorTon Roosendaal <ton@blender.org>2003-10-21 16:23:38 +0400
committerTon Roosendaal <ton@blender.org>2003-10-21 16:23:38 +0400
commit2da9cb5db284e16d95ff7e65dda9174c6b668950 (patch)
tree2dc1647a593a4ad82c2f47d174d222b19b551fbc /source
parent0d1f7f1c7223ef6a939876dd5642368f6067f9f6 (diff)
fixed bugs:
- faceselect mode works again - selecting vertices for lattices, surfaces and curves works again - in previewrender sometimes a square was drawn, which was texture-crop
Diffstat (limited to 'source')
-rw-r--r--source/blender/src/drawobject.c2
-rw-r--r--source/blender/src/drawview.c3
-rw-r--r--source/blender/src/previewrender.c3
3 files changed, 7 insertions, 1 deletions
diff --git a/source/blender/src/drawobject.c b/source/blender/src/drawobject.c
index 9a6ffd7ca74..7cf51d08acb 100644
--- a/source/blender/src/drawobject.c
+++ b/source/blender/src/drawobject.c
@@ -801,6 +801,7 @@ void calc_lattverts_ext(void)
{
areawinset(curarea->win);
+ persp(PERSP_VIEW);
mymultmatrix(G.obedit->obmat);
calc_lattverts();
myloadmatrix(G.vd->viewmat);
@@ -1025,6 +1026,7 @@ void calc_nurbverts_ext(void)
{
areawinset(curarea->win);
+ persp(PERSP_VIEW);
mymultmatrix(G.obedit->obmat);
calc_Nurbverts(editNurb.first);
myloadmatrix(G.vd->viewmat);
diff --git a/source/blender/src/drawview.c b/source/blender/src/drawview.c
index 07c6050bfb9..5e04dab2691 100644
--- a/source/blender/src/drawview.c
+++ b/source/blender/src/drawview.c
@@ -766,6 +766,9 @@ void backdrawview3d(int test)
return;
}
}
+
+ persp(PERSP_VIEW);
+
#ifdef __APPLE__
glDrawBuffer(GL_AUX0);
#endif
diff --git a/source/blender/src/previewrender.c b/source/blender/src/previewrender.c
index 318b61d0785..7c013c6cd78 100644
--- a/source/blender/src/previewrender.c
+++ b/source/blender/src/previewrender.c
@@ -1094,7 +1094,8 @@ void BIF_previewrender(SpaceButs *sbuts)
}
if(sbuts->cury>=PR_RECTY && tex)
- draw_tex_crop(sbuts->lockpoin);
+ if (sbuts->tab[CONTEXT_SHADING]==TAB_SHADING_TEX)
+ draw_tex_crop(sbuts->lockpoin);
glDrawBuffer(GL_BACK);
/* draw again for clean swapbufers */