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
path: root/source
diff options
context:
space:
mode:
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2014-06-29 16:22:24 +0400
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2014-06-29 17:24:28 +0400
commitccfe845ff4b7415945b65715c6a64ef0cf933c2f (patch)
treebc08f5bac525937d76173473e5dc4259e996b325 /source
parent481e8ab3c97a21748eed2f0a33fde971637790e0 (diff)
Freestyle: Fix for "cast shadows only" materials not handled properly.
Problem report by Light BWK through personal communications, thanks!
Diffstat (limited to 'source')
-rw-r--r--source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
index b504d2c8c40..26a304ccf69 100644
--- a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
+++ b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
@@ -395,6 +395,8 @@ void BlenderFileLoader::insertShapeNode(ObjectInstanceRen *obi, int id)
vlr = obr->vlaknodes[a>>8].vlak;
else
vlr++;
+ if (vlr->mat->mode & MA_ONLYCAST)
+ continue;
if (vlr->mat->material_type == MA_TYPE_WIRE) {
wire_material = 1;
continue;
@@ -492,7 +494,7 @@ void BlenderFileLoader::insertShapeNode(ObjectInstanceRen *obi, int id)
vlr = obr->vlaknodes[p>>8].vlak;
else
vlr++;
- if (vlr->mat->material_type == MA_TYPE_WIRE)
+ if ((vlr->mat->mode & MA_ONLYCAST) || vlr->mat->material_type == MA_TYPE_WIRE)
continue;
copy_v3_v3(v1, vlr->v1->co);
copy_v3_v3(v2, vlr->v2->co);