[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50369] trunk/blender/source/blender: fix for building on msvc2008 (also style cleanup)
Campbell Barton
ideasman42 at gmail.com
Tue Sep 4 03:23:54 CEST 2012
Revision: 50369
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50369
Author: campbellbarton
Date: 2012-09-04 01:23:50 +0000 (Tue, 04 Sep 2012)
Log Message:
-----------
fix for building on msvc2008 (also style cleanup)
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/mball.c
trunk/blender/source/blender/blenlib/intern/BLI_memarena.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/editors/include/UI_interface.h
trunk/blender/source/blender/editors/include/UI_view2d.h
trunk/blender/source/blender/editors/interface/interface.c
trunk/blender/source/blender/editors/space_view3d/drawmesh.c
trunk/blender/source/blender/editors/space_view3d/view3d_intern.h
trunk/blender/source/blender/gpu/GPU_buffers.h
trunk/blender/source/blender/imbuf/IMB_imbuf.h
trunk/blender/source/blender/render/extern/include/RE_render_ext.h
trunk/blender/source/blender/render/intern/include/pixelshading.h
trunk/blender/source/blender/windowmanager/WM_keymap.h
Modified: trunk/blender/source/blender/blenkernel/intern/mball.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mball.c 2012-09-04 00:34:37 UTC (rev 50368)
+++ trunk/blender/source/blender/blenkernel/intern/mball.c 2012-09-04 01:23:50 UTC (rev 50369)
@@ -157,7 +157,7 @@
/* Forward declarations */
static int vertid(const CORNER *c1, const CORNER *c2, PROCESS *p, MetaBall *mb);
-static int setcenter(CENTERLIST *table[], int i, int j, int k);
+static int setcenter(CENTERLIST *table[], const int i, const int j, const int k);
static CORNER *setcorner(PROCESS *p, int i, int j, int k);
static void converge(const float p1[3], const float p2[3], float v1, float v2,
float (*function)(float, float, float), float p[3], MetaBall *mb, int f);
Modified: trunk/blender/source/blender/blenlib/intern/BLI_memarena.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/BLI_memarena.c 2012-09-04 00:34:37 UTC (rev 50368)
+++ trunk/blender/source/blender/blenlib/intern/BLI_memarena.c 2012-09-04 01:23:50 UTC (rev 50369)
@@ -46,7 +46,7 @@
LinkNode *bufs;
};
-MemArena *BLI_memarena_new(int bufsize, const char *name)
+MemArena *BLI_memarena_new(const int bufsize, const char *name)
{
MemArena *ma = MEM_callocN(sizeof(*ma), "memarena");
ma->bufsize = bufsize;
@@ -66,7 +66,7 @@
ma->use_calloc = 0;
}
-void BLI_memarena_use_align(struct MemArena *ma, int align)
+void BLI_memarena_use_align(struct MemArena *ma, const int align)
{
/* align should be a power of two */
ma->align = align;
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2012-09-04 00:34:37 UTC (rev 50368)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2012-09-04 01:23:50 UTC (rev 50369)
@@ -7029,8 +7029,8 @@
if (node->storage == NULL) {
NodeMask *data = MEM_callocN(sizeof(NodeMask), __func__);
/* move settings into own struct */
- data->size_x = node->custom3;
- data->size_y = node->custom4;
+ data->size_x = (int)node->custom3;
+ data->size_y = (int)node->custom4;
node->custom3 = 0.5f; /* default shutter */
node->storage = data;
}
Modified: trunk/blender/source/blender/editors/include/UI_interface.h
===================================================================
--- trunk/blender/source/blender/editors/include/UI_interface.h 2012-09-04 00:34:37 UTC (rev 50368)
+++ trunk/blender/source/blender/editors/include/UI_interface.h 2012-09-04 01:23:50 UTC (rev 50369)
@@ -573,7 +573,7 @@
typedef void (*uiIDPoinFunc)(struct bContext *C, struct ID *id, int event);
uiBut *uiDefIDPoinBut(uiBlock *block, uiIDPoinFuncFP func, short blocktype, int retval, const char *str,
- int x, int y, short width, short height, void *idpp, const char *tip);
+ int x, int y, short width, short height, void *idpp, const char *tip);
int uiIconFromID(struct ID *id);
Modified: trunk/blender/source/blender/editors/include/UI_view2d.h
===================================================================
--- trunk/blender/source/blender/editors/include/UI_view2d.h 2012-09-04 00:34:37 UTC (rev 50368)
+++ trunk/blender/source/blender/editors/include/UI_view2d.h 2012-09-04 01:23:50 UTC (rev 50369)
@@ -203,7 +203,7 @@
void UI_view2d_keymap(struct wmKeyConfig *keyconf);
void UI_view2d_smooth_view(struct bContext *C, struct ARegion *ar,
- const struct rctf *cur);
+ const struct rctf *cur);
#endif /* __UI_VIEW2D_H__ */
Modified: trunk/blender/source/blender/editors/interface/interface.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface.c 2012-09-04 00:34:37 UTC (rev 50368)
+++ trunk/blender/source/blender/editors/interface/interface.c 2012-09-04 01:23:50 UTC (rev 50369)
@@ -33,7 +33,8 @@
#include <math.h>
#include <string.h>
#include <ctype.h>
-
+#include <stddef.h> /* offsetof() */
+
#include "MEM_guardedalloc.h"
#include "DNA_scene_types.h"
@@ -3706,7 +3707,7 @@
wm_event_add(win, &event);
}
-void uiButGetStrInfo(bContext *C, uiBut *but, int nbr, ...)
+void uiButGetStrInfo(bContext *C, uiBut *but, const int nbr, ...)
{
va_list args;
Modified: trunk/blender/source/blender/editors/space_view3d/drawmesh.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawmesh.c 2012-09-04 00:34:37 UTC (rev 50368)
+++ trunk/blender/source/blender/editors/space_view3d/drawmesh.c 2012-09-04 01:23:50 UTC (rev 50369)
@@ -772,7 +772,8 @@
return 1;
}
-void draw_mesh_textured_old(Scene *scene, View3D *v3d, RegionView3D *rv3d, Object *ob, DerivedMesh *dm, int draw_flags)
+void draw_mesh_textured_old(Scene *scene, View3D *v3d, RegionView3D *rv3d,
+ Object *ob, DerivedMesh *dm, const int draw_flags)
{
Mesh *me = ob->data;
@@ -941,7 +942,8 @@
return !BM_elem_flag_test(efa, BM_ELEM_HIDDEN);
}
-void draw_mesh_textured(Scene *scene, View3D *v3d, RegionView3D *rv3d, Object *ob, DerivedMesh *dm, const int draw_flags)
+void draw_mesh_textured(Scene *scene, View3D *v3d, RegionView3D *rv3d,
+ Object *ob, DerivedMesh *dm, const int draw_flags)
{
if ((!BKE_scene_use_new_shading_nodes(scene)) || (draw_flags & DRAW_MODIFIERS_PREVIEW)) {
draw_mesh_textured_old(scene, v3d, rv3d, ob, dm, draw_flags);
@@ -1017,7 +1019,8 @@
/* Vertex Paint and Weight Paint */
-void draw_mesh_paint(View3D *v3d, RegionView3D *rv3d, Object *ob, DerivedMesh *dm, int draw_flags)
+void draw_mesh_paint(View3D *v3d, RegionView3D *rv3d,
+ Object *ob, DerivedMesh *dm, const int draw_flags)
{
DMSetDrawOptions facemask = NULL;
Mesh *me = ob->data;
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_intern.h
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_intern.h 2012-09-04 00:34:37 UTC (rev 50368)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_intern.h 2012-09-04 01:23:50 UTC (rev 50369)
@@ -175,7 +175,7 @@
int ED_view3d_boundbox_clip(RegionView3D * rv3d, float obmat[][4], struct BoundBox *bb);
void view3d_smooth_view(struct bContext *C, struct View3D *v3d, struct ARegion *ar, struct Object *, struct Object *,
- float *ofs, float *quat, float *dist, float *lens);
+ float *ofs, float *quat, float *dist, float *lens);
void setwinmatrixview3d(ARegion *ar, View3D *v3d, rctf *rect); /* rect: for picking */
void setviewmatrixview3d(Scene *scene, View3D *v3d, RegionView3D *rv3d);
Modified: trunk/blender/source/blender/gpu/GPU_buffers.h
===================================================================
--- trunk/blender/source/blender/gpu/GPU_buffers.h 2012-09-04 00:34:37 UTC (rev 50368)
+++ trunk/blender/source/blender/gpu/GPU_buffers.h 2012-09-04 01:23:50 UTC (rev 50369)
@@ -159,18 +159,18 @@
typedef struct GPU_Buffers GPU_Buffers;
GPU_Buffers *GPU_build_mesh_buffers(int (*face_vert_indices)[4],
- struct MFace *mface, struct MVert *mvert,
- int *face_indices, int totface);
+ struct MFace *mface, struct MVert *mvert,
+ int *face_indices, int totface);
void GPU_update_mesh_buffers(GPU_Buffers *buffers, struct MVert *mvert,
- int *vert_indices, int totvert, const float *vmask);
+ int *vert_indices, int totvert, const float *vmask);
GPU_Buffers *GPU_build_grid_buffers(int *grid_indices, int totgrid,
- unsigned int **grid_hidden, int gridsize);
+ unsigned int **grid_hidden, int gridsize);
void GPU_update_grid_buffers(GPU_Buffers *buffers, struct CCGElem **grids,
- const struct DMFlagMat *grid_flag_mats,
- int *grid_indices, int totgrid, const struct CCGKey *key);
+ const struct DMFlagMat *grid_flag_mats,
+ int *grid_indices, int totgrid, const struct CCGKey *key);
void GPU_draw_buffers(GPU_Buffers *buffers, DMSetMaterial setMaterial);
Modified: trunk/blender/source/blender/imbuf/IMB_imbuf.h
===================================================================
--- trunk/blender/source/blender/imbuf/IMB_imbuf.h 2012-09-04 00:34:37 UTC (rev 50368)
+++ trunk/blender/source/blender/imbuf/IMB_imbuf.h 2012-09-04 01:23:50 UTC (rev 50369)
@@ -483,8 +483,8 @@
/* this should not be here, really, we needed it for operating on render data, IMB_rectfill_area calls it */
void buf_rectfill_area(unsigned char *rect, float *rectf, int width, int height,
- const float col[4], const int do_color_management,
- int x1, int y1, int x2, int y2);
+ const float col[4], const int do_color_management,
+ int x1, int y1, int x2, int y2);
/* defined in metadata.c */
int IMB_metadata_change_field(struct ImBuf *img, const char *key, const char *field);
Modified: trunk/blender/source/blender/render/extern/include/RE_render_ext.h
===================================================================
--- trunk/blender/source/blender/render/extern/include/RE_render_ext.h 2012-09-04 00:34:37 UTC (rev 50368)
+++ trunk/blender/source/blender/render/extern/include/RE_render_ext.h 2012-09-04 01:23:50 UTC (rev 50369)
@@ -65,7 +65,7 @@
struct Material *RE_init_sample_material(struct Material *orig_mat, struct Scene *scene);
void RE_free_sample_material(struct Material *mat);
void RE_sample_material_color(struct Material *mat, float color[3], float *alpha, const float volume_co[3], const float surface_co[3],
- int face_index, short hit_quad, struct DerivedMesh *orcoDm, struct Object *ob);
+ int face_index, short hit_quad, struct DerivedMesh *orcoDm, struct Object *ob);
#endif /* __RE_RENDER_EXT_H__ */
Modified: trunk/blender/source/blender/render/intern/include/pixelshading.h
===================================================================
--- trunk/blender/source/blender/render/intern/include/pixelshading.h 2012-09-04 00:34:37 UTC (rev 50368)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list