archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

code cleanup

Browse Source
This commit is contained in:
Campbell Barton
2013-03-18 18:25:05 +00:00
parent 57f69f2f18
commit 01e9dae3dc
202 changed files with 720 additions and 718 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/render/intern/source/convertblender.c
View File

@@ -918,7 +918,7 @@ static void flag_render_node_material(Render *re, bNodeTree *ntree)
{
bNode *node;
for (node=ntree->nodes.first; node; node= node->next) {
for (node = ntree->nodes.first; node; node = node->next) {
if (node->id) {
if (GS(node->id->name)==ID_MA) {
Material *ma= (Material *)node->id;
@@ -5660,7 +5660,7 @@ void RE_Database_FromScene_Vectors(Render *re, Main *bmain, Scene *sce, unsigned
ok= 1;
}
if (ok==0) {
printf("speed table: missing object %s\n", obi->ob->id.name+2);
printf("speed table: missing object %s\n", obi->ob->id.name + 2);
continue;
}
@@ -5676,7 +5676,7 @@ void RE_Database_FromScene_Vectors(Render *re, Main *bmain, Scene *sce, unsigned
if (obi->totvector==oldobi->totvector)
calculate_speedvectors(re, obi, oldobi->vectors, step);
else
printf("Warning: object %s has different amount of vertices or strands on other frame\n", obi->ob->id.name+2);
printf("Warning: object %s has different amount of vertices or strands on other frame\n", obi->ob->id.name + 2);
} /* not fluidsim */
oldobi= oldobi->next;

2
source/blender/render/intern/source/pipeline.c
View File

@@ -1458,7 +1458,7 @@ static bool rlayer_node_uses_alpha(bNodeTree *ntree, bNode *node)
for (sock = node->outputs.first; sock; sock = sock->next) {
/* Weak! but how to make it better? */
if (!strcmp(sock->name, "Alpha") && nodeCountSocketLinks(ntree, sock) > 0)
if (STREQ(sock->name, "Alpha") && nodeCountSocketLinks(ntree, sock) > 0)
return true;
}