diff options
-rw-r--r-- | extern/wcwidth/wcwidth.c | 2 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_SystemPathsUnix.h | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/data_transfer.c | 1 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/unit.c | 2 | ||||
-rw-r--r-- | source/blender/editors/render/render_opengl.c | 2 | ||||
-rw-r--r-- | source/blender/editors/sculpt_paint/paint_image.c | 1 | ||||
-rw-r--r-- | source/blender/imbuf/intern/png.c | 1 | ||||
-rw-r--r-- | source/blender/render/intern/source/pipeline.c | 3 |
8 files changed, 5 insertions, 11 deletions
diff --git a/extern/wcwidth/wcwidth.c b/extern/wcwidth/wcwidth.c index 61e822ad679..8cab81e32cd 100644 --- a/extern/wcwidth/wcwidth.c +++ b/extern/wcwidth/wcwidth.c @@ -61,6 +61,8 @@ #include <wchar.h> +#include "wcwidth.h" + struct interval { int first; int last; diff --git a/intern/ghost/intern/GHOST_SystemPathsUnix.h b/intern/ghost/intern/GHOST_SystemPathsUnix.h index c30e717c26d..1502160c8d6 100644 --- a/intern/ghost/intern/GHOST_SystemPathsUnix.h +++ b/intern/ghost/intern/GHOST_SystemPathsUnix.h @@ -53,14 +53,14 @@ public: /** * Determine the base dir in which shared resources are located. It will first try to use * "unpack and run" path, then look for properly installed path, including versioning. - * \return Unsigned char string pointing to system dir (eg /usr/share/blender/). + * \return Unsigned char string pointing to system dir (eg `/usr/share/blender/`). */ const GHOST_TUns8 *getSystemDir(int version, const char *versionstr) const; /** * Determine the base dir in which user configuration is stored, including versioning. * If needed, it will create the base directory. - * \return Unsigned char string pointing to user dir (eg ~/.blender/). + * \return Unsigned char string pointing to user dir (eg `~/.config/.blender/`). */ const GHOST_TUns8 *getUserDir(int version, const char *versionstr) const; 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; } |