Commit: 5d3b635d310d39ca1e8fba85de313623c8d0c238
Author: Jason Wilkins
Date: Thu May 29 22:56:55 2014 -0500
https://developer.blender.org/rB5d3b635d310d39ca1e8fba85de313623c8d0c238
Fixed compile errors associated with merge from soc-2013-viewport_fx and
MSVC2010
not tested
===================================================================
M source/blender/blenfont/intern/blf.c
M source/blender/blenfont/intern/blf_font.c
M source/blender/blenfont/intern/blf_glyph.c
M source/blender/blenkernel/BKE_DerivedMesh.h
M source/blender/blenkernel/intern/cdderivedmesh.c
M source/blender/blenkernel/intern/editderivedmesh.c
M source/blender/blenkernel/intern/subsurf_ccg.c
M source/blender/blenlib/BLI_bitmap.h
M source/blender/blenlib/intern/math_matrix.c
M source/blender/editors/animation/anim_channels_defines.c
M source/blender/editors/include/ED_keyframing.h
M source/blender/editors/interface/interface.c
M source/blender/editors/interface/interface_draw.c
M source/blender/editors/interface/interface_panel.c
M source/blender/editors/mask/mask_draw.c
M source/blender/editors/screen/area.c
M source/blender/editors/sculpt_paint/paint_image_proj.c
M source/blender/editors/sculpt_paint/sculpt_uv.c
M source/blender/editors/space_image/image_draw.c
M source/blender/editors/space_logic/logic_window.c
M source/blender/editors/space_sequencer/sequencer_draw.c
M source/blender/editors/space_view3d/drawmesh.c
M source/blender/editors/space_view3d/drawobject.c
M source/blender/editors/space_view3d/view3d_draw.c
M source/blender/editors/space_view3d/view3d_intern.h
M source/blender/editors/transform/transform_manipulator.c
M source/blender/gpu/GPU_deprecated.h
M source/blender/gpu/GPU_extensions.h
M source/blender/gpu/intern/gpu_buffers.c
M source/blender/gpu/intern/gpu_draw.c
M source/blender/gpu/intern/gpu_pixels.c
===================================================================
diff --git a/source/blender/blenfont/intern/blf.c
b/source/blender/blenfont/intern/blf.c
index 0324650..097c000 100644
--- a/source/blender/blenfont/intern/blf.c
+++ b/source/blender/blenfont/intern/blf.c
@@ -164,10 +164,10 @@ static int blf_global_font_init(void)
if (global_font_default == -1) {
printf("Warning: Can't find default font!\n");
- return FALSE;
+ return false;
}
else {
- return TRUE;
+ return true;
}
}
diff --git a/source/blender/blenfont/intern/blf_font.c
b/source/blender/blenfont/intern/blf_font.c
index 6bc5cd3..aa3fff7 100644
--- a/source/blender/blenfont/intern/blf_font.c
+++ b/source/blender/blenfont/intern/blf_font.c
@@ -180,7 +180,7 @@ void blf_font_draw(FontBLF *font, const char *str, size_t
len)
int pen_x = 0, pen_y = 0;
size_t i = 0;
GlyphBLF **glyph_ascii_table = font->glyph_cache->glyph_ascii_table;
- int needs_end = FALSE;
+ int needs_end = false;
BLF_KERNING_VARS(font, has_kerning, kern_mode);
@@ -219,7 +219,7 @@ void blf_font_draw_ascii(FontBLF *font, const char *str,
size_t len)
FT_Vector delta;
int pen_x = 0, pen_y = 0;
GlyphBLF **glyph_ascii_table = font->glyph_cache->glyph_ascii_table;
- int needs_end = FALSE;
+ int needs_end = false;
BLF_KERNING_VARS(font, has_kerning, kern_mode);
@@ -256,7 +256,7 @@ int blf_font_draw_mono(FontBLF *font, const char *str,
size_t len, int cwidth)
int pen_x = 0, pen_y = 0;
size_t i = 0;
GlyphBLF **glyph_ascii_table = font->glyph_cache->glyph_ascii_table;
- int needs_end = FALSE;
+ int needs_end = false;
blf_font_ensure_ascii_table(font);
diff --git a/source/blender/blenfont/intern/blf_glyph.c
b/source/blender/blenfont/intern/blf_glyph.c
index c2cb7c4..dcde9a6 100644
--- a/source/blender/blenfont/intern/blf_glyph.c
+++ b/source/blender/blenfont/intern/blf_glyph.c
@@ -420,8 +420,8 @@ void blf_glyph_render(
if (!need_begin) {
gpuEnd();
- need_begin = TRUE;
- *needs_end = FALSE;
+ need_begin = true;
+ *needs_end = false;
}
GPU_CHECK_NO_ERROR();
@@ -489,14 +489,14 @@ GPU_CHECK_NO_ERROR();
if (font->tex_bind_state != g->tex) {
if (!need_begin) {
gpuEnd();
- need_begin = TRUE;
+ need_begin = true;
}
gpuBindTexture(GL_TEXTURE_2D, (font->tex_bind_state = g->tex));
}
if (need_begin) {
gpuBegin(GL_QUADS);
- *needs_end = TRUE;
+ *needs_end = true;
}
if (font->flags & BLF_SHADOW) {
diff --git a/source/blender/blenkernel/BKE_DerivedMesh.h
b/source/blender/blenkernel/BKE_DerivedMesh.h
index 1298104..1c0a5ef 100644
--- a/source/blender/blenkernel/BKE_DerivedMesh.h
+++ b/source/blender/blenkernel/BKE_DerivedMesh.h
@@ -177,9 +177,8 @@ typedef enum DMDirtyFlag {
DM_DIRTY_NORMALS = 1 << 2,
} DMDirtyFlag;
-typedef struct DerivedMesh DerivedMesh;
-struct DerivedMesh {
- /** Private DerivedMesh data, only for internal DerivedMesh use */
+typedef struct DerivedMesh {
+ /** Private struct DerivedMesh data, only for internal struct
DerivedMesh use */
CustomData vertData, edgeData, faceData, loopData, polyData;
int numVertData, numEdgeData, numTessFaceData, numLoopData, numPolyData;
int needsFree; /* checked on ->release, is set to 0 for cached results
*/
@@ -196,102 +195,102 @@ struct DerivedMesh {
char cd_flag;
/** Calculate vert and face normals */
- void (*calcNormals)(DerivedMesh *dm);
+ void (*calcNormals)(struct DerivedMesh *dm);
/** Calculate loop (split) normals */
- void (*calcLoopNormals)(DerivedMesh *dm, const float split_angle);
+ void (*calcLoopNormals)(struct DerivedMesh *dm, const float
split_angle);
/** Recalculates mesh tessellation */
- void (*recalcTessellation)(DerivedMesh *dm);
+ void (*recalcTessellation)(struct DerivedMesh *dm);
/* Misc. Queries */
/* Also called in Editmode */
- int (*getNumVerts)(DerivedMesh *dm);
- int (*getNumEdges)(DerivedMesh *dm);
- int (*getNumTessFaces)(DerivedMesh *dm);
- int (*getNumLoops)(DerivedMesh *dm);
- int (*getNumPolys)(DerivedMesh *dm);
+ int (*getNumVerts)(struct DerivedMesh *dm);
+ int (*getNumEdges)(struct DerivedMesh *dm);
+ int (*getNumTessFaces)(struct DerivedMesh *dm);
+ int (*getNumLoops)(struct DerivedMesh *dm);
+ int (*getNumPolys)(struct DerivedMesh *dm);
/** Copy a single vert/edge/tessellated face from the derived mesh into
* *{vert/edge/face}_r. note that the current implementation
* of this function can be quite slow, iterating over all
* elements (editmesh)
*/
- void (*getVert)(DerivedMesh *dm, int index, struct MVert *r_vert);
- void (*getEdge)(DerivedMesh *dm, int index, struct MEdge *r_edge);
- void (*getTessFace)(DerivedMesh *dm, int index, struct MFace *r_face);
+ void (*getVert)(struct DerivedMesh *dm, int index, struct MVert
*r_vert);
+ void (*getEdge)(struct DerivedMesh *dm, int index, struct MEdge
*r_edge);
+ void (*getTessFace)(struct DerivedMesh *dm, int index, struct MFace
*r_face);
/** Return a pointer to the entire array of verts/edges/face from the
* derived mesh. if such an array does not exist yet, it will be
created,
* and freed on the next ->release(). consider using getVert/Edge/Face
if
* you are only interested in a few verts/edges/faces.
*/
- struct MVert *(*getVertArray)(DerivedMesh * dm);
- struct MEdge *(*getEdgeArray)(DerivedMesh * dm);
- struct MFace *(*getTessFaceArray)(DerivedMesh * dm);
- struct MLoop *(*getLoopArray)(DerivedMesh * dm);
- struct MPoly *(*getPolyArray)(DerivedMesh * dm);
+ struct MVert *(*getVertArray)(struct DerivedMesh * dm);
+ struct MEdge *(*getEdgeArray)(struct DerivedMesh * dm);
+ struct MFace *(*getTessFaceArray)(struct DerivedMesh * dm);
+ struct MLoop *(*getLoopArray)(struct DerivedMesh * dm);
+ struct MPoly *(*getPolyArray)(struct DerivedMesh * dm);
/** Copy all verts/edges/faces from the derived mesh into
* *{vert/edge/face}_r (must point to a buffer large enough)
*/
- void (*copyVertArray)(DerivedMesh *dm, struct MVert *r_vert);
- void (*copyEdgeArray)(DerivedMesh *dm, struct MEdge *r_edge);
- void (*copyTessFaceArray)(DerivedMesh *dm, struct MFace *r_face);
- void (*copyLoopArray)(DerivedMesh *dm, struct MLoop *r_loop);
- void (*copyPolyArray)(DerivedMesh *dm, struct MPoly *r_poly);
+ void (*copyVertArray)(struct DerivedMesh *dm, struct MVert *r_vert);
+ void (*copyEdgeArray)(struct DerivedMesh *dm, struct MEdge *r_edge);
+ void (*copyTessFaceArray)(struct DerivedMesh *dm, struct MFace *r_face);
+ void (*copyLoopArray)(struct DerivedMesh *dm, struct MLoop *r_loop);
+ void (*copyPolyArray)(struct DerivedMesh *dm, struct MPoly *r_poly);
/** Return a copy of all verts/edges/faces from the derived mesh
* it is the caller's responsibility to free the returned pointer
*/
- struct MVert *(*dupVertArray)(DerivedMesh * dm);
- struct MEdge *(*dupEdgeArray)(DerivedMesh * dm);
- struct MFace *(*dupTessFaceArray)(DerivedMesh * dm);
- struct MLoop *(*dupLoopArray)(DerivedMesh * dm);
- struct MPoly *(*dupPolyArray)(DerivedMesh * dm);
+ struct MVert *(*dupVertArray)(struct DerivedMesh * dm);
+ struct MEdge *(*dupEdgeArray)(struct DerivedMesh * dm);
+ struct MFace *(*dupTessFaceArray)(struct DerivedMesh * dm);
+ struct MLoop *(*dupLoopArray)(struct DerivedMesh * dm);
+ struct MPoly *(*dupPolyArray)(struct DerivedMesh * dm);
/** Return a pointer to a single element of vert/edge/face custom data
* from the derived mesh (this gives a pointer to the actual data, not
* a copy)
*/
- void *(*getVertData)(DerivedMesh *dm, int index, int type);
- void *(*getEdgeData)(DerivedMesh *dm, int index, int type);
- void *(*getTessFaceData)(DerivedMesh *dm, int index, int type);
- void *(*getPolyData)(DerivedMesh *dm, int index, int type);
+ void *(*getVertData)(struct DerivedMesh *dm, int index, int type);
+ void *(*getEdgeData)(struct DerivedMesh *dm, int index, int type);
+ void *(*getTessFaceData)(struct DerivedMesh *dm, int index, int type);
+ void *(*getPolyData)(struct DerivedMesh *dm, int index, int type);
/** Return a pointer to the entire array of vert/edge/face custom data
* from the derived mesh (this gives a pointer to the actual data, not
* a copy)
*/
- void *(*getVertDataArray)(DerivedMesh *dm, int type);
- void *(*getEdgeDataArray)(DerivedMesh *dm, int type);
- void *(*getTessFaceDataArray)(DerivedMesh *dm, int type);
- void *(*getLoopDataArray)(DerivedMesh *dm, int type);
- void *(*getPolyDataArray)(DerivedMesh *dm, int type);
+ void *(*getVertDataArray)(struct DerivedMesh *dm, int type);
+ void *(*getEdgeDataArray)(struct DerivedMesh *dm, int type);
+ void *(*getTessFaceDataArray)(struct DerivedMesh *dm, int type);
+ void *(*getLoopDataArray)(struct DerivedMesh *dm, int type);
+ void *(*getPolyDataArray)(struct DerivedMesh *dm, int type);
/** Retrieves the base CustomData structures for
* verts/edges/tessfaces/loops/facdes*/
- CustomData *(*getVertDataLayout)(DerivedMesh * dm);
- CustomData *(*getEdgeDataLayout)(DerivedMesh * dm);
- CustomData *(*getTessFaceDataLayout)(DerivedMesh * dm);
- CustomData *(*getLoopDataLayout)(DerivedMesh * dm);
- CustomData *(*getPolyDataLayout)(DerivedMesh * dm);
+ CustomData *(*getVertDataLayout)(struct DerivedMesh * dm);
+ CustomData *(*getEdgeDataLayout)(struct DerivedMesh * dm);
+ CustomData *(*getTessFaceDataLayout)(struct DerivedMesh * dm);
+ CustomData *(*getLoopDataLayout)(struct DerivedMesh * dm);
+ CustomData *(*getPolyDataLayout)(struct DerivedMesh * dm);
/** Copies all customdata for an element source into dst at index dest
*/
- void (*copyFromVertCData)(DerivedMesh *dm, int source, CustomData *dst,
int dest);
- void (*copyFromEdgeCData)(DerivedMesh *dm, int source, CustomData *dst,
int dest);
- void (*copyFromFaceCData)(DerivedMesh *dm, int source, CustomData *dst,
int dest);
+ void (*copyFromVertCData)(struct DerivedMesh *dm, int source,
CustomData *dst, int dest);
+ void (*copyFromEdgeCData)(struct DerivedMesh *dm, int source,
CustomData *dst, int dest);
+ void (*copyFromFaceCData)(struct DerivedMesh *dm, int source,
CustomData *dst, int dest);
/** Optional grid access for subsurf */
- int (*getNumGrids)(DerivedMesh *dm);
- int (*getGridSize)(DerivedMesh *dm);
- struct CCGElem **(*getGridData)(DerivedMesh * dm);
- DMGridAdjacency *(*getGridAdjacency)(DerivedMesh * dm);
- int *(*getGridOffset)(DerivedMesh *
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
