Revision: 28388
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28388
Author: blendix
Date: 2010-04-23 20:02:50 +0200 (Fri, 23 Apr 2010)
Log Message:
-----------
Some fixes from the render branch:
* Take border render into account when drawing grid before for render
result becomes visible.
* Use antialiasing for rendering icon previews.
* Fix Full Sample not drawing render result while rendering.
* Mesh Deform Modifier: also forgot to commit this file.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/image.c
trunk/blender/source/blender/blenloader/intern/writefile.c
trunk/blender/source/blender/editors/render/render_preview.c
trunk/blender/source/blender/editors/space_image/space_image.c
trunk/blender/source/blender/render/intern/source/pipeline.c
Modified: trunk/blender/source/blender/blenkernel/intern/image.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/image.c 2010-04-23
17:42:33 UTC (rev 28387)
+++ trunk/blender/source/blender/blenkernel/intern/image.c 2010-04-23
18:02:50 UTC (rev 28388)
@@ -1928,9 +1928,6 @@
}
}
- if(!(rectf || rect))
- return NULL;
-
ibuf= image_get_ibuf(ima, IMA_NO_INDEX, 0);
/* make ibuf if needed, and initialize it */
@@ -1948,11 +1945,17 @@
if(rect)
ibuf->rect= rect;
- ibuf->rect_float= rectf;
- ibuf->flags |= IB_rectfloat;
- ibuf->channels= channels;
- ibuf->zbuf_float= rectz;
- ibuf->flags |= IB_zbuffloat;
+ if(rectf) {
+ ibuf->rect_float= rectf;
+ ibuf->flags |= IB_rectfloat;
+ ibuf->channels= channels;
+ }
+
+ if(rectz) {
+ ibuf->zbuf_float= rectz;
+ ibuf->flags |= IB_zbuffloat;
+ }
+
ibuf->dither= dither;
ima->ok= IMA_OK_LOADED;
Modified: trunk/blender/source/blender/blenloader/intern/writefile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/writefile.c 2010-04-23
17:42:33 UTC (rev 28387)
+++ trunk/blender/source/blender/blenloader/intern/writefile.c 2010-04-23
18:02:50 UTC (rev 28388)
@@ -1234,7 +1234,7 @@
writedata(wd, DATA,
sizeof(float)*mmd->totvert*mmd->totcagevert,
mmd->bindweights);
writedata(wd, DATA, sizeof(float)*3*mmd->totcagevert,
- mmd->bindcos);
+ mmd->bindcagecos);
writestruct(wd, DATA, "MDefCell", size*size*size,
mmd->dyngrid);
writestruct(wd, DATA, "MDefInfluence",
mmd->totinfluence, mmd->dyninfluences);
writedata(wd, DATA, sizeof(int)*mmd->totvert,
mmd->dynverts);
Modified: trunk/blender/source/blender/editors/render/render_preview.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_preview.c
2010-04-23 17:42:33 UTC (rev 28387)
+++ trunk/blender/source/blender/editors/render/render_preview.c
2010-04-23 18:02:50 UTC (rev 28388)
@@ -898,6 +898,7 @@
if(sp->pr_method==PR_ICON_RENDER) {
sce->r.scemode |= R_NO_IMAGE_LOAD;
+ sce->r.mode |= R_OSA;
}
else if(sp->pr_method==PR_NODE_RENDER) {
if(idtype == ID_MA) sce->r.scemode |= R_MATNODE_PREVIEW;
Modified: trunk/blender/source/blender/editors/space_image/space_image.c
===================================================================
--- trunk/blender/source/blender/editors/space_image/space_image.c
2010-04-23 17:42:33 UTC (rev 28387)
+++ trunk/blender/source/blender/editors/space_image/space_image.c
2010-04-23 18:02:50 UTC (rev 28388)
@@ -178,6 +178,12 @@
/* not very important, just nice */
*width= (scene->r.xsch*scene->r.size)/100;
*height= (scene->r.ysch*scene->r.size)/100;
+
+ if((scene->r.mode & R_BORDER) && (scene->r.mode & R_CROP)) {
+ *width *= (scene->r.border.xmax - scene->r.border.xmin);
+ *height *= (scene->r.border.ymax -
scene->r.border.ymin);
+ }
+
}
/* I know a bit weak... but preview uses not actual image size */
// XXX else if(image_preview_active(sima, width, height));
Modified: trunk/blender/source/blender/render/intern/source/pipeline.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/pipeline.c
2010-04-23 17:42:33 UTC (rev 28387)
+++ trunk/blender/source/blender/render/intern/source/pipeline.c
2010-04-23 18:02:50 UTC (rev 28388)
@@ -1061,7 +1061,6 @@
rr->rectf= re->result->rectf;
rr->rectz= re->result->rectz;
rr->rect32= re->result->rect32;
- rr->compo_seq= (rr->rectf != NULL);
/* active layer */
rl= render_get_active_layer(re, re->result);
@@ -1073,6 +1072,7 @@
rr->rectz= RE_RenderLayerGetPass(rl,
SCE_PASS_Z);
}
+ rr->compo_seq= (rr->rectf != NULL);
rr->layers= re->result->layers;
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
