Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2015-11-19 08:16:06 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-11-19 14:52:13 +0300
commitae8e4d37180b0fd24a6565551a8d63101555cad9 (patch)
tree3aba99a7a98f6cff334957cfb357b2f474891b17 /source
parentb8c40d47e0348a057e7fa7c49f49077f86a51d43 (diff)
Cleanup: redundant 'break', minor edits
Diffstat (limited to 'source')
-rw-r--r--source/blender/blenkernel/intern/data_transfer.c1
-rw-r--r--source/blender/blenkernel/intern/unit.c2
-rw-r--r--source/blender/editors/render/render_opengl.c2
-rw-r--r--source/blender/editors/sculpt_paint/paint_image.c1
-rw-r--r--source/blender/imbuf/intern/png.c1
-rw-r--r--source/blender/render/intern/source/pipeline.c3
6 files changed, 1 insertions, 9 deletions
diff --git a/source/blender/blenkernel/intern/data_transfer.c b/source/blender/blenkernel/intern/data_transfer.c
index d22a8451c01..1dcacc3ae0a 100644
--- a/source/blender/blenkernel/intern/data_transfer.c
+++ b/source/blender/blenkernel/intern/data_transfer.c
@@ -357,7 +357,6 @@ static MeshRemapIslandsCalc data_transfer_get_loop_islands_generator(const int c
switch (cddata_type) {
case CD_FAKE_UV:
return BKE_mesh_calc_islands_loop_poly_uv;
- break;
default:
break;
}
diff --git a/source/blender/blenkernel/intern/unit.c b/source/blender/blenkernel/intern/unit.c
index ab8fbabd329..e0f21201c78 100644
--- a/source/blender/blenkernel/intern/unit.c
+++ b/source/blender/blenkernel/intern/unit.c
@@ -512,10 +512,8 @@ static bool ch_is_op(char op)
case '=':
case '%':
return true;
- break;
default:
return false;
- break;
}
}
diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c
index a194178ef40..1e5fdf7b0d3 100644
--- a/source/blender/editors/render/render_opengl.c
+++ b/source/blender/editors/render/render_opengl.c
@@ -302,7 +302,7 @@ static void screen_opengl_render_doit(OGLRender *oglrender, RenderResult *rr)
if (gpd) {
int i;
unsigned char *gp_rect;
- unsigned char *rect = (unsigned char*)RE_RenderViewGetById(rr, oglrender->view_id)->rect32;
+ unsigned char *rect = (unsigned char *)RE_RenderViewGetById(rr, oglrender->view_id)->rect32;
GPU_offscreen_bind(oglrender->ofs, true);
diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c
index f0c9c023876..a43fb902834 100644
--- a/source/blender/editors/sculpt_paint/paint_image.c
+++ b/source/blender/editors/sculpt_paint/paint_image.c
@@ -564,7 +564,6 @@ BlurKernel *paint_new_blur_kernel(Brush *br, bool proj)
MEM_freeN(kernel->wdata);
MEM_freeN(kernel);
return NULL;
- break;
}
return kernel;
diff --git a/source/blender/imbuf/intern/png.c b/source/blender/imbuf/intern/png.c
index 744a05c7091..5192e3f2d26 100644
--- a/source/blender/imbuf/intern/png.c
+++ b/source/blender/imbuf/intern/png.c
@@ -600,7 +600,6 @@ ImBuf *imb_loadpng(const unsigned char *mem, size_t size, int flags, char colors
default:
printf("PNG format not supported\n");
longjmp(png_jmpbuf(png_ptr), 1);
- break;
}
ibuf = IMB_allocImBuf(width, height, 8 * bytesperpixel, 0);
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index 71154ce12bb..5e5f7bdf264 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -3963,13 +3963,10 @@ bool RE_layers_have_name(struct RenderResult *rr)
switch (BLI_listbase_count_ex(&rr->layers, 2)) {
case 0:
return false;
- break;
case 1:
return (((RenderLayer *)rr->layers.first)->name[0] != '\0');
- break;
default:
return true;
- break;
}
return false;
}