Revision: 21837
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21837
Author: yukishiro
Date: 2009-07-24 05:28:50 +0200 (Fri, 24 Jul 2009)
Log Message:
-----------
add lightenv preview back
Modified Paths:
--------------
branches/soc-2009-yukishiro/source/blender/editors/preview/previewrender.c
Modified:
branches/soc-2009-yukishiro/source/blender/editors/preview/previewrender.c
===================================================================
--- branches/soc-2009-yukishiro/source/blender/editors/preview/previewrender.c
2009-07-24 03:08:09 UTC (rev 21836)
+++ branches/soc-2009-yukishiro/source/blender/editors/preview/previewrender.c
2009-07-24 03:28:50 UTC (rev 21837)
@@ -479,85 +479,33 @@
newrect.ymin= rect->ymin;
newrect.ymax= rect->ymin;
- if(parent) {
- ok = ed_preview_draw_rect(sa, sce, parent, 1, 1, rect,
&newrect);
- ok &= ed_preview_draw_rect(sa, sce, id, 1, 0, rect,
&newrect);
- }
- else
- ok = ed_preview_draw_rect(sa, sce, id, 0, 0, rect,
&newrect);
+ if (GS(id->name) == ID_LE) {
+ PreviewImage * preview = BKE_previewimg_get(id);
- if(ok)
- *rect= newrect;
+ ED_preview_lightenv_job(C, sa, idp, newx, newy);
+ glaDrawPixelsSafe_to32(rect->xmin, rect->ymin, newx,
newy, newx, preview->rectf, 0);
+ }
+ else {
+ if(parent) {
+ ok = ed_preview_draw_rect(sa, sce, parent, 1,
1, rect, &newrect);
+ ok &= ed_preview_draw_rect(sa, sce, id, 1, 0,
rect, &newrect);
+ }
+ else
+ ok = ed_preview_draw_rect(sa, sce, id, 0, 0,
rect, &newrect);
- /* check for spacetype... */
- if(sbuts->spacetype==SPACE_BUTS && sbuts->preview) {
- sbuts->preview= 0;
- ok= 0;
- }
-
- if(ok==0) {
- ED_preview_shader_job(C, sa, id, parent, newx, newy);
- }
+ if(ok)
+ *rect= newrect;
-//<<<<<<< .working
-// if (GS(id->name) == ID_LE) {
-// PreviewImage * preview = BKE_previewimg_get(id);
-//
-// ED_preview_lightenv_job(C, sa, idp, newx, newy);
-// glaDrawPixelsSafe(rect->xmin, rect->ymin, newx, newy,
newx, GL_RGBA, GL_FLOAT, preview->rectf);
-//=======
-//
-// if(parent) {
-// ok = ed_preview_draw_rect(sa, sce, parent, 1, 1, rect,
&newrect);
-// ok &= ed_preview_draw_rect(sa, sce, id, 1, 0, rect,
&newrect);
-//>>>>>>> .merge-right.r21835
-// }
-//<<<<<<< .working
-// else {
-//=======
-// else
-// ok = ed_preview_draw_rect(sa, sce, id, 0, 0, rect,
&newrect);
-//>>>>>>> .merge-right.r21835
-//
-//<<<<<<< .working
-// RE_GetResultImage(RE_GetRender(name), &rres);
-// if(rres.rectf) {
-//
-// if( ABS(rres.rectx-newx)<2 &&
ABS(rres.recty-newy)<2 ) {
-// /* correct size, then black outline
matches */
-// rect->xmax= rect->xmin + rres.rectx;
-// rect->ymax= rect->ymin + rres.recty;
-//
-// glaDrawPixelsSafe_to32(rect->xmin,
rect->ymin, rres.rectx, rres.recty, rres.rectx, rres.rectf, gamma_correct);
-// ok= 1;
-// }
-// }
-//
-// /* check for spacetype... */
-// if(sbuts->spacetype==SPACE_BUTS && sbuts->preview) {
-// sbuts->preview= 0;
-// ok= 0;
-// }
-//=======
-// if(ok)
-// *rect= newrect;
-//
-// /* check for spacetype... */
-// if(sbuts->spacetype==SPACE_BUTS && sbuts->preview) {
-// sbuts->preview= 0;
-// ok= 0;
-// }
-//>>>>>>> .merge-right.r21835
-//
-//<<<<<<< .working
-// if(ok==0) {
-// ED_preview_shader_job(C, sa, idp, newx, newy);
-// }
-//=======
-// if(ok==0) {
-// ED_preview_shader_job(C, sa, id, parent, newx, newy);
-//>>>>>>> .merge-right.r21835
-// }
+ /* check for spacetype... */
+ if(sbuts->spacetype==SPACE_BUTS && sbuts->preview) {
+ sbuts->preview= 0;
+ ok= 0;
+ }
+
+ if(ok==0) {
+ ED_preview_shader_job(C, sa, id, parent, newx,
newy);
+ }
+ }
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
