griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Bugfix, irc reported

Browse Source 
Node shaders, Texture Node, without input connected it did not default to
use "orco" anymore. Was caused by commits that cleaned up render code.
This commit is contained in:
Ton Roosendaal
2007-01-18 20:06:48 +00:00
parent a1cb195343
commit 719964ea8e
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/intern/node_shaders.c
View File

@@ -1154,6 +1154,10 @@ void ntreeShaderGetTexcoMode(bNodeTree *ntree, int r_mode, short *texco, int *mo
if ELEM3(tex->type, TEX_IMAGE, TEX_PLUGIN, TEX_ENVMAP)
*texco |= TEXCO_OSA|NEED_UV;
}
/* usability exception... without input we still give the node orcos */
sock= node->inputs.first;
if(sock==NULL || sock->link==NULL)
*texco |= TEXCO_ORCO|NEED_UV;
}
else if(node->type==SH_NODE_GEOMETRY) {
/* note; sockets always exist for the given type! */

6
source/blender/src/usiblender.c
View File

@@ -529,17 +529,17 @@ static void get_autosave_location(char buf[FILE_MAXDIR+FILE_MAXFILE])
void BIF_read_autosavefile(void)
{
char tstr[FILE_MAXDIR+FILE_MAXFILE], scestr[FILE_MAXDIR];
char tstr[FILE_MAX], scestr[FILE_MAX];
int save_over;
strcpy(scestr, G.sce); /* temporal store */
BLI_strncpy(scestr, G.sce, FILE_MAX); /* temporal store */
get_autosave_location(tstr);
save_over = G.save_over;
BKE_read_file(tstr, NULL);
G.save_over = save_over;
strcpy(G.sce, scestr);
BLI_strncpy(G.sce, scestr, FILE_MAX);
}
/* free strings of open recent files */