[Bf-blender-cvs] [af0a042da72] blender-v2.83-release: Cleanup: remove unused arg, clang-format

Campbell Barton noreply at git.blender.org
Fri Apr 24 04:21:34 CEST 2020


Commit: af0a042da72cd7466a6c27714f8b72671fa4a1c7
Author: Campbell Barton
Date:   Fri Apr 24 11:43:30 2020 +1000
Branches: blender-v2.83-release
https://developer.blender.org/rBaf0a042da72cd7466a6c27714f8b72671fa4a1c7

Cleanup: remove unused arg, clang-format

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

M	intern/cycles/util/util_sseb.h
M	source/blender/depsgraph/intern/depsgraph_query_foreach.cc

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

diff --git a/intern/cycles/util/util_sseb.h b/intern/cycles/util/util_sseb.h
index 56f8f676ba1..d817e23c47e 100644
--- a/intern/cycles/util/util_sseb.h
+++ b/intern/cycles/util/util_sseb.h
@@ -57,7 +57,7 @@ struct sseb {
   __forceinline sseb(const __m128 input) : m128(input)
   {
   }
-  __forceinline operator const __m128 &(void)const
+  __forceinline operator const __m128 &(void) const
   {
     return m128;
   }
diff --git a/source/blender/depsgraph/intern/depsgraph_query_foreach.cc b/source/blender/depsgraph/intern/depsgraph_query_foreach.cc
index 4882897ad8d..efd7d6e77ef 100644
--- a/source/blender/depsgraph/intern/depsgraph_query_foreach.cc
+++ b/source/blender/depsgraph/intern/depsgraph_query_foreach.cc
@@ -66,12 +66,11 @@ bool deg_foreach_needs_visit(const OperationNode *op_node, const int flags)
   return true;
 }
 
-void deg_foreach_dependent_operation(const Depsgraph *graph,
-                                     const IDNode *target_id_node,
-                                     eDepsObjectComponentType source_component_type,
-                                     int flags,
-                                     DEGForeachOperation callback,
-                                     void *user_data)
+static void deg_foreach_dependent_operation(const IDNode *target_id_node,
+                                            eDepsObjectComponentType source_component_type,
+                                            int flags,
+                                            DEGForeachOperation callback,
+                                            void *user_data)
 {
   if (target_id_node == nullptr) {
     /* TODO(sergey): Shall we inform or assert here about attempt to start
@@ -160,8 +159,7 @@ void deg_foreach_dependent_ID_component(const Depsgraph *graph,
   data.callback = callback;
   data.user_data = user_data;
   data.target_id_node = graph->find_id_node(id);
-  deg_foreach_dependent_operation(graph,
-                                  data.target_id_node,
+  deg_foreach_dependent_operation(data.target_id_node,
                                   source_component_type,
                                   flags,
                                   deg_foreach_dependent_component_callback,
@@ -197,7 +195,7 @@ void deg_foreach_dependent_ID(const Depsgraph *graph,
   data.user_data = user_data;
   data.target_id_node = graph->find_id_node(id);
   deg_foreach_dependent_operation(
-      graph, data.target_id_node, DEG_OB_COMP_ANY, 0, deg_foreach_dependent_ID_callback, &data);
+      data.target_id_node, DEG_OB_COMP_ANY, 0, deg_foreach_dependent_ID_callback, &data);
 }
 
 void deg_foreach_ancestor_ID(const Depsgraph *graph,



More information about the Bf-blender-cvs mailing list