[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30149] branches/soc-2010-jwilkins/source/ blender: fixed DNA and blenderplayer compiling

Tom Musgrove LetterRip at gmail.com
Fri Jul 9 12:14:13 CEST 2010


Revision: 30149
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30149
Author:   letterrip
Date:     2010-07-09 12:14:12 +0200 (Fri, 09 Jul 2010)

Log Message:
-----------
fixed DNA and blenderplayer compiling

Modified Paths:
--------------
    branches/soc-2010-jwilkins/source/blender/makesdna/DNA_color_types.h
    branches/soc-2010-jwilkins/source/blenderplayer/bad_level_call_stubs/stubs.c

Modified: branches/soc-2010-jwilkins/source/blender/makesdna/DNA_color_types.h
===================================================================
--- branches/soc-2010-jwilkins/source/blender/makesdna/DNA_color_types.h	2010-07-09 09:46:22 UTC (rev 30148)
+++ branches/soc-2010-jwilkins/source/blender/makesdna/DNA_color_types.h	2010-07-09 10:14:12 UTC (rev 30149)
@@ -65,6 +65,7 @@
 typedef struct CurveMapping {
 	int flag, cur;					/* cur; for buttons, to show active curve */
 	int preset;
+	int changed_timestamp;
 	
 	rctf curr, clipr;				/* current rect, clip rect (is default rect too) */
 	
@@ -73,8 +74,6 @@
 	float bwmul[3];					/* black/white point multiply value, for speed */
 	
 	float sample[3];				/* sample values, if flag set it draws line and intersection */
-
-	int changed_timestamp;
 } CurveMapping;
 
 /* cumapping->flag */

Modified: branches/soc-2010-jwilkins/source/blenderplayer/bad_level_call_stubs/stubs.c
===================================================================
--- branches/soc-2010-jwilkins/source/blenderplayer/bad_level_call_stubs/stubs.c	2010-07-09 09:46:22 UTC (rev 30148)
+++ branches/soc-2010-jwilkins/source/blenderplayer/bad_level_call_stubs/stubs.c	2010-07-09 10:14:12 UTC (rev 30149)
@@ -36,6 +36,7 @@
 struct ARegion;
 struct ARegionType;
 struct Base;
+struct Brush;
 struct bNodeTree;
 struct CSG_FaceIteratorDescriptor;
 struct CSG_VertexIteratorDescriptor;
@@ -390,6 +391,13 @@
 struct MultiresModifierData *sculpt_multires_active(struct Scene *scene, struct Object *ob) {return (struct MultiresModifierData *) NULL;}
 int sculpt_modifiers_active(struct Scene *scene, struct Object *ob) {return 0;}
 */
+int sculpt_get_brush_size(struct Brush *brush) {return 0;}
+void sculpt_set_brush_size(struct Brush *brush, int size) {}
+int sculpt_get_lock_brush_size(struct Brush *brush){ return 0;}
+float sculpt_get_brush_unprojected_radius(struct Brush *brush){return 0.0f;}
+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){}
 
 char blender_path[] = "";
 





More information about the Bf-blender-cvs mailing list