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:
authorDaniel Genrich <daniel.genrich@gmx.net>2009-08-14 01:29:05 +0400
committerDaniel Genrich <daniel.genrich@gmx.net>2009-08-14 01:29:05 +0400
commit4fb59f65651a58129f459e9c084c6ac759382b89 (patch)
tree2429954c53ecfc15781be4d64b5cbd6f47b06d70
parent972224b9e1934002f0c2ace326facd706c1e0b32 (diff)
Smoke: no lamp results in no shading (requested by nudelZ)
-rw-r--r--source/blender/editors/space_view3d/drawobject.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index 05336d29dc3..3641ff435dd 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -5351,6 +5351,7 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
float bigfactor = 1.0;
int big = (smd->domain->flags & MOD_SMOKE_HIGHRES) && (smd->domain->viewsettings & MOD_SMOKE_VIEW_USEBIG);
int new = 0;
+ int have_lamp = 0;
// GUI sent redraw event
if(smd->domain->flags & MOD_SMOKE_VIEW_REDRAWNICE)
@@ -5439,7 +5440,7 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
if(new > 1)
{
- float light[3] = {0.0,0.0,2.0}; // TODO: take real LAMP coordinates - dg
+ float light[3] = {0.0,0.0,0.0}; // TODO: take real LAMP coordinates - dg
Base *base_tmp = NULL;
for(base_tmp = scene->base.first; base_tmp; base_tmp= base_tmp->next)
@@ -5451,6 +5452,7 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
if(la->type == LA_LOCAL)
{
VECCOPY(light, base_tmp->object->obmat[3]);
+ have_lamp = 1;
break;
}
}
@@ -5554,6 +5556,9 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
tvox = smoke_get_bigtvox(smd, index);
tray = smoke_get_bigtray(smd, index);
}
+
+ if(!have_lamp)
+ tvox = 1.0;
// fill buffer with luminance and alpha
// 1 - T_vox