diff options
| author | Matt Ebb <matt@mke3.net> | 2009-08-18 02:09:36 +0400 |
|---|---|---|
| committer | Matt Ebb <matt@mke3.net> | 2009-08-18 02:09:36 +0400 |
| commit | 6412fe4b92f136fd7b9bdb7592476df26c8e46ce (patch) | |
| tree | 9f7d0e3afdd19bef37a5c431e02b9c6c89d3c160 /source/blender/render | |
| parent | fe984a6e6ca9de9cb358fea0f4f3cf42742a1667 (diff) | |
* Point density texture works again
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/pointdensity.c | 10 | ||||
| -rw-r--r-- | source/blender/render/intern/source/volumetric.c | 5 |
2 files changed, 3 insertions, 12 deletions
diff --git a/source/blender/render/intern/source/pointdensity.c b/source/blender/render/intern/source/pointdensity.c index fb7ec4dadc2..9a9e3de7247 100644 --- a/source/blender/render/intern/source/pointdensity.c +++ b/source/blender/render/intern/source/pointdensity.c @@ -232,15 +232,9 @@ static void cache_pointdensity(Render *re, Tex *tex) int i; if (!ob) return; - if (BLI_countlist(&ob->particlesystem) == 0) return; + if (!pd->psys) return; - - for(psys=ob->particlesystem.first, i=0; i< pd->psysindex-1; i++) - psys= psys->next; - - if (!psys) return; - - pointdensity_cache_psys(re, pd, ob, psys); + pointdensity_cache_psys(re, pd, ob, pd->psys); } else if (pd->source == TEX_PD_OBJECT) { Object *ob = pd->object; diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c index 63c4e97f86e..f112c237319 100644 --- a/source/blender/render/intern/source/volumetric.c +++ b/source/blender/render/intern/source/volumetric.c @@ -93,10 +93,7 @@ static int vol_get_bounds(ShadeInput *shi, float *co, float *vec, float *hitco, if (intersect_type == VOL_BOUNDS_DEPTH) isect->faceorig= (RayFace*)shi->vlr; else if (intersect_type == VOL_BOUNDS_SS) isect->faceorig= NULL; - if (checkfunc==VOL_IS_BACKFACE) - intersected = RE_ray_tree_intersect_check(R.raytree, isect, vol_backface_intersect_check); - else - intersected = RE_ray_tree_intersect(R.raytree, isect); + intersected = RE_ray_tree_intersect(R.raytree, isect); if(intersected) { |