kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Various warning fixes

Browse Source
This commit is contained in:
Nicholas Bishop 2009-10-13 19:02:30 +00:00
parent e3d8c8eba8
commit 3b805af8af
13 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/blenkernel/intern/cdderivedmesh.c
View File

@ -660,7 +660,6 @@ static void cdDM_drawFacesTex_common(DerivedMesh *dm,
for(i = 0; i < dm->drawObject->nelements/3; i++) {
int actualFace = dm->drawObject->faceRemap[i];
int flag = 1;
unsigned char *cp = NULL;
if(drawParams) {
flag = drawParams(tf? &tf[actualFace]: NULL, mcol? &mcol[actualFace*4]: NULL, mf[actualFace].mat_nr);

1
source/blender/blenkernel/intern/screen.c
View File

@ -57,7 +57,6 @@ static void spacetype_free(SpaceType *st)
ARegionType *art;
PanelType *pt;
HeaderType *ht;
MenuType *mt;
for(art= st->regiontypes.first; art; art= art->next) {
BLI_freelistN(&art->drawcalls);

4
source/blender/blenlib/BLI_arithb.h
View File

@ -348,7 +348,7 @@ void VecUpMat3(float *vec, float mat[][3], short axis);
void VecCopyf(float *v1, float *v2);
int VecLen(int *v1, int *v2);
float VecLenf(float *v1, float *v2);
float VecLenf(float v1[3], float v2[3]);
float VecLength(float *v);
void VecMulf(float *v1, float f);
void VecNegf(float *v1);
@ -412,7 +412,7 @@ void NormalFloatToShort(short *out, float *in);
float DistVL2Dfl(float *v1, float *v2, float *v3);
float PdistVL2Dfl(float *v1, float *v2, float *v3);
float PdistVL3Dfl(float *v1, float *v2, float *v3);
void PclosestVL3Dfl(float *closest, float *v1, float *v2, float *v3);
void PclosestVL3Dfl(float *closest, float v1[3], float v2[3], float v3[3]);
float AreaF2Dfl(float *v1, float *v2, float *v3);
float AreaQ3Dfl(float *v1, float *v2, float *v3, float *v4);
float AreaT3Dfl(float *v1, float *v2, float *v3);

4
source/blender/blenlib/intern/arithb.c
View File

@ -2151,7 +2151,7 @@ int VecLen( int *v1, int *v2)
return (int)floor(sqrt(x*x+y*y+z*z));
}
float VecLenf( float *v1, float *v2)
float VecLenf(float v1[3], float v2[3])
{
float x,y,z;
@ -5131,7 +5131,7 @@ int point_in_tri_prism(float p[3], float v1[3], float v2[3], float v3[3])
}
/* point closest to v1 on line v2-v3 in 3D */
void PclosestVL3Dfl(float *closest, float *v1, float *v2, float *v3)
void PclosestVL3Dfl(float *closest, float v1[3], float v2[3], float v3[3])
{
float lambda, cp[3];

1
source/blender/editors/include/ED_object.h
View File

@ -29,6 +29,7 @@
#define ED_OBJECT_H
struct wmKeyConfig;
struct wmKeyMap;
struct Scene;
struct Object;
struct bContext;

3
source/blender/editors/mesh/editface.c
View File

@ -711,9 +711,6 @@ void face_borderselect(Scene *scene, ScrArea *sa, ARegion *ar)
// XXX val= get_border(&rect, 3);
if(val) {
View3D *v3d= sa->spacedata.first;
RegionView3D *rv3d= ar->regiondata;
/* without this border select often fails */
#if 0 /* XXX untested in 2.5 */
if (v3d->flag & V3D_NEEDBACKBUFDRAW) {

2
source/blender/editors/mesh/editmesh_tools.c
View File

@ -484,9 +484,9 @@ static int removedoublesflag_exec(bContext *C, wmOperator *op)
Object *obedit= CTX_data_edit_object(C);
EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit->data));
/*char msg[100];*/
int cnt = removedoublesflag(em,1,0,RNA_float_get(op->ptr, "limit"));
/*XXX this messes up last operator panel
int cnt = removedoublesflag(em,1,0,RNA_float_get(op->ptr, "limit"));
if(cnt)
{
sprintf(msg, "Removed %d vertices", cnt);

1
source/blender/editors/mesh/mesh_ops.c
View File

@ -55,6 +55,7 @@
#include "WM_types.h"
#include "ED_mesh.h"
#include "ED_object.h"
#include "ED_screen.h"
#include "ED_transform.h"
#include "ED_view3d.h"

2
source/blender/editors/object/object_ops.c
View File

@ -63,8 +63,6 @@
void ED_operatortypes_object(void)
{
wmOperatorType *ot;
WM_operatortype_append(OBJECT_OT_location_clear);
WM_operatortype_append(OBJECT_OT_rotation_clear);
WM_operatortype_append(OBJECT_OT_scale_clear);

1
source/blender/editors/sculpt_paint/sculpt.c
View File

@ -305,7 +305,6 @@ static void calc_area_normal(Sculpt *sd, SculptSession *ss, float out[3], const
static void do_draw_brush(Sculpt *sd, SculptSession *ss, const ListBase* active_verts)
{
float area_normal[3];
int j;
ActiveData *node= active_verts->first;
float* buffer;

1
source/blender/editors/uvedit/uvedit_ops.c
View File

@ -56,6 +56,7 @@
#include "ED_image.h"
#include "ED_mesh.h"
#include "ED_object.h"
#include "ED_screen.h"
#include "ED_transform.h"

4
source/blender/gpu/gpu_buffers.h
View File

@ -141,9 +141,9 @@ void *GPU_buffer_lock_stream( GPUBuffer *buffer );
void GPU_buffer_unlock( GPUBuffer *buffer );
/* upload three unsigned chars, representing RGB colors, for each vertex. Resets dm->drawObject->colType to -1 */
void GPU_color3_upload( struct DerivedMesh *dm, char *data );
void GPU_color3_upload( struct DerivedMesh *dm, unsigned char *data );
/* upload four unsigned chars, representing RGBA colors, for each vertex. Resets dm->drawObject->colType to -1 */
void GPU_color4_upload( struct DerivedMesh *dm, char *data );
void GPU_color4_upload( struct DerivedMesh *dm, unsigned char *data );
/* switch color rendering on=1/off=0 */
void GPU_color_switch( int mode );

4
source/blender/gpu/intern/gpu_buffers.c
View File

@ -1150,14 +1150,14 @@ void GPU_buffer_unbind()
glBindBufferARB( GL_ARRAY_BUFFER_ARB, 0 );
}
void GPU_color3_upload( DerivedMesh *dm, char *data )
void GPU_color3_upload( DerivedMesh *dm, unsigned char *data )
{
if( dm->drawObject == 0 )
dm->drawObject = GPU_drawobject_new(dm);
GPU_buffer_free(dm->drawObject->colors,globalPool);
dm->drawObject->colors = GPU_buffer_setup( dm, dm->drawObject, sizeof(char)*3*dm->drawObject->nelements, GL_ARRAY_BUFFER_ARB, data, GPU_buffer_copy_color3 );
}
void GPU_color4_upload( DerivedMesh *dm, char *data )
void GPU_color4_upload( DerivedMesh *dm, unsigned char *data )
{
if( dm->drawObject == 0 )
dm->drawObject = GPU_drawobject_new(dm);