Revision: 21369
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21369
Author: yukishiro
Date: 2009-07-05 05:56:08 +0200 (Sun, 05 Jul 2009)
Log Message:
-----------
fix preview bug
Modified Paths:
--------------
branches/soc-2009-yukishiro/source/blender/editors/preview/previewrender.c
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_scene_types.h
branches/soc-2009-yukishiro/source/blender/render/intern/source/rendercore.c
Modified:
branches/soc-2009-yukishiro/source/blender/editors/preview/previewrender.c
===================================================================
--- branches/soc-2009-yukishiro/source/blender/editors/preview/previewrender.c
2009-07-05 00:38:53 UTC (rev 21368)
+++ branches/soc-2009-yukishiro/source/blender/editors/preview/previewrender.c
2009-07-05 03:56:08 UTC (rev 21369)
@@ -400,6 +400,7 @@
}
else if(id_type==ID_LE) {
sce->lightenv = (LightEnv *)id;
+ sce->r.scemode |= R_LIGHTENV;
}
return sce;
Modified: branches/soc-2009-yukishiro/source/blender/makesdna/DNA_scene_types.h
===================================================================
--- branches/soc-2009-yukishiro/source/blender/makesdna/DNA_scene_types.h
2009-07-05 00:38:53 UTC (rev 21368)
+++ branches/soc-2009-yukishiro/source/blender/makesdna/DNA_scene_types.h
2009-07-05 03:56:08 UTC (rev 21369)
@@ -700,6 +700,7 @@
#define R_FULL_SAMPLE 0x8000
#define R_COMP_RERENDER 0x10000
#define R_RECURS_PROTECTION 0x20000
+#define R_LIGHTENV 0x40000
/* r->stamp */
#define R_STAMP_TIME 0x0001
Modified:
branches/soc-2009-yukishiro/source/blender/render/intern/source/rendercore.c
===================================================================
---
branches/soc-2009-yukishiro/source/blender/render/intern/source/rendercore.c
2009-07-05 00:38:53 UTC (rev 21368)
+++
branches/soc-2009-yukishiro/source/blender/render/intern/source/rendercore.c
2009-07-05 03:56:08 UTC (rev 21369)
@@ -1162,7 +1162,7 @@
halo_tile(pa, rl);
// XXX: THIS IS TOTALLY A HACK NOW
- if((R.r.scemode & R_PREVIEWBUTS) && (G.f & G_LIGHTPAINT)) {
+ if((R.r.scemode & R_PREVIEWBUTS) && (R.r.scemode & R_LIGHTENV))
{
float *fcol= rl->rectf;
int width = R.disprect.xmax - R.disprect.xmin;
int height = R.disprect.ymax - R.disprect.ymin;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
