[Bf-blender-cvs] [9e1e9516a08] master: Cleanup: warnings

[Campbell Barton]

Commit: 9e1e9516a08d94059b113fb3ac0d37b5ec3eaca0
Author: Campbell Barton
Date:   Thu Nov 12 11:23:21 2020 +1100
Branches: master
https://developer.blender.org/rB9e1e9516a08d94059b113fb3ac0d37b5ec3eaca0

Cleanup: warnings

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

M	source/blender/draw/engines/gpencil/gpencil_cache_utils.c
M	source/blender/editors/space_outliner/tree/tree_display_view_layer.cc

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

diff --git a/source/blender/draw/engines/gpencil/gpencil_cache_utils.c b/source/blender/draw/engines/gpencil/gpencil_cache_utils.c
index cdcfd569fff..f2472699300 100644
--- a/source/blender/draw/engines/gpencil/gpencil_cache_utils.c
+++ b/source/blender/draw/engines/gpencil/gpencil_cache_utils.c
@@ -62,7 +62,7 @@ GPENCIL_tObject *gpencil_object_cache_add(GPENCIL_PrivateData *pd, Object *ob)
   tgp_ob->do_mat_holdout = false;
   for (int i = 0; i < ob->totcol; i++) {
     MaterialGPencilStyle *gp_style = BKE_gpencil_material_settings(ob, i + 1);
-    if ((gp_style != NULL) && (gp_style->flag & GP_MATERIAL_IS_STROKE_HOLDOUT) ||
+    if (((gp_style != NULL) && (gp_style->flag & GP_MATERIAL_IS_STROKE_HOLDOUT)) ||
         ((gp_style->flag & GP_MATERIAL_IS_FILL_HOLDOUT))) {
       tgp_ob->do_mat_holdout = true;
       break;
diff --git a/source/blender/editors/space_outliner/tree/tree_display_view_layer.cc b/source/blender/editors/space_outliner/tree/tree_display_view_layer.cc
index 123c47b8556..c88eb957dd1 100644
--- a/source/blender/editors/space_outliner/tree/tree_display_view_layer.cc
+++ b/source/blender/editors/space_outliner/tree/tree_display_view_layer.cc
@@ -47,13 +47,13 @@ class ObjectsChildrenBuilder {
   ObjectTreeElementsMap object_tree_elements_map_;
 
  public:
-  ObjectsChildrenBuilder(SpaceOutliner &);
+  ObjectsChildrenBuilder(SpaceOutliner &soutliner);
   ~ObjectsChildrenBuilder() = default;
 
   void operator()(TreeElement &collection_tree_elem);
 
  private:
-  void object_tree_elements_lookup_create_recursive(TreeElement *);
+  void object_tree_elements_lookup_create_recursive(TreeElement *te_parent);
   void make_object_parent_hierarchy_collections();
 };