From ec42d60c3d3e6d742a63eff02b9de969f9e42949 Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Tue, 14 Feb 2006 11:46:45 +0000 Subject: [PATCH] Weekly cleanup in my precious blender tree :) Unused variables, missing prototypes mostly. --- source/blender/blenkernel/intern/writeframeserver.c | 2 +- source/blender/include/BIF_editmesh.h | 1 + source/blender/include/butspace.h | 2 +- source/blender/src/drawseq.c | 2 +- source/blender/src/editmesh_lib.c | 3 ++- source/blender/src/space.c | 1 + 6 files changed, 7 insertions(+), 4 deletions(-) diff --git a/source/blender/blenkernel/intern/writeframeserver.c b/source/blender/blenkernel/intern/writeframeserver.c index 4f1a9a5a080..8c794a025e5 100644 --- a/source/blender/blenkernel/intern/writeframeserver.c +++ b/source/blender/blenkernel/intern/writeframeserver.c @@ -319,7 +319,7 @@ static void serve_ppm(int *pixels, int rectx, int recty) safe_puts(header); - rendered_frame = pixels; + rendered_frame = (unsigned char *)pixels; for (y = recty - 1; y >= 0; y--) { unsigned char* target = row; diff --git a/source/blender/include/BIF_editmesh.h b/source/blender/include/BIF_editmesh.h index 8c5fa1660ce..92e0dab8129 100644 --- a/source/blender/include/BIF_editmesh.h +++ b/source/blender/include/BIF_editmesh.h @@ -81,6 +81,7 @@ extern void EM_deselect_flush(void); // vertices to edges/faces (exception!) extern void EM_select_flush(void); // vertices to edges/faces (exception!) extern void EM_selectmode_set(void); // when mode changes extern void EM_selectmode_flush(void); // when selection changes +extern void EM_convertsel(short oldmode, short selectmode); extern int EM_nfaces_selected(void); extern int EM_nvertices_selected(void); diff --git a/source/blender/include/butspace.h b/source/blender/include/butspace.h index 6d6da4bc856..4218707523c 100644 --- a/source/blender/include/butspace.h +++ b/source/blender/include/butspace.h @@ -86,7 +86,7 @@ extern void do_latticebuts(unsigned short event); extern void do_fpaintbuts(unsigned short event); extern void do_cambuts(unsigned short event); extern void do_armbuts(unsigned short event); -extern void do_uvautocalculationbuts(unsigned short event); +extern void do_uvcalculationbuts(unsigned short event); extern char *get_vertexgroup_menustr(struct Object *ob); // used in object buttons diff --git a/source/blender/src/drawseq.c b/source/blender/src/drawseq.c index c4c46d39fbd..1712be12368 100644 --- a/source/blender/src/drawseq.c +++ b/source/blender/src/drawseq.c @@ -899,7 +899,7 @@ void drawseqspace(ScrArea *sa, void *spacedata) SpaceSeq *sseq; Editing *ed; Sequence *seq; - float col[3], i; + float col[3]; int ofsx, ofsy; ed= G.scene->ed; diff --git a/source/blender/src/editmesh_lib.c b/source/blender/src/editmesh_lib.c index 8c57120021b..46a9b1fa4b6 100644 --- a/source/blender/src/editmesh_lib.c +++ b/source/blender/src/editmesh_lib.c @@ -62,6 +62,8 @@ editmesh_lib: generic (no UI, no menus) operations/evaluators for editmesh data #include "BIF_editmesh.h" +#include "BSE_edit.h" + #include "editmesh.h" @@ -488,7 +490,6 @@ void EM_selectmode_set(void) for(efa= em->faces.first; efa; efa= efa->next) if(efa->f & SELECT) EM_select_face(efa, 1); } - BIF_undo_push("Selectmode Set"); } /* paranoia check, actually only for entering editmode. rule: diff --git a/source/blender/src/space.c b/source/blender/src/space.c index c8dd5b712f3..e0b163f4b65 100644 --- a/source/blender/src/space.c +++ b/source/blender/src/space.c @@ -77,6 +77,7 @@ #include "BKE_depsgraph.h" #include "BKE_displist.h" #include "BKE_global.h" +#include "BKE_group.h" #include "BKE_ipo.h" #include "BKE_main.h" #include "BKE_node.h"