[Bf-blender-cvs] [bbdfeb751e1] master: Cleanup: remove break after return statements

Campbell Barton noreply at git.blender.org
Wed Nov 18 03:40:21 CET 2020


Commit: bbdfeb751e16d939482d2e4b95c4d470f53f18a5
Author: Campbell Barton
Date:   Wed Nov 18 13:35:26 2020 +1100
Branches: master
https://developer.blender.org/rBbbdfeb751e16d939482d2e4b95c4d470f53f18a5

Cleanup: remove break after return statements

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

M	source/blender/editors/gpencil/gpencil_utils.c
M	source/blender/editors/interface/interface_eyedropper_gpencil_color.c
M	source/blender/makesrna/intern/rna_object_force.c
M	source/blender/makesrna/intern/rna_rna.c

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

diff --git a/source/blender/editors/gpencil/gpencil_utils.c b/source/blender/editors/gpencil/gpencil_utils.c
index 76a584fcac1..628a35f8c76 100644
--- a/source/blender/editors/gpencil/gpencil_utils.c
+++ b/source/blender/editors/gpencil/gpencil_utils.c
@@ -148,7 +148,6 @@ bGPdata **ED_annotation_data_get_pointers_direct(ID *screen_id,
       case SPACE_INFO:       /* header info */
       {
         return NULL;
-        break;
       }
 
       case SPACE_TOPBAR: /* Top-bar */
diff --git a/source/blender/editors/interface/interface_eyedropper_gpencil_color.c b/source/blender/editors/interface/interface_eyedropper_gpencil_color.c
index f7c41a7142b..7f735a0e789 100644
--- a/source/blender/editors/interface/interface_eyedropper_gpencil_color.c
+++ b/source/blender/editors/interface/interface_eyedropper_gpencil_color.c
@@ -299,7 +299,6 @@ static int eyedropper_gpencil_modal(bContext *C, wmOperator *op, const wmEvent *
 
           eyedropper_gpencil_exit(C, op);
           return OPERATOR_FINISHED;
-          break;
         }
         default: {
           break;
diff --git a/source/blender/makesrna/intern/rna_object_force.c b/source/blender/makesrna/intern/rna_object_force.c
index ee87ad19cbb..c4dcda71984 100644
--- a/source/blender/makesrna/intern/rna_object_force.c
+++ b/source/blender/makesrna/intern/rna_object_force.c
@@ -197,7 +197,6 @@ static char *rna_PointCache_path(PointerRNA *ptr)
       }
       default: {
         return BLI_sprintfN("modifiers[\"%s\"].point_cache", name_esc);
-        break;
       }
     }
   }
diff --git a/source/blender/makesrna/intern/rna_rna.c b/source/blender/makesrna/intern/rna_rna.c
index 03394a5faba..45406c3ddd3 100644
--- a/source/blender/makesrna/intern/rna_rna.c
+++ b/source/blender/makesrna/intern/rna_rna.c
@@ -2598,7 +2598,6 @@ bool rna_property_override_apply_default(Main *UNUSED(bmain),
           IDP_CopyPropertyContent(item_idprop_dst, item_idprop_src);
 
           return RNA_property_collection_move(ptr_dst, prop_dst, item_index_added, item_index_dst);
-          break;
         }
         default:
           BLI_assert(0 && "Unsupported RNA override operation on collection");



More information about the Bf-blender-cvs mailing list