blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 752 Projects 19 Wiki Activity

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
This commit is contained in:
Diego Borghetti 2007-06-14 19:29:39 +00:00
parent 0f22a36224
commit f536d83eb1
5 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/export_obj.py
View File

@ -164,7 +164,7 @@ def copy_images(dest_dir):
# 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:

2
source/blender/render/intern/source/pipeline.c
View File

@ -1482,6 +1482,8 @@ static void threaded_tile_processor(Render *re)
BLI_end_threads(&threads);
freeparts(re);
re->viewplane= viewplane; /* restore viewplane, modified by pano render */
}
/* currently only called by preview renders and envmap */

2
source/blender/src/drawmesh.c
View File

@ -1021,7 +1021,7 @@ void draw_tface_mesh(Object *ob, Mesh *me, int dt)
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");

4
source/creator/creator.c
View File

@ -180,8 +180,8 @@ static void print_help(void)
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");

2
source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
View File

@ -181,7 +181,7 @@ bool RAS_MaterialBucket::ActivateMaterial(const MT_Transform& cameratrans, RAS_I
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);
}