[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [10932] branches/2-44-stable/blender: branches/2-44-stable

[Diego Borghetti (Plumiferos)]

Revision: 10932
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10932
Author:   bdiego
Date:     2007-06-14 21:29:39 +0200 (Thu, 14 Jun 2007)

Log Message:
-----------
branches/2-44-stable

Merge from trunk:

revision 10723:10724  
    'Copy Images' option for the .obj exporter would fail.
    Link: http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10724

revision 10741:10742
    Link: http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10742

revision 10743:10744
    Bugfix: SSS did not work with panorama render
    Link: http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10744

revision 10744:10745 (Bugfix: #6680)
    This feature didnt work as advertised.
    Link: http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10745

Revision Links:
--------------
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10723
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10741
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10743
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10744

Modified Paths:
--------------
    branches/2-44-stable/blender/release/scripts/export_obj.py
    branches/2-44-stable/blender/source/blender/render/intern/source/pipeline.c
    branches/2-44-stable/blender/source/blender/src/drawmesh.c
    branches/2-44-stable/blender/source/creator/creator.c
    branches/2-44-stable/blender/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp

Modified: branches/2-44-stable/blender/release/scripts/export_obj.py
===================================================================
--- branches/2-44-stable/blender/release/scripts/export_obj.py	2007-06-14 18:42:04 UTC (rev 10931)
+++ branches/2-44-stable/blender/release/scripts/export_obj.py	2007-06-14 19:29:39 UTC (rev 10932)
@@ -164,7 +164,7 @@
 		
 		# Get MTex images
 		if matname != None:
-			mat= Material.Get(matname)
+			mat= Blender.Material.Get(matname)
 			for mtex in mat.getTextures():
 				if mtex and mtex.tex.type == Blender.Texture.Types.IMAGE:
 					try:

Modified: branches/2-44-stable/blender/source/blender/render/intern/source/pipeline.c
===================================================================
--- branches/2-44-stable/blender/source/blender/render/intern/source/pipeline.c	2007-06-14 18:42:04 UTC (rev 10931)
+++ branches/2-44-stable/blender/source/blender/render/intern/source/pipeline.c	2007-06-14 19:29:39 UTC (rev 10932)
@@ -1482,6 +1482,8 @@
 	
 	BLI_end_threads(&threads);
 	freeparts(re);
+	re->viewplane= viewplane; /* restore viewplane, modified by pano render */
+
 }
 
 /* currently only called by preview renders and envmap */

Modified: branches/2-44-stable/blender/source/blender/src/drawmesh.c
===================================================================
--- branches/2-44-stable/blender/source/blender/src/drawmesh.c	2007-06-14 18:42:04 UTC (rev 10931)
+++ branches/2-44-stable/blender/source/blender/src/drawmesh.c	2007-06-14 19:29:39 UTC (rev 10932)
@@ -1021,7 +1021,7 @@
 	g_draw_tface_mesh_ob = ob;
 	g_draw_tface_mesh_istex = istex;
 	memcpy(g_draw_tface_mesh_obcol, obcol, sizeof(obcol));
-	set_draw_settings_cached(1, 0, 0, 0, 0, 0, 0);
+	set_draw_settings_cached(1, 0, 0, 1, 0, 0, 0);
 
 	if(dt > OB_SOLID || g_draw_tface_mesh_islight==-1) {
 		bProperty *prop = get_property(ob, "Text");

Modified: branches/2-44-stable/blender/source/creator/creator.c
===================================================================
--- branches/2-44-stable/blender/source/creator/creator.c	2007-06-14 18:42:04 UTC (rev 10931)
+++ branches/2-44-stable/blender/source/creator/creator.c	2007-06-14 19:29:39 UTC (rev 10932)
@@ -180,8 +180,8 @@
 	printf ("    -o <path>\tSet the render path and file name.\n");
 	printf ("      Use // at the start of the path to\n");
 	printf ("        render relative to the blend file.\n");
-	printf ("      Use # in the filename to be replaced with the frame number\n");
-	printf ("      eg: blender -b foobar.blend -o //render_# -F PNG -x 1\n");
+	printf ("      The frame number will be added at the end of the filename.\n");
+	printf ("      eg: blender -b foobar.blend -o //render_ -F PNG -x 1\n");
 	printf ("    -F <format>\tSet the render format, Valid options are..\n");
 	printf ("    \tTGA IRIS HAMX FTYPE JPEG MOVIE IRIZ RAWTGA\n");
 	printf ("    \tAVIRAW AVIJPEG PNG BMP FRAMESERVER\n");

Modified: branches/2-44-stable/blender/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
===================================================================
--- branches/2-44-stable/blender/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp	2007-06-14 18:42:04 UTC (rev 10931)
+++ branches/2-44-stable/blender/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp	2007-06-14 19:29:39 UTC (rev 10932)
@@ -181,7 +181,7 @@
 	else
 		dolights = (m_material->GetDrawingMode()&16)!=0;
 
-	if ((rasty->GetDrawingMode() <= RAS_IRasterizer::KX_SOLID) || !dolights)
+	if ((rasty->GetDrawingMode() < RAS_IRasterizer::KX_SOLID) || !dolights)
 	{
 		rendertools->ProcessLighting(-1);
 	}