griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

recent smoothview update broke pan in camera view, some vars used in the function needed to be used after, reverting this change.

Browse Source
This commit is contained in:
Campbell Barton
2007-04-19 07:58:42 +00:00
parent f9ff47464d
commit 11c1dbdfbf
1 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
source/blender/src/view.c
View File

@@ -837,8 +837,33 @@ int get_view3d_viewplane(int winxi, int winyi, rctf *viewplane, float *clipsta,
*clipsta= G.vd->near;
*clipend= G.vd->far;
if(G.vd->persp==2)
object_view_settings(G.vd->camera, &lens, clipsta, clipend);
/*
* Cant use this since we need the fac and x1 values set
* if(G.vd->persp==2)
object_view_settings(G.vd->camera, &lens, &(*clipsta), &(*clipend));*/
if(G.vd->persp==2) {
if(G.vd->camera) {
if(G.vd->camera->type==OB_LAMP ) {
Lamp *la;
la= G.vd->camera->data;
fac= cos( M_PI*la->spotsize/360.0);
x1= saacos(fac);
lens= 16.0*fac/sin(x1);
*clipsta= la->clipsta;
*clipend= la->clipend;
}
else if(G.vd->camera->type==OB_CAMERA) {
cam= G.vd->camera->data;
lens= cam->lens;
*clipsta= cam->clipsta;
*clipend= cam->clipend;
}
}
}
if(G.vd->persp==0) {
if(winx>winy) x1= -G.vd->dist;