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
path: root/source
diff options
context:
space:
mode:
authorAlexander Romanov <a.romanov@blend4web.com>2016-01-13 11:38:48 +0300
committerAlexander Romanov <a.romanov@blend4web.com>2016-01-13 11:38:48 +0300
commit53711020396a706418ebf3f24065b9c26eae5b06 (patch)
treeb43aa4d63d9794f16a11ff3769009da2c7ef8d7e /source
parent7f2b8e78b62968f2aafc3285e0f0e3f199376701 (diff)
BI "Real Sky" option works incorrectly for environment texture.
How to check? 1) Set Rendered mode for 3d View 2) Set "Blend Sky" and "Real Sky" flags for world. Rotate view you will see right color blending from Horizon to Zenith color. 3) Add environment texture Rotate view and you will see incorrect texture mapping that is not correspond to color blending that was observed in previous step. So I conclude that this is a bug. This issue must be solved before the patch D1414 because BI behavior is the viewport target. Example: {F273051} Alexander (Blend4Web Team) Reviewers: sergey Reviewed By: sergey Subscribers: Evgeny_Rodygin, AlexKowel, yurikovelenov Differential Revision: https://developer.blender.org/D1729
Diffstat (limited to 'source')
-rw-r--r--source/blender/render/intern/source/pixelshading.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/source/blender/render/intern/source/pixelshading.c b/source/blender/render/intern/source/pixelshading.c
index 104cde0a0b5..f577333fcd7 100644
--- a/source/blender/render/intern/source/pixelshading.c
+++ b/source/blender/render/intern/source/pixelshading.c
@@ -492,7 +492,7 @@ int shadeHaloFloat(HaloRen *har, float col[4], int zz,
/* Only view vector is important here. Result goes to col_r[3] */
void shadeSkyView(float col_r[3], const float rco[3], const float view[3], const float dxyview[2], short thread)
{
- float lo[3], zen[3], hor[3], blend, blendm;
+ float zen[3], hor[3], blend, blendm;
int skyflag;
/* flag indicating if we render the top hemisphere */
@@ -521,15 +521,7 @@ void shadeSkyView(float col_r[3], const float rco[3], const float view[3], const
/* Careful: SKYTEX and SKYBLEND are NOT mutually exclusive! If */
/* SKYBLEND is active, the texture and color blend are added. */
if (R.wrld.skytype & WO_SKYTEX) {
- copy_v3_v3(lo, view);
- if (R.wrld.skytype & WO_SKYREAL) {
-
- mul_m3_v3(R.imat, lo);
-
- SWAP(float, lo[1], lo[2]);
-
- }
- do_sky_tex(rco, lo, dxyview, hor, zen, &blend, skyflag, thread);
+ do_sky_tex(rco, view, dxyview, hor, zen, &blend, skyflag, thread);
}
if (blend>1.0f) blend= 1.0f;