Commit: 7151c2dc3e1bf91b5cc2c9931cff510a73be1542
Author: Hans Goudey
Date: Wed Nov 30 15:34:08 2022 -0600
Branches: master
https://developer.blender.org/rB7151c2dc3e1bf91b5cc2c9931cff510a73be1542
Cleanup: Unused variable, RNA description warning
===================================================================
M source/blender/makesrna/intern/rna_asset.c
M source/blender/nodes/composite/node_composite_tree.cc
===================================================================
diff --git a/source/blender/makesrna/intern/rna_asset.c
b/source/blender/makesrna/intern/rna_asset.c
index e7eb6a022ba..76751f1d9f1 100644
--- a/source/blender/makesrna/intern/rna_asset.c
+++ b/source/blender/makesrna/intern/rna_asset.c
@@ -434,7 +434,7 @@ static void rna_def_asset_handle_api(StructRNA *srna)
"AssetLibraryReference",
"",
"The asset library containing the given asset. Deprecated and optional
argument, will be "
- "ignored. Kept for API compatibility only.");
+ "ignored. Kept for API compatibility only");
parm = RNA_def_string(func, "result", NULL, FILE_MAX_LIBEXTRA, "result", "");
RNA_def_parameter_flags(parm, PROP_THICK_WRAP, 0);
RNA_def_function_output(func, parm);
diff --git a/source/blender/nodes/composite/node_composite_tree.cc
b/source/blender/nodes/composite/node_composite_tree.cc
index a2a3d7d1b64..60557b5d893 100644
--- a/source/blender/nodes/composite/node_composite_tree.cc
+++ b/source/blender/nodes/composite/node_composite_tree.cc
@@ -95,13 +95,10 @@ static void localize(bNodeTree *localtree, bNodeTree *ntree)
static void local_merge(Main *bmain, bNodeTree *localtree, bNodeTree *ntree)
{
- bNode *lnode;
- bNodeSocket *lsock;
-
/* move over the compbufs and previews */
BKE_node_preview_merge_tree(ntree, localtree, true);
- for (lnode = (bNode *)localtree->nodes.first; lnode; lnode = lnode->next) {
+ for (bNode *lnode = (bNode *)localtree->nodes.first; lnode; lnode =
lnode->next) {
if (bNode *orig_node = nodeFindNodebyName(ntree, lnode->name)) {
if (ELEM(lnode->type, CMP_NODE_VIEWER, CMP_NODE_SPLITVIEWER)) {
if (lnode->id && (lnode->flag & NODE_DO_OUTPUT)) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
