Revision: 16263 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16263 Author: blendix Date: 2008-08-26 19:53:04 +0200 (Tue, 26 Aug 2008)
Log Message: ----------- Apricot Branch: apply glsl object color before mist, makes more sense. Modified Paths: -------------- branches/apricot/source/blender/gpu/intern/gpu_material.c Modified: branches/apricot/source/blender/gpu/intern/gpu_material.c =================================================================== --- branches/apricot/source/blender/gpu/intern/gpu_material.c 2008-08-26 17:38:39 UTC (rev 16262) +++ branches/apricot/source/blender/gpu/intern/gpu_material.c 2008-08-26 17:53:04 UTC (rev 16263) @@ -1161,6 +1161,11 @@ GPU_link(mat, "shade_add", shr->combined, shr->spec, &shr->combined); } + if(ma->shade_flag & MA_OBCOLOR) { + mat->obcolalpha = 1; + GPU_link(mat, "shade_obcolor", shr->combined, GPU_builtin(GPU_OBCOLOR), &shr->combined); + } + if(world && (world->mode & WO_MIST) && !(ma->mode & MA_NOMIST)) { misttype = world->mistype; @@ -1181,11 +1186,6 @@ } GPU_link(mat, "mtex_alpha_to_col", shr->combined, shr->alpha, &shr->combined); - - if(ma->shade_flag & MA_OBCOLOR) { - mat->obcolalpha = 1; - GPU_link(mat, "shade_obcolor", shr->combined, GPU_builtin(GPU_OBCOLOR), &shr->combined); - } } GPUNodeLink *GPU_blender_material(GPUMaterial *mat, Material *ma) _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs