Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo de Greef <eeshlo@yahoo.com>2006-06-26 06:46:34 +0400
committerAlfredo de Greef <eeshlo@yahoo.com>2006-06-26 06:46:34 +0400
commitcbf7e5cd0f9b810385c4be78daaecac064270a40 (patch)
treef37e60a62924fe11017535fdf7142fa7fbc89698 /source/blender/yafray
parenta6fc975d49fb58d9109b30d779c20ba267f060d6 (diff)
...Forgot to actually draw the image when xml export was used.
Another erroneous assumption based on my Ogl problems...
Diffstat (limited to 'source/blender/yafray')
-rwxr-xr-xsource/blender/yafray/intern/export_File.cpp5
-rw-r--r--source/blender/yafray/intern/export_Plugin.cpp4
-rw-r--r--source/blender/yafray/intern/yafray_Render.h2
3 files changed, 7 insertions, 4 deletions
diff --git a/source/blender/yafray/intern/export_File.cpp b/source/blender/yafray/intern/export_File.cpp
index b7cd4b7bd57..2e1b63b2ecc 100755
--- a/source/blender/yafray/intern/export_File.cpp
+++ b/source/blender/yafray/intern/export_File.cpp
@@ -355,6 +355,11 @@ void yafrayFileRender_t::displayImage()
fclose(fp);
fp = NULL;
+
+ // based on another assumption of ogl errors on my system, forgot to actually draw it...
+ re->result->renlay = render_get_active_layer(re, re->result);
+ re->display_draw(re->result, NULL);
+
}
static string noise2string(short nbtype)
diff --git a/source/blender/yafray/intern/export_Plugin.cpp b/source/blender/yafray/intern/export_Plugin.cpp
index b7f4f776f6e..44567f28cf2 100644
--- a/source/blender/yafray/intern/export_Plugin.cpp
+++ b/source/blender/yafray/intern/export_Plugin.cpp
@@ -1898,10 +1898,6 @@ bool yafrayPluginRender_t::writeWorld()
return true;
}
-// display_draw() needs render layer info
-extern "C" {
-#include "renderpipeline.h"
-}
bool blenderYafrayOutput_t::putPixel(int x, int y, const yafray::color_t &c,
yafray::CFLOAT alpha, yafray::PFLOAT depth)
{
diff --git a/source/blender/yafray/intern/yafray_Render.h b/source/blender/yafray/intern/yafray_Render.h
index 31369ff7475..fa7afdbcbd9 100644
--- a/source/blender/yafray/intern/yafray_Render.h
+++ b/source/blender/yafray/intern/yafray_Render.h
@@ -25,6 +25,8 @@ extern "C" {
#include "BKE_image.h"
#include "render_types.h"
+/* display_draw() needs render layer info */
+#include "renderpipeline.h"
/* useful matrix & vector operations */
#include "MTC_matrixops.h"