[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38731] branches/soc-2011-onion/source: compile fixes for gcc, Jason, I also added a dummy void paint_flip_coord( float out[3], const float in[3], int mirror_symm){} at the end of paint_dub .c because it was missing.
Antony Riakiotakis
kalast at gmail.com
Tue Jul 26 16:28:26 CEST 2011
Revision: 38731
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38731
Author: psy-fi
Date: 2011-07-26 14:28:25 +0000 (Tue, 26 Jul 2011)
Log Message:
-----------
compile fixes for gcc, Jason, I also added a dummy void paint_flip_coord(float out[3], const float in[3], int mirror_symm){} at the end of paint_dub.c because it was missing. Let me know if i broke anything
Modified Paths:
--------------
branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_dab.c
branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_intern.h
branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_meshcache.c
branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_stroke.h
branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_texcache.c
branches/soc-2011-onion/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2011-onion/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2011-onion/source/blenderplayer/bad_level_call_stubs/stubs.c
Modified: branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_dab.c
===================================================================
--- branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_dab.c 2011-07-26 13:56:31 UTC (rev 38730)
+++ branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_dab.c 2011-07-26 14:28:25 UTC (rev 38731)
@@ -369,3 +369,5 @@
{
return (1.0f-mask)*brush_curve_strength(brush, dist, bspace->radius3d);
}
+
+void paint_flip_coord(float out[3], const float in[3], int mirror_symm){}
Modified: branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_intern.h
===================================================================
--- branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_intern.h 2011-07-26 13:56:31 UTC (rev 38730)
+++ branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_intern.h 2011-07-26 14:28:25 UTC (rev 38731)
@@ -38,6 +38,24 @@
#include "ED_view3d.h"
+struct bContext;
+struct wmWindowManager;
+struct Paint;
+struct PaintStroke;
+struct VPaint;
+struct Object;
+struct wmOperatorType;
+struct Brush;
+struct ViewContext;
+struct Mesh;
+struct Scene;
+struct BrushSpace;
+struct PaintSessionMeshcache;
+struct SculptUndoNode;
+struct KeyBlock;
+struct PaintSession;
+struct PaintSessionTexcache;
+struct PaintStrokeParams;
/* paint_bspace.c */
Modified: branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_meshcache.c
===================================================================
--- branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_meshcache.c 2011-07-26 13:56:31 UTC (rev 38730)
+++ branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_meshcache.c 2011-07-26 14:28:25 UTC (rev 38731)
@@ -69,6 +69,7 @@
#include "paint_intern.h"
#include "sculpt_intern.h"
+#include <limits.h> /* For gcc INT_MAX */
typedef struct PaintSessionMeshcache {
Modified: branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_stroke.h
===================================================================
--- branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_stroke.h 2011-07-26 13:56:31 UTC (rev 38730)
+++ branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_stroke.h 2011-07-26 14:28:25 UTC (rev 38731)
@@ -33,6 +33,12 @@
#ifndef ED_PAINT_STROKE_H
#define ED_PAINT_STROKE_H
+struct PaintStroke;
+struct bContext;
+struct wmOperator;
+struct wmEvent;
+struct wmOperatorType;
+struct wmKeyConfig;
typedef struct PaintStrokeParams {
int flag;
Modified: branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_texcache.c
===================================================================
--- branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_texcache.c 2011-07-26 13:56:31 UTC (rev 38730)
+++ branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_texcache.c 2011-07-26 14:28:25 UTC (rev 38731)
@@ -402,7 +402,7 @@
*/
float brush_tex_strength(
const struct ViewContext *vc,
- float UNUSED(pmat)[4][4],
+ float UNUSED(pmat[4][4]),
float symm_brush_local_mat[4][4],
int mirror_pass,
struct Brush *br,
Modified: branches/soc-2011-onion/source/blender/editors/uvedit/uvedit_ops.c
===================================================================
--- branches/soc-2011-onion/source/blender/editors/uvedit/uvedit_ops.c 2011-07-26 13:56:31 UTC (rev 38730)
+++ branches/soc-2011-onion/source/blender/editors/uvedit/uvedit_ops.c 2011-07-26 14:28:25 UTC (rev 38731)
@@ -2184,9 +2184,7 @@
{
/* same as above but for two verts. Maybe make a function for this after implementation is concrete */
UvElement *element = stitch_state->vmap->vert[hit.vert];
- //UvElement *element2 = stitch_state->vmap->vert[hit.vert2];
- //UvElement *firstCoincident;
for(; element; element = element->next)
{
int nverts = element->face->v4 ? 4 : 3;
@@ -2201,19 +2199,15 @@
{
if(event->ctrl){
uvedit_uv_deselect(scene, element->face, tface, element->tfindex);
- //uvedit_uv_deselect(scene, element->face, tface, (element->tfindex + 1)%nverts);
}
else{
uvedit_uv_select(scene, element->face, tface, element->tfindex);
- //uvedit_uv_select(scene, element->face, tface, (element->tfindex + 1)%nverts);
}
}else{
if(event->ctrl){
- //uvedit_uv_deselect(scene, element->face, tface, element->tfindex);
uvedit_uv_deselect(scene, element->face, tface, (element->tfindex - 1 + nverts)%nverts);
}
else{
- //uvedit_uv_select(scene, element->face, tface, element->tfindex);
uvedit_uv_select(scene, element->face, tface, (element->tfindex - 1 + nverts)%nverts);
}
}
@@ -2221,9 +2215,7 @@
if(nextflag)
{
uvedit_uv_deselect(scene, element->face, tface, element->tfindex);
- //uvedit_uv_deselect(scene, element->face, tface, (element->tfindex + 1)%nverts);
}else{
- //uvedit_uv_deselect(scene, element->face, tface, element->tfindex);
uvedit_uv_deselect(scene, element->face, tface, (element->tfindex - 1 + nverts)%nverts);
}
}
Modified: branches/soc-2011-onion/source/blender/makesdna/DNA_userdef_types.h
===================================================================
--- branches/soc-2011-onion/source/blender/makesdna/DNA_userdef_types.h 2011-07-26 13:56:31 UTC (rev 38730)
+++ branches/soc-2011-onion/source/blender/makesdna/DNA_userdef_types.h 2011-07-26 14:28:25 UTC (rev 38731)
@@ -241,6 +241,7 @@
char preview_stitch_vert[4];
char preview_stitch_stitchable[4];
char preview_stitch_unstitchable[4];
+ char apad[4];
} ThemeSpace;
Modified: branches/soc-2011-onion/source/blenderplayer/bad_level_call_stubs/stubs.c
===================================================================
--- branches/soc-2011-onion/source/blenderplayer/bad_level_call_stubs/stubs.c 2011-07-26 13:56:31 UTC (rev 38730)
+++ branches/soc-2011-onion/source/blenderplayer/bad_level_call_stubs/stubs.c 2011-07-26 14:28:25 UTC (rev 38731)
@@ -418,7 +418,7 @@
void sculpt_set_brush_unprojected_radius(struct Brush *brush, float unprojected_radius){}
float sculpt_get_brush_alpha(struct Brush *brush){return 0.0f;}
void sculpt_set_brush_alpha(struct Brush *brush, float alpha){}
-void ED_sculpt_modifiers_changed(struct Object *ob){};
+void ED_paint_mesh_modifiers_changed(struct Object *ob){};
/* bpy/python internal api */
More information about the Bf-blender-cvs
mailing list