Revision: 38746
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38746
Author: jwilkins
Date: 2011-07-26 20:58:18 +0000 (Tue, 26 Jul 2011)
Log Message:
-----------
I had missed some renamed rna properties. Also, the default value for jitter
does not work correctly in image paint mode yet, so making the default 0 for
now.
Modified Paths:
--------------
branches/soc-2011-onion/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2011-onion/source/blender/blenloader/intern/readfile.c
branches/soc-2011-onion/source/blender/makesdna/DNA_brush_types.h
Modified:
branches/soc-2011-onion/release/scripts/startup/bl_ui/space_view3d_toolbar.py
===================================================================
---
branches/soc-2011-onion/release/scripts/startup/bl_ui/space_view3d_toolbar.py
2011-07-26 20:22:54 UTC (rev 38745)
+++
branches/soc-2011-onion/release/scripts/startup/bl_ui/space_view3d_toolbar.py
2011-07-26 20:58:18 UTC (rev 38746)
@@ -660,8 +660,8 @@
row.prop(brush, "use_pressure_strength", toggle=True, text="")
row = col.row(align=True)
- row.prop(brush, "jitter", slider=True)
- row.prop(brush, "use_pressure_jitter", toggle=True, text="")
+ row.prop(brush, "jitter_mouse", slider=True)
+ row.prop(brush, "use_pressure_jitter_mouse", toggle=True, text="")
col.prop(brush, "blend", text="Blend")
@@ -685,8 +685,8 @@
row.prop(brush, "use_pressure_strength", toggle=True, text="")
row = col.row(align=True)
- row.prop(brush, "jitter", slider=True)
- row.prop(brush, "use_pressure_jitter", toggle=True, text="")
+ row.prop(brush, "jitter_mouse", slider=True)
+ row.prop(brush, "use_pressure_jitter_mouse", toggle=True, text="")
# Vertex Paint Mode #
elif context.vertex_paint_object and brush:
@@ -717,8 +717,8 @@
# XXX - TODO
#col.separator()
#row = col.row(align=True)
- #row.prop(brush, "jitter", slider=True)
- #row.prop(brush, "use_pressure_jitter", toggle=True, text="")
+ #row.prop(brush, "jitter_mouse", slider=True)
+ #row.prop(brush, "use_pressure_jitter_mouse", toggle=True, text="")
class VIEW3D_PT_tools_select(PaintPanel, bpy.types.Panel):
@@ -1103,8 +1103,8 @@
# col.separator()
# row = col.row(align=True)
- # row.prop(brush, "jitter", slider=True)
- # row.prop(brush, "use_pressure_jitter", toggle=True, text="")
+ # row.prop(brush, "jitter_mouse", slider=True)
+ # row.prop(brush, "use_pressure_jitter_mouse", toggle=True,
text="")
#else:
# row = col.row()
Modified: branches/soc-2011-onion/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/soc-2011-onion/source/blender/blenloader/intern/readfile.c
2011-07-26 20:22:54 UTC (rev 38745)
+++ branches/soc-2011-onion/source/blender/blenloader/intern/readfile.c
2011-07-26 20:58:18 UTC (rev 38746)
@@ -11448,8 +11448,12 @@
brush->snap_mouse[0]= 50;
brush->snap_mouse[1]= 50;
+ /* XXX: these can get default values
after everything has been ported to work with new paint_stroke
brush->jitter_pressure= 0.50;
- brush->jitter_mouse= 0.25;
+ brush->jitter_mouse= 0.25; */
+
+ brush->jitter_pressure= 0;
+ brush->jitter_mouse= 0;
}
}
}
Modified: branches/soc-2011-onion/source/blender/makesdna/DNA_brush_types.h
===================================================================
--- branches/soc-2011-onion/source/blender/makesdna/DNA_brush_types.h
2011-07-26 20:22:54 UTC (rev 38745)
+++ branches/soc-2011-onion/source/blender/makesdna/DNA_brush_types.h
2011-07-26 20:58:18 UTC (rev 38746)
@@ -173,7 +173,7 @@
#define STROKE_ANCHORED (1<<8) /* was BRUSH_ANCHORED */
#define STROKE_TILT (1<<9)
#define STROKE_PATH (1<<10) /* was BRUSH_SPACE */
-#define STROKE_SMOOTH_MOUSE (1<<11) /* was
BRUSH_SMOOTH_STROKE */
+#define STROKE_SMOOTH_MOUSE (1<<11) /* was BRUSH_SMOOTH_STROKE */
#define STROKE_SMOOTH_TILT (1<<12)
#define STROKE_SMOOTH_RAKE (1<<13)
#define STROKE_SMOOTH_PRESSURE (1<<14)
@@ -186,7 +186,7 @@
#define STROKE_PRESSURE_JITTER_PRESSURE (1<<21)
#define STROKE_EDGE_TO_EDGE (1<<22) /* was BRUSH_EDGE_TO_EDGE */
#define STROKE_RESTORE (1<<23) /* was BRUSH_RESTORE_MESH */
-#define STROKE_ONEWAY (1<<24)
+#define STROKE_ONEWAY (1<<24)
#define STROKE_PEN_PRESSURE (1<<25)
#define STROKE_SIMULATE_PRESSURE (1<<26)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
