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
diff options
context:
space:
mode:
authorSebastian Parborg <darkdefende@gmail.com>2020-09-04 21:59:13 +0300
committerSebastian Parborg <darkdefende@gmail.com>2020-09-04 22:04:16 +0300
commit2115232a16d81d28dbdb8042ed8e9316858514c6 (patch)
tree1aeb7354a85b21b43a3ede7bf2980c172d4eec82 /source/blender/nodes/texture/node_texture_tree.c
parente43d482cc93c64d55b1f58178db68551077e6560 (diff)
Cleanup: Clang-Tidy readability-inconsistent-declaration-parameter-name fix
No functional changes
Diffstat (limited to 'source/blender/nodes/texture/node_texture_tree.c')
-rw-r--r--source/blender/nodes/texture/node_texture_tree.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/nodes/texture/node_texture_tree.c b/source/blender/nodes/texture/node_texture_tree.c
index b3d595cc69b..d8818657e1c 100644
--- a/source/blender/nodes/texture/node_texture_tree.c
+++ b/source/blender/nodes/texture/node_texture_tree.c
@@ -275,8 +275,8 @@ void ntreeTexEndExecTree(bNodeTreeExec *exec)
}
}
-int ntreeTexExecTree(bNodeTree *nodes,
- TexResult *texres,
+int ntreeTexExecTree(bNodeTree *ntree,
+ TexResult *target,
float co[3],
float dxt[3],
float dyt[3],
@@ -289,16 +289,16 @@ int ntreeTexExecTree(bNodeTree *nodes,
MTex *mtex)
{
TexCallData data;
- float *nor = texres->nor;
+ float *nor = target->nor;
int retval = TEX_INT;
bNodeThreadStack *nts = NULL;
- bNodeTreeExec *exec = nodes->execdata;
+ bNodeTreeExec *exec = ntree->execdata;
data.co = co;
data.dxt = dxt;
data.dyt = dyt;
data.osatex = osatex;
- data.target = texres;
+ data.target = target;
data.do_preview = preview;
data.do_manage = true;
data.thread = thread;
@@ -309,26 +309,26 @@ int ntreeTexExecTree(bNodeTree *nodes,
/* ensure execdata is only initialized once */
if (!exec) {
BLI_thread_lock(LOCK_NODES);
- if (!nodes->execdata) {
- ntreeTexBeginExecTree(nodes);
+ if (!ntree->execdata) {
+ ntreeTexBeginExecTree(ntree);
}
BLI_thread_unlock(LOCK_NODES);
- exec = nodes->execdata;
+ exec = ntree->execdata;
}
nts = ntreeGetThreadStack(exec, thread);
ntreeExecThreadNodes(exec, nts, &data, thread);
ntreeReleaseThreadStack(nts);
- if (texres->nor) {
+ if (target->nor) {
retval |= TEX_NOR;
}
retval |= TEX_RGB;
/* confusing stuff; the texture output node sets this to NULL to indicate no normal socket was
* set however, the texture code checks this for other reasons
* (namely, a normal is required for material). */
- texres->nor = nor;
+ target->nor = nor;
return retval;
}