[Bf-blender-cvs] [ef832a5a426] ui-asset-view-template: Cleanup: clang tidy

Jacques Lucke noreply at git.blender.org
Wed Mar 3 21:45:20 CET 2021


Commit: ef832a5a426c7ab82061991d8441f75ec54c8e7a
Author: Jacques Lucke
Date:   Wed Mar 3 12:23:02 2021 +0100
Branches: ui-asset-view-template
https://developer.blender.org/rBef832a5a426c7ab82061991d8441f75ec54c8e7a

Cleanup: clang tidy

Warnings:
* readability-inconsistent-declaration-parameter-name
* readability-redundant-smartptr-get

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

M	source/blender/blenkernel/intern/cryptomatte.cc
M	source/blender/compositor/nodes/COM_ImageNode.h
M	source/blender/editors/space_sequencer/sequencer_intern.h

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

diff --git a/source/blender/blenkernel/intern/cryptomatte.cc b/source/blender/blenkernel/intern/cryptomatte.cc
index 8a6b89ce19e..9d9cace3a35 100644
--- a/source/blender/blenkernel/intern/cryptomatte.cc
+++ b/source/blender/blenkernel/intern/cryptomatte.cc
@@ -53,7 +53,7 @@ struct CryptomatteSession {
 
   CryptomatteSession();
   CryptomatteSession(const Main *bmain);
-  CryptomatteSession(StampData *metadata);
+  CryptomatteSession(StampData *stamp_data);
 
   blender::bke::cryptomatte::CryptomatteLayer &add_layer(std::string layer_name);
   std::optional<std::string> operator[](float encoded_hash) const;
@@ -500,7 +500,7 @@ std::unique_ptr<CryptomatteLayer> CryptomatteLayer::read_from_manifest(
     blender::StringRefNull manifest)
 {
   std::unique_ptr<CryptomatteLayer> layer = std::make_unique<CryptomatteLayer>();
-  blender::bke::cryptomatte::manifest::from_manifest(*layer.get(), manifest);
+  blender::bke::cryptomatte::manifest::from_manifest(*layer, manifest);
   return layer;
 }
 
diff --git a/source/blender/compositor/nodes/COM_ImageNode.h b/source/blender/compositor/nodes/COM_ImageNode.h
index e2053cfd3b8..b99fc07f105 100644
--- a/source/blender/compositor/nodes/COM_ImageNode.h
+++ b/source/blender/compositor/nodes/COM_ImageNode.h
@@ -33,7 +33,7 @@
 class ImageNode : public Node {
  private:
   NodeOperation *doMultilayerCheck(NodeConverter &converter,
-                                   RenderLayer *rl,
+                                   RenderLayer *render_layer,
                                    RenderPass *render_pass,
                                    Image *image,
                                    ImageUser *user,
diff --git a/source/blender/editors/space_sequencer/sequencer_intern.h b/source/blender/editors/space_sequencer/sequencer_intern.h
index 4c942a83f2b..767ac76efe6 100644
--- a/source/blender/editors/space_sequencer/sequencer_intern.h
+++ b/source/blender/editors/space_sequencer/sequencer_intern.h
@@ -79,7 +79,7 @@ struct Sequence *find_neighboring_sequence(struct Scene *scene,
                                            struct Sequence *test,
                                            int lr,
                                            int sel);
-void recurs_sel_seq(struct Sequence *seqm);
+void recurs_sel_seq(struct Sequence *seq_meta);
 int seq_effect_find_selected(struct Scene *scene,
                              struct Sequence *activeseq,
                              int type,



More information about the Bf-blender-cvs mailing list