[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28289] branches/render25/source/blender/ nodes/intern/SHD_nodes/SHD_material.c: Render Branch: Fix SSS scale + node material problem.

[Brecht Van Lommel]

Revision: 28289
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28289
Author:   blendix
Date:     2010-04-19 21:25:40 +0200 (Mon, 19 Apr 2010)

Log Message:
-----------
Render Branch: Fix SSS scale + node material problem.

Modified Paths:
--------------
    branches/render25/source/blender/nodes/intern/SHD_nodes/SHD_material.c

Modified: branches/render25/source/blender/nodes/intern/SHD_nodes/SHD_material.c
===================================================================
--- branches/render25/source/blender/nodes/intern/SHD_nodes/SHD_material.c	2010-04-19 18:11:00 UTC (rev 28288)
+++ branches/render25/source/blender/nodes/intern/SHD_nodes/SHD_material.c	2010-04-19 19:25:40 UTC (rev 28289)
@@ -86,8 +86,9 @@
 		shi->material.mat= (Material *)node->id;
 		
 		/* copy all relevant material vars, note, keep this synced with render_types.h */
-		memcpy(&shi->material.r, &shi->material.mat->r, 23*sizeof(float));
+		memcpy(&shi->material.r, &shi->material.mat->r, 21*sizeof(float));
 		shi->material.har= shi->material.mat->har;
+		shi->material.sss_scale= shi->material.mat->sss_scale;
 		
 		/* write values */
 		if(in[MAT_IN_COLOR]->hasinput)