[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41916] trunk/blender/source/blender/nodes /shader/nodes/node_shader_texture.c: Fix #29160: material node "Texture" didn't use default texture coordinates
Brecht Van Lommel
brechtvanlommel at pandora.be
Wed Nov 16 15:13:44 CET 2011
Revision: 41916
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41916
Author: blendix
Date: 2011-11-16 14:13:43 +0000 (Wed, 16 Nov 2011)
Log Message:
-----------
Fix #29160: material node "Texture" didn't use default texture coordinates
anymore when nothing was connected to the socket.
Modified Paths:
--------------
trunk/blender/source/blender/nodes/shader/nodes/node_shader_texture.c
Modified: trunk/blender/source/blender/nodes/shader/nodes/node_shader_texture.c
===================================================================
--- trunk/blender/source/blender/nodes/shader/nodes/node_shader_texture.c 2011-11-16 13:49:51 UTC (rev 41915)
+++ trunk/blender/source/blender/nodes/shader/nodes/node_shader_texture.c 2011-11-16 14:13:43 UTC (rev 41916)
@@ -51,6 +51,7 @@
if(data && node->id) {
ShadeInput *shi= ((ShaderCallData *)data)->shi;
TexResult texres;
+ bNodeSocket *sock_vector= node->inputs.first;
float vec[3], nor[3]={0.0f, 0.0f, 0.0f};
int retval;
short which_output = node->custom1;
@@ -63,7 +64,8 @@
texres.nor= nor;
texres.tr= texres.tg= texres.tb= 0.0f;
- if(in[0]->hasinput) {
+ /* don't use in[0]->hasinput, see material node for explanation */
+ if(sock_vector->link) {
nodestack_get_vec(vec, SOCK_VECTOR, in[0]);
if(in[0]->datatype==NS_OSA_VECTORS) {
More information about the Bf-blender-cvs
mailing list