Cleanup: redundant 'break', minor edits
authorCampbell Barton <ideasman42@gmail.com>
Thu, 19 Nov 2015 05:16:06 +0000 (16:16 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 19 Nov 2015 11:52:13 +0000 (22:52 +1100)
extern/wcwidth/wcwidth.c
intern/ghost/intern/GHOST_SystemPathsUnix.h
source/blender/blenkernel/intern/data_transfer.c
source/blender/blenkernel/intern/unit.c
source/blender/editors/render/render_opengl.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/imbuf/intern/png.c
source/blender/render/intern/source/pipeline.c

index 61e822ad679f7c7c9cc819f5bb24ac4b13a7fbf0..8cab81e32cd4e1b6d44b7ede1d355d8382477a24 100644 (file)
@@ -61,6 +61,8 @@
 
 #include <wchar.h>
 
 
 #include <wchar.h>
 
+#include "wcwidth.h"
+
 struct interval {
   int first;
   int last;
 struct interval {
   int first;
   int last;
index c30e717c26da47e862c1865279e866e790e095f4..1502160c8d6f2a165cbd0c84077436ba82dc964f 100644 (file)
@@ -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.
        /**
         * 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.
         */
        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;
 
         */
        const GHOST_TUns8 *getUserDir(int version, const char *versionstr) const;
 
index d22a8451c0150dfec82d50d8f8b9423572e58823..1dcacc3ae0af1e61113cc29735081c4c3c2bb223 100644 (file)
@@ -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;
        switch (cddata_type) {
                case CD_FAKE_UV:
                        return BKE_mesh_calc_islands_loop_poly_uv;
-                       break;
                default:
                        break;
        }
                default:
                        break;
        }
index ab8fbabd3295b3ec3733dc10cc68ae151dd38ec6..e0f21201c786a7abffa67a9cf2a45c95b38bd053 100644 (file)
@@ -512,10 +512,8 @@ static bool ch_is_op(char op)
                case '=':
                case '%':
                        return true;
                case '=':
                case '%':
                        return true;
-                       break;
                default:
                        return false;
                default:
                        return false;
-                       break;
        }
 }
 
        }
 }
 
index a194178ef40b28763c9079cfa84c575cfea65f3d..1e5fdf7b0d3dcbdda53bcf0ad9402afe63b2259e 100644 (file)
@@ -302,7 +302,7 @@ static void screen_opengl_render_doit(OGLRender *oglrender, RenderResult *rr)
                if (gpd) {
                        int i;
                        unsigned char *gp_rect;
                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);
 
 
                        GPU_offscreen_bind(oglrender->ofs, true);
 
index f0c9c023876b249c23e937e506bfe8d90ee2b7b9..a43fb902834906915060f3839d4c9dda9e47ae2c 100644 (file)
@@ -564,7 +564,6 @@ BlurKernel *paint_new_blur_kernel(Brush *br, bool proj)
                        MEM_freeN(kernel->wdata);
                        MEM_freeN(kernel);
                        return NULL;
                        MEM_freeN(kernel->wdata);
                        MEM_freeN(kernel);
                        return NULL;
-                       break;
        }
 
        return kernel;
        }
 
        return kernel;
index 744a05c7091875dc65e264defc86c07b7f594e86..5192e3f2d26b3f693162a8c5e3f129c0d4cf7da0 100644 (file)
@@ -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);
                default:
                        printf("PNG format not supported\n");
                        longjmp(png_jmpbuf(png_ptr), 1);
-                       break;
        }
        
        ibuf = IMB_allocImBuf(width, height, 8 * bytesperpixel, 0);
        }
        
        ibuf = IMB_allocImBuf(width, height, 8 * bytesperpixel, 0);
index 71154ce12bb5a230f01a8d2c98399bc1ef3db4ae..5e5f7bdf264165ac20a285396dd473ce027dfaac 100644 (file)
@@ -3963,13 +3963,10 @@ bool RE_layers_have_name(struct RenderResult *rr)
        switch (BLI_listbase_count_ex(&rr->layers, 2)) {
                case 0:
                        return false;
        switch (BLI_listbase_count_ex(&rr->layers, 2)) {
                case 0:
                        return false;
-                       break;
                case 1:
                        return (((RenderLayer *)rr->layers.first)->name[0] != '\0');
                case 1:
                        return (((RenderLayer *)rr->layers.first)->name[0] != '\0');
-                       break;
                default:
                        return true;
                default:
                        return true;
-                       break;
        }
        return false;
 }
        }
        return false;
 }