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
diff options
context:
space:
mode:
authorTon Roosendaal <ton@blender.org>2005-03-11 21:55:09 +0300
committerTon Roosendaal <ton@blender.org>2005-03-11 21:55:09 +0300
commitc6d51245604b8c1bb329f5362ad528cc6f31c085 (patch)
tree4dfb3c727c79df3960f3c27b403c1438f14f3013
parent8129e5594070eda5866291691fd3a7de34ef0e40 (diff)
Bug fix 2301
Halo render had too narrow clipping for left/right or top/bottom part of image. Was caused by fix for 2.36, incorrect clipping for distance... distance was OK, but the old hack should be still there for X or Y clip!
-rw-r--r--source/blender/render/intern/source/renderHelp.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/source/blender/render/intern/source/renderHelp.c b/source/blender/render/intern/source/renderHelp.c
index 4ab675238f5..db2642f3e7b 100644
--- a/source/blender/render/intern/source/renderHelp.c
+++ b/source/blender/render/intern/source/renderHelp.c
@@ -185,8 +185,10 @@ void setzbufvlaggen( void (*projectfunc)(float *, float *) )
}
projectfunc(vec, hoco);
-
- if(R.r.mode & R_PANORAMA) hoco[3]*= 2.0; /* asking for troubles! */
+
+ /* we clip halos less critical, but not for the Z */
+ hoco[0]*= 0.5;
+ hoco[1]*= 0.5;
if( panotestclip(hoco) ) {
har->miny= har->maxy= -10000; /* that way render clips it */
@@ -196,7 +198,9 @@ void setzbufvlaggen( void (*projectfunc)(float *, float *) )
}
else /* do the projection...*/
{
- if(R.r.mode & R_PANORAMA) hoco[3]*= 0.5; /* asking for troubles! */
+ /* bring back hocos */
+ hoco[0]*= 2.0;
+ hoco[1]*= 2.0;
zn= hoco[3];
har->xs= 0.5*R.rectx*(1.0+hoco[0]/zn); /* the 0.5 negates the previous 2...*/