[Bf-blender-cvs] [bba757ef81a] master: Cleanup: various minor changes

Campbell Barton noreply at git.blender.org
Sun Apr 24 05:48:22 CEST 2022


Commit: bba757ef81abd93a2ec33dbf6858fa4bf398c7d6
Author: Campbell Barton
Date:   Sun Apr 24 13:33:14 2022 +1000
Branches: master
https://developer.blender.org/rBbba757ef81abd93a2ec33dbf6858fa4bf398c7d6

Cleanup: various minor changes

- Add missing doxy-section for Apply Parent Inverse Operator
- Use identity for None comparison in Python.
- Remove newline from operator doc-strings.
- Use '*' prefix multi-line C comment blocks.
- Separate filenames from doc-strings.
- Remove break after return.

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

M	intern/cycles/kernel/integrator/mnee.h
M	source/blender/blenkernel/BKE_paint.h
M	source/blender/blenkernel/intern/pbvh_intern.h
M	source/blender/blenlib/BLI_color_mix.hh
M	source/blender/editors/object/object_transform.cc
M	source/blender/editors/space_node/node_view.cc
M	source/blender/makesrna/intern/rna_scene.c
M	tests/performance/benchmark

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

diff --git a/intern/cycles/kernel/integrator/mnee.h b/intern/cycles/kernel/integrator/mnee.h
index 6eee597a0a1..c523da8d3be 100644
--- a/intern/cycles/kernel/integrator/mnee.h
+++ b/intern/cycles/kernel/integrator/mnee.h
@@ -1028,8 +1028,8 @@ ccl_device_forceinline bool kernel_path_mnee_sample(KernelGlobals kg,
             bsdf->type == CLOSURE_BSDF_MICROFACET_MULTI_GGX_GLASS_ID ||
             bsdf->type == CLOSURE_BSDF_MICROFACET_MULTI_GGX_GLASS_FRESNEL_ID) {
           /* Note that CLOSURE_BSDF_MICROFACET_MULTI_GGX_GLASS_ID and
-             CLOSURE_BSDF_MICROFACET_MULTI_GGX_GLASS_FRESNEL_ID are treated as
-             CLOSURE_BSDF_MICROFACET_GGX_REFRACTION_ID further below */
+           * CLOSURE_BSDF_MICROFACET_MULTI_GGX_GLASS_FRESNEL_ID are treated as
+           * CLOSURE_BSDF_MICROFACET_GGX_REFRACTION_ID further below. */
 
           found_transimissive_microfacet_bsdf = true;
           ccl_private MicrofacetBsdf *microfacet_bsdf = (ccl_private MicrofacetBsdf *)bsdf;
diff --git a/source/blender/blenkernel/BKE_paint.h b/source/blender/blenkernel/BKE_paint.h
index 10043941948..f0488e84091 100644
--- a/source/blender/blenkernel/BKE_paint.h
+++ b/source/blender/blenkernel/BKE_paint.h
@@ -731,6 +731,7 @@ enum {
 };
 
 /* paint_canvas.cc */
+
 /**
  * Create a key that can be used to compare with previous ones to identify changes.
  * The resulting 'string' is owned by the caller.
diff --git a/source/blender/blenkernel/intern/pbvh_intern.h b/source/blender/blenkernel/intern/pbvh_intern.h
index 77bd00da50a..b7a2b578a1c 100644
--- a/source/blender/blenkernel/intern/pbvh_intern.h
+++ b/source/blender/blenkernel/intern/pbvh_intern.h
@@ -267,6 +267,7 @@ bool pbvh_bmesh_node_nearest_to_ray(PBVHNode *node,
 void pbvh_bmesh_normals_update(PBVHNode **nodes, int totnode);
 
 /* pbvh_pixels.hh */
+
 void pbvh_pixels_free(PBVHNode *node);
 void pbvh_pixels_free_brush_test(PBVHNode *node);
 
diff --git a/source/blender/blenlib/BLI_color_mix.hh b/source/blender/blenlib/BLI_color_mix.hh
index f23d752b8d1..4989ddc609e 100644
--- a/source/blender/blenlib/BLI_color_mix.hh
+++ b/source/blender/blenlib/BLI_color_mix.hh
@@ -5,7 +5,6 @@
  * \ingroup blenlib
  *
  * Contains color mixing utilities.
- *
  */
 
 #include "BLI_color.hh"
diff --git a/source/blender/editors/object/object_transform.cc b/source/blender/editors/object/object_transform.cc
index 4943488385e..da3df159c33 100644
--- a/source/blender/editors/object/object_transform.cc
+++ b/source/blender/editors/object/object_transform.cc
@@ -1170,6 +1170,12 @@ void OBJECT_OT_transform_apply(wmOperatorType *ot)
   RNA_def_property_flag(prop, PROP_SKIP_SAVE);
 }
 
+/** \} */
+
+/* -------------------------------------------------------------------- */
+/** \name Apply Parent Inverse Operator
+ * \{ */
+
 static int object_parent_inverse_apply_exec(bContext *C, wmOperator *UNUSED(op))
 {
   CTX_DATA_BEGIN (C, Object *, ob, selected_editable_objects) {
diff --git a/source/blender/editors/space_node/node_view.cc b/source/blender/editors/space_node/node_view.cc
index 38a0101a432..91a21527ac9 100644
--- a/source/blender/editors/space_node/node_view.cc
+++ b/source/blender/editors/space_node/node_view.cc
@@ -227,7 +227,6 @@ static int snode_bg_viewmove_modal(bContext *C, wmOperator *op, const wmEvent *e
       op->customdata = nullptr;
 
       return OPERATOR_CANCELLED;
-      break;
   }
 
   return OPERATOR_RUNNING_MODAL;
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index 9148b48978d..b647a823929 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -3095,7 +3095,7 @@ static void rna_def_tool_settings(BlenderRNA *brna)
   RNA_def_property_ui_text(prop,
                            "Lock Object Modes",
                            "Restrict selection to objects using the same mode as the active "
-                           "object,\nto prevent accidental mode switch when selecting");
+                           "object, to prevent accidental mode switch when selecting");
   RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, NULL);
 
   static const EnumPropertyItem workspace_tool_items[] = {
diff --git a/tests/performance/benchmark b/tests/performance/benchmark
index 4ca46a111e1..28e8cda5098 100755
--- a/tests/performance/benchmark
+++ b/tests/performance/benchmark
@@ -333,7 +333,7 @@ def main():
 
     argv = sys.argv[2:]
     blender_git_dir = find_blender_git_dir()
-    if blender_git_dir == None:
+    if blender_git_dir is None:
         sys.stderr.write('Error: no blender git repository found from current working directory\n')
         sys.exit(1)



More information about the Bf-blender-cvs mailing list