bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Fix #23540: smoke preview shading only used point lamps, now it uses other

Browse Source 
lamps to if no point lamp is available.
This commit is contained in:
Brecht Van Lommel 2010-09-30 20:19:54 +00:00
parent 96977c6ffe
commit da4b54cd5d
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
source/blender/blenkernel/intern/smoke.c
View File

@ -800,20 +800,25 @@ static float calc_voxel_transp(float *result, float *input, int res[3], int *pix
static int get_lamp(Scene *scene, float *light)
{
Base *base_tmp = NULL;
for(base_tmp = scene->base.first; base_tmp; base_tmp= base_tmp->next)
{
if(base_tmp->object->type == OB_LAMP)
{
Lamp *la = (Lamp *)base_tmp->object->data;
int found_lamp = 0;
if(la->type == LA_LOCAL)
{
VECCOPY(light, base_tmp->object->obmat[3]);
return 1;
}
}
}
return 0;
// try to find a lamp, preferably local
for(base_tmp = scene->base.first; base_tmp; base_tmp= base_tmp->next) {
if(base_tmp->object->type == OB_LAMP) {
Lamp *la = base_tmp->object->data;
if(la->type == LA_LOCAL) {
copy_v3_v3(light, base_tmp->object->obmat[3]);
return 1;
}
else if(!found_lamp) {
copy_v3_v3(light, base_tmp->object->obmat[3]);
found_lamp = 1;
}
}
}
return found_lamp;
}
static void smoke_calc_domain(Scene *scene, Object *ob, SmokeModifierData *smd)