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
diff options
context:
space:
mode:
authorTon Roosendaal <ton@blender.org>2003-10-07 22:24:02 +0400
committerTon Roosendaal <ton@blender.org>2003-10-07 22:24:02 +0400
commitf234b44d474ad45e07e4a9b2416a19a37c2e35ee (patch)
tree90482479c494adf505234952a13e09893fffa78e /source/blender/src/editface.c
parent39b1ceb66915b851b06bd544aa7b476a6a1010a2 (diff)
- another huge commit! read this!
- removed src/buttons.c and include/BIF_buttons.h - added src/buttons.txt, which is the old buttons.c for review and adding code to new panels structure - changed internal events to match new buttonspace structure - added tabs for new shading group of buttons - removed loads of little warnings, -Wall now compiles src/ almost without error (hint: setenv NAN_QUIET to see it all better) Now I'm ready to do actual buttons -> panels conversion. I will do the raw versions first, others then can cleanup
Diffstat (limited to 'source/blender/src/editface.c')
-rw-r--r--source/blender/src/editface.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/source/blender/src/editface.c b/source/blender/src/editface.c
index 290c9b2aa9e..68059e4d0f2 100644
--- a/source/blender/src/editface.c
+++ b/source/blender/src/editface.c
@@ -32,6 +32,7 @@
#include <math.h>
+#include <string.h>
#ifdef HAVE_CONFIG_H
#include <config.h>
@@ -517,7 +518,7 @@ void face_select()
/* image window redraw */
allqueue(REDRAWIMAGE, 0);
- allqueue(REDRAWBUTSGAME, 0);
+ allqueue(REDRAWBUTSEDIT, 0);
allqueue(REDRAWVIEW3D, 0);
}
@@ -937,7 +938,6 @@ void set_faceselect() /* toggle */
}
allqueue(REDRAWVIEW3D, 0);
- allqueue(REDRAWBUTSGAME, 0);
allqueue(REDRAWBUTSEDIT, 0);
allqueue(REDRAWIMAGE, 0);
@@ -1199,7 +1199,7 @@ int face_pick_uv(Object* object, Mesh* mesh, TFace* face, short x, short y, floa
* If face is a quad, there are two triangles to check.
*/
result = triangle_ray_intersect(v2, v1, v3, org, dir, ab);
- if ((num_verts == 3) || (num_verts == 4) && (result > 1)) {
+ if ( ((num_verts == 3) || (num_verts == 4)) && (result > 1) ) {
/* Face is a triangle or a quad with a hit on the first triangle */
face_get_uv(face, 1, 0, 2, ab[0], ab[1], u, v);
/* printf("triangle 1, texture (u,v)=(%f, %f)\n", *u, *v); */
@@ -1224,7 +1224,7 @@ void face_draw()
TFace *face, *face_old = 0;
short xy[2], xy_old[2];
//int a, index;
- Image *img, *img_old = 0;
+ Image *img=NULL, *img_old = NULL;
IMG_BrushPtr brush;
IMG_CanvasPtr canvas = 0;
int rowBytes;
@@ -1425,7 +1425,6 @@ void get_same_uv(void)
/* image window redraw */
allqueue(REDRAWIMAGE, 0);
- allqueue(REDRAWBUTSGAME, 0);
allqueue(REDRAWVIEW3D, 0);
}
#endif /* NAN_TPT */