diff options
| -rw-r--r-- | intern/guardedalloc/intern/mallocn.c | 8 | ||||
| -rw-r--r-- | intern/raskter/raskter.c | 7 | ||||
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_tools.c | 2 |
3 files changed, 9 insertions, 8 deletions
diff --git a/intern/guardedalloc/intern/mallocn.c b/intern/guardedalloc/intern/mallocn.c index 4a30388c047..f1a83583715 100644 --- a/intern/guardedalloc/intern/mallocn.c +++ b/intern/guardedalloc/intern/mallocn.c @@ -683,8 +683,8 @@ static void addtail(volatile localListBase *listbase, void *vlink) { struct localLink *link = vlink; - /* for a generic API general error checks here is fine but - * the use here they will never be NULL */ + /* for a generic API error checks here is fine but + * the limited use here they will never be NULL */ #if 0 if (link == NULL) return; if (listbase == NULL) return; @@ -702,8 +702,8 @@ static void remlink(volatile localListBase *listbase, void *vlink) { struct localLink *link = vlink; - /* for a generic API general error checks here is fine but - * the use here they will never be NULL */ + /* for a generic API error checks here is fine but + * the limited use here they will never be NULL */ #if 0 if (link == NULL) return; if (listbase == NULL) return; diff --git a/intern/raskter/raskter.c b/intern/raskter/raskter.c index 9bf1779a608..081a7c6bdbd 100644 --- a/intern/raskter/raskter.c +++ b/intern/raskter/raskter.c @@ -189,7 +189,8 @@ static int rast_scan_fill(struct r_fill_context *ctx, struct poly_vert *verts, i * If the number of verts specified to render as a polygon is less than 3, * return immediately. Obviously we cant render a poly with sides < 3. The * return for this we set to 1, simply so it can be distinguished from the - * next place we could return, /home/guest/blender-svn/soc-2011-tomato/intern/raskter/raskter.cwhich is a failure to allocate memory. + * next place we could return, /home/guest/blender-svn/soc-2011-tomato/intern/raskter/raskter. + * which is a failure to allocate memory. */ if (num_verts < 3) { return(1); @@ -384,8 +385,8 @@ static int rast_scan_fill(struct r_fill_context *ctx, struct poly_vert *verts, i int PLX_raskterize(float (*base_verts)[2], int num_base_verts, float *buf, int buf_x, int buf_y) { - int i; /* i: Loop counter. */ - struct poly_vert *ply; /* ply: Pointer to a list of integer buffer-space vertex coordinates. */ + int i; /* i: Loop counter. */ + struct poly_vert *ply; /* ply: Pointer to a list of integer buffer-space vertex coordinates. */ struct r_fill_context ctx = {0}; /* diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c index e656b1242ab..3d01de1c67a 100644 --- a/source/blender/editors/space_outliner/outliner_tools.c +++ b/source/blender/editors/space_outliner/outliner_tools.c @@ -651,7 +651,7 @@ static EnumPropertyItem prop_group_op_types[] = { {0, "UNLINK", 0, "Unlink Group", ""}, {1, "LOCAL", 0, "Make Local Group", ""}, {2, "LINK", 0, "Link Group Objects to Scene", ""}, - {3, "INSTANCE", 0, "Instance Group in Scene", ""}, + {3, "INSTANCE", 0, "Instance Groups in Scene", ""}, {4, "TOGVIS", 0, "Toggle Visible Group", ""}, {5, "TOGSEL", 0, "Toggle Selectable", ""}, {6, "TOGREN", 0, "Toggle Renderable", ""}, |