Revision: 23816
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23816
Author: nicholasbishop
Date: 2009-10-13 21:02:30 +0200 (Tue, 13 Oct 2009)
Log Message:
-----------
Various warning fixes
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
trunk/blender/source/blender/blenkernel/intern/screen.c
trunk/blender/source/blender/blenlib/BLI_arithb.h
trunk/blender/source/blender/blenlib/intern/arithb.c
trunk/blender/source/blender/editors/include/ED_object.h
trunk/blender/source/blender/editors/mesh/editface.c
trunk/blender/source/blender/editors/mesh/editmesh_tools.c
trunk/blender/source/blender/editors/mesh/mesh_ops.c
trunk/blender/source/blender/editors/object/object_ops.c
trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
trunk/blender/source/blender/editors/uvedit/uvedit_ops.c
trunk/blender/source/blender/gpu/gpu_buffers.h
trunk/blender/source/blender/gpu/intern/gpu_buffers.c
Modified: trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
2009-10-13 17:50:14 UTC (rev 23815)
+++ trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
2009-10-13 19:02:30 UTC (rev 23816)
@@ -660,7 +660,6 @@
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);
Modified: trunk/blender/source/blender/blenkernel/intern/screen.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/screen.c 2009-10-13
17:50:14 UTC (rev 23815)
+++ trunk/blender/source/blender/blenkernel/intern/screen.c 2009-10-13
19:02:30 UTC (rev 23816)
@@ -57,7 +57,6 @@
ARegionType *art;
PanelType *pt;
HeaderType *ht;
- MenuType *mt;
for(art= st->regiontypes.first; art; art= art->next) {
BLI_freelistN(&art->drawcalls);
Modified: trunk/blender/source/blender/blenlib/BLI_arithb.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_arithb.h 2009-10-13 17:50:14 UTC
(rev 23815)
+++ trunk/blender/source/blender/blenlib/BLI_arithb.h 2009-10-13 19:02:30 UTC
(rev 23816)
@@ -348,7 +348,7 @@
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 @@
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);
Modified: trunk/blender/source/blender/blenlib/intern/arithb.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/arithb.c 2009-10-13
17:50:14 UTC (rev 23815)
+++ trunk/blender/source/blender/blenlib/intern/arithb.c 2009-10-13
19:02:30 UTC (rev 23816)
@@ -2151,7 +2151,7 @@
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 @@
}
/* 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];
Modified: trunk/blender/source/blender/editors/include/ED_object.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_object.h 2009-10-13
17:50:14 UTC (rev 23815)
+++ trunk/blender/source/blender/editors/include/ED_object.h 2009-10-13
19:02:30 UTC (rev 23816)
@@ -29,6 +29,7 @@
#define ED_OBJECT_H
struct wmKeyConfig;
+struct wmKeyMap;
struct Scene;
struct Object;
struct bContext;
Modified: trunk/blender/source/blender/editors/mesh/editface.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editface.c 2009-10-13
17:50:14 UTC (rev 23815)
+++ trunk/blender/source/blender/editors/mesh/editface.c 2009-10-13
19:02:30 UTC (rev 23816)
@@ -711,9 +711,6 @@
// 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) {
Modified: trunk/blender/source/blender/editors/mesh/editmesh_tools.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_tools.c 2009-10-13
17:50:14 UTC (rev 23815)
+++ trunk/blender/source/blender/editors/mesh/editmesh_tools.c 2009-10-13
19:02:30 UTC (rev 23816)
@@ -484,9 +484,9 @@
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);
Modified: trunk/blender/source/blender/editors/mesh/mesh_ops.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/mesh_ops.c 2009-10-13
17:50:14 UTC (rev 23815)
+++ trunk/blender/source/blender/editors/mesh/mesh_ops.c 2009-10-13
19:02:30 UTC (rev 23816)
@@ -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"
Modified: trunk/blender/source/blender/editors/object/object_ops.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_ops.c 2009-10-13
17:50:14 UTC (rev 23815)
+++ trunk/blender/source/blender/editors/object/object_ops.c 2009-10-13
19:02:30 UTC (rev 23816)
@@ -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);
Modified: trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/sculpt.c 2009-10-13
17:50:14 UTC (rev 23815)
+++ trunk/blender/source/blender/editors/sculpt_paint/sculpt.c 2009-10-13
19:02:30 UTC (rev 23816)
@@ -305,7 +305,6 @@
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;
Modified: trunk/blender/source/blender/editors/uvedit/uvedit_ops.c
===================================================================
--- trunk/blender/source/blender/editors/uvedit/uvedit_ops.c 2009-10-13
17:50:14 UTC (rev 23815)
+++ trunk/blender/source/blender/editors/uvedit/uvedit_ops.c 2009-10-13
19:02:30 UTC (rev 23816)
@@ -56,6 +56,7 @@
#include "ED_image.h"
#include "ED_mesh.h"
+#include "ED_object.h"
#include "ED_screen.h"
#include "ED_transform.h"
Modified: trunk/blender/source/blender/gpu/gpu_buffers.h
===================================================================
--- trunk/blender/source/blender/gpu/gpu_buffers.h 2009-10-13 17:50:14 UTC
(rev 23815)
+++ trunk/blender/source/blender/gpu/gpu_buffers.h 2009-10-13 19:02:30 UTC
(rev 23816)
@@ -141,9 +141,9 @@
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 );
Modified: trunk/blender/source/blender/gpu/intern/gpu_buffers.c
===================================================================
--- trunk/blender/source/blender/gpu/intern/gpu_buffers.c 2009-10-13
17:50:14 UTC (rev 23815)
+++ trunk/blender/source/blender/gpu/intern/gpu_buffers.c 2009-10-13
19:02:30 UTC (rev 23816)
@@ -1150,14 +1150,14 @@
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);
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
