[tuhopuu-devel] State of the merge

[Jonathan Merritt]

This is a multi-part message in MIME format.
--------------010707090007060100010607
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

Chris Want wrote:

> This merge went relatively smoothly (the -kk option really helps).
> Each developer should make sure that their work has successfully
> survived this merge ... I apologize if anybody's work got clobbered!
>
> Here are the main issues that might cause problems:
>
> scons users: test!


Compilation with scons under Linux is working for me, except for some 
errors in the game engine code.  After turning off compilation of the 
game engine, all else was fine.

I believe there is currently a small bug in the Tuhopuu rendering code, 
which is not present in the bf-blender renderer.  It has been driving me 
nuts.  This bug involves the red component of all colours being messed 
up (for want of a better description).  Attached is a patch against the 
post-merge tuhopuu which I think fixes the problem.

I created this patch from within the tuhopuu2 directory using:
    cvs diff -u > patch

Jonathan Merritt.

--------------010707090007060100010607
Content-Type: text/plain;
 name="patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="patch"

? blender
? config.opts
? patch
Index: source/blender/render/intern/source/rendercore.c
===================================================================
RCS file: /cvsroot/tuhopuu/tuhopuu2/source/blender/render/intern/source/rendercore.c,v
retrieving revision 1.9
diff -u -r1.9 rendercore.c
--- source/blender/render/intern/source/rendercore.c	5 Jun 2004 22:09:11 -0000	1.9
+++ source/blender/render/intern/source/rendercore.c	6 Jun 2004 02:05:13 -0000
@@ -2060,9 +2060,6 @@
            shi->rad[2]*= shi->tex_for_radio[2];
         }
 
-	if(shr->diff[0]<0.0) shr->diff[0]= 0.0; else shr->diff[0]*= ma->r;
-	shr->diff[0]+= ma->ambr +ma->amb*shi->rad[0];
-	
 	shr->diff[0]+= ma->amb*shi->rad[0];
 	shr->diff[0]*= ma->r;
 	shr->diff[0]+= ma->ambr;

--------------010707090007060100010607--