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:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2009-05-20 17:34:04 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2009-05-20 17:34:04 +0400
commita47c673b5525fde6484d4392160fbb5101f2c108 (patch)
treecb05981d656de969d91e12d8f74a34bfaf2ed810 /source/blender/editors/preview
parent56b726917d35ac51c86c3fd10580ac740124494d (diff)
2.5 Material:
* Added material "type" property, with Surface/Volume/Halo options, compatible with sim_physics, as requested for material buttons layout. Obviously the Volume setting does nothing currently. * Deprecated MA_HALO flag in favor of this.
Diffstat (limited to 'source/blender/editors/preview')
-rw-r--r--source/blender/editors/preview/previewrender.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/preview/previewrender.c b/source/blender/editors/preview/previewrender.c
index 407674163a6..1d5d809a9ee 100644
--- a/source/blender/editors/preview/previewrender.c
+++ b/source/blender/editors/preview/previewrender.c
@@ -349,7 +349,7 @@ static Scene *preview_prepare_scene(Scene *scene, int id_type, ShaderPreview *sp
if(sp->pr_method==PR_ICON_RENDER) {
- if (mat->mode & MA_HALO) {
+ if (mat->material_type == MA_TYPE_HALO) {
sce->lay= 1<<MA_FLAT;
}
else {