Revision: 28211
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28211
Author: blendix
Date: 2010-04-15 18:59:23 +0200 (Thu, 15 Apr 2010)
Log Message:
-----------
Render Branch:
* Forgot to mention this in last commit. Currently image loading will look
for an .tx file next to the specified image file, and if it exists, use
that instead automatically. It compares the dates and always used the newest
of the two.
* Fix uv y derivative being scaled wrong.
* Fix for possible use of invalid mipmap level -1.
Modified Paths:
--------------
branches/render25/source/blender/imbuf/intern/filter.c
branches/render25/source/blender/render/intern/source/shadeinput.c
Modified: branches/render25/source/blender/imbuf/intern/filter.c
===================================================================
--- branches/render25/source/blender/imbuf/intern/filter.c 2010-04-15
16:44:38 UTC (rev 28210)
+++ branches/render25/source/blender/imbuf/intern/filter.c 2010-04-15
16:59:23 UTC (rev 28211)
@@ -375,6 +375,9 @@
{
ImBuf *hbuf = ibuf;
int curmap = 0;
+
+ ibuf->miplevels= 1;
+
while (curmap < IB_MIPMAP_LEVELS) {
if (use_filter) {
ImBuf *nbuf= IMB_allocImBuf(hbuf->x, hbuf->y, 32,
IB_rect, 0);
@@ -393,7 +396,9 @@
ImBuf *IMB_getmipmaplevel(ImBuf *ibuf, int level)
{
if(level >= ibuf->miplevels)
- level= ibuf->miplevels-1;
+ level= (ibuf->miplevels)? ibuf->miplevels-1: 0;
+ else if(level < 0)
+ level= 0;
if(level == 0) {
if(!ibuf->rect && (ibuf->flags & IB_usecache)) {
Modified: branches/render25/source/blender/render/intern/source/shadeinput.c
===================================================================
--- branches/render25/source/blender/render/intern/source/shadeinput.c
2010-04-15 16:44:38 UTC (rev 28210)
+++ branches/render25/source/blender/render/intern/source/shadeinput.c
2010-04-15 16:59:23 UTC (rev 28211)
@@ -988,6 +988,7 @@
interp_v2_v2v2v2(suv->dyuv, uv1, uv2, uv3, duvw_dy);
mul_v2_fl(suv->dxuv, 2.0f);
+ mul_v2_fl(suv->dyuv, 2.0f);
}
if((mode & MA_FACETEXTURE) && i==obr->actmtface) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
