[Bf-blender-cvs] [ccfe845] master: Freestyle: Fix for "cast shadows only" materials not handled properly.

Tamito Kajiyama noreply at git.blender.org
Sun Jun 29 15:24:39 CEST 2014


Commit: ccfe845ff4b7415945b65715c6a64ef0cf933c2f
Author: Tamito Kajiyama
Date:   Sun Jun 29 21:22:24 2014 +0900
https://developer.blender.org/rBccfe845ff4b7415945b65715c6a64ef0cf933c2f

Freestyle: Fix for "cast shadows only" materials not handled properly.

Problem report by Light BWK through personal communications, thanks!

===================================================================

M	source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp

===================================================================

diff --git a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
index b504d2c..26a304c 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);




More information about the Bf-blender-cvs mailing list