[Bf-blender-cvs] [f85ef3d4423] master: Cleanup: clang-tidy, unused function

Campbell Barton noreply at git.blender.org
Wed Jul 7 04:37:19 CEST 2021


Commit: f85ef3d4423d77abe84072b781c02dd5a6145109
Author: Campbell Barton
Date:   Wed Jul 7 12:20:00 2021 +1000
Branches: master
https://developer.blender.org/rBf85ef3d4423d77abe84072b781c02dd5a6145109

Cleanup: clang-tidy, unused function

===================================================================

M	source/blender/editors/space_node/node_edit.cc
M	source/blender/makesrna/intern/rna_sequencer.c

===================================================================

diff --git a/source/blender/editors/space_node/node_edit.cc b/source/blender/editors/space_node/node_edit.cc
index e6f23b89a02..5dd935bdd76 100644
--- a/source/blender/editors/space_node/node_edit.cc
+++ b/source/blender/editors/space_node/node_edit.cc
@@ -2428,7 +2428,7 @@ static int ntree_socket_change_type_exec(bContext *C, wmOperator *op)
   Main *main = CTX_data_main(C);
 
   bNodeSocket *iosock = ntree_get_active_interface_socket(sockets);
-  if (iosock == NULL) {
+  if (iosock == nullptr) {
     return OPERATOR_CANCELLED;
   }
 
@@ -2438,7 +2438,7 @@ static int ntree_socket_change_type_exec(bContext *C, wmOperator *op)
   }
 
   /* Don't handle subtypes for now. */
-  nodeModifySocketType(ntree, NULL, iosock, socket_type->idname);
+  nodeModifySocketType(ntree, nullptr, iosock, socket_type->idname);
 
   /* Need the extra update here because the loop above does not check for valid links in the node
    * group we're currently editing. */
@@ -2456,7 +2456,7 @@ static int ntree_socket_change_type_exec(bContext *C, wmOperator *op)
   snode_notify(C, snode);
   snode_dag_update(C, snode);
 
-  WM_event_add_notifier(C, NC_NODE | ND_DISPLAY, NULL);
+  WM_event_add_notifier(C, NC_NODE | ND_DISPLAY, nullptr);
 
   return OPERATOR_FINISHED;
 }
diff --git a/source/blender/makesrna/intern/rna_sequencer.c b/source/blender/makesrna/intern/rna_sequencer.c
index b7b981ecbb0..0c46450759d 100644
--- a/source/blender/makesrna/intern/rna_sequencer.c
+++ b/source/blender/makesrna/intern/rna_sequencer.c
@@ -103,17 +103,6 @@ typedef struct SequenceSearchData {
   SequenceModifierData *smd;
 } SequenceSearchData;
 
-/* build a temp reference to the parent */
-static void meta_tmp_ref(Sequence *seq_par, Sequence *seq)
-{
-  for (; seq; seq = seq->next) {
-    seq->tmp = seq_par;
-    if (seq->type == SEQ_TYPE_META) {
-      meta_tmp_ref(seq, seq->seqbase.first);
-    }
-  }
-}
-
 static void rna_SequenceElement_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
 {
   Scene *scene = (Scene *)ptr->owner_id;



More information about the Bf-blender-cvs mailing list