Revision: 18758
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18758
Author: nicholasbishop
Date: 2009-01-30 21:35:37 +0100 (Fri, 30 Jan 2009)
Log Message:
-----------
Sculpt:
* Brought back axis locking
* Fixed flipping stroke add/sub with shift key at start of stroke
* Fixed a crash in stroke exec
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/editors/sculpt/sculpt.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_ops.c
branches/blender2.5/blender/source/blender/makesdna/DNA_scene_types.h
Modified: branches/blender2.5/blender/source/blender/editors/sculpt/sculpt.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/sculpt/sculpt.c
2009-01-30 19:14:50 UTC (rev 18757)
+++ branches/blender2.5/blender/source/blender/editors/sculpt/sculpt.c
2009-01-30 20:35:37 UTC (rev 18758)
@@ -275,11 +275,12 @@
static void sculpt_axislock(Sculpt *sd, float *co)
{
- if (sd->flags & (SCULPT_LOCK_X|SCULPT_LOCK_Y|SCULPT_LOCK_Z)) return;
- /* XXX: if(G.vd->twmode == V3D_MANIP_LOCAL) { */
- if(0) {
+ if(sd->flags == (SCULPT_LOCK_X|SCULPT_LOCK_Y|SCULPT_LOCK_Z))
+ return;
+
+ if(sd->session->cache->vc.v3d->twmode == V3D_MANIP_LOCAL) {
float mat[3][3], imat[3][3];
- /* XXX: Mat3CpyMat4(mat, OBACT->obmat); */
+ Mat3CpyMat4(mat, sd->session->cache->vc.obact->obmat);
Mat3Inv(imat, mat);
Mat3MulVecfl(mat, co);
if (sd->flags & SCULPT_LOCK_X) co[0] = 0.0;
@@ -1576,10 +1577,9 @@
}
RNA_END;
+ sculpt_flush_update(C);
sculpt_cache_free(sd->session->cache);
- sculpt_flush_update(C);
-
sculpt_undo_push(C, sd);
return OPERATOR_FINISHED;
Modified:
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_ops.c
===================================================================
---
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_ops.c
2009-01-30 19:14:50 UTC (rev 18757)
+++
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_ops.c
2009-01-30 20:35:37 UTC (rev 18758)
@@ -99,7 +99,8 @@
WM_keymap_verify_item(keymap, "VIEW3D_OT_vpaint", LEFTMOUSE, KM_PRESS,
0, 0);
WM_keymap_verify_item(keymap, "VIEW3D_OT_wpaint", LEFTMOUSE, KM_PRESS,
0, 0);
- WM_keymap_verify_item(keymap, "SCULPT_OT_brush_stroke", LEFTMOUSE,
KM_PRESS, 0, 0);
+ WM_keymap_add_item(keymap, "SCULPT_OT_brush_stroke", LEFTMOUSE,
KM_PRESS, 0, 0);
+ WM_keymap_add_item(keymap, "SCULPT_OT_brush_stroke", LEFTMOUSE,
KM_PRESS, KM_SHIFT, 0);
WM_keymap_verify_item(keymap, "VIEW3D_OT_cursor3d", ACTIONMOUSE,
KM_PRESS, 0, 0);
Modified: branches/blender2.5/blender/source/blender/makesdna/DNA_scene_types.h
===================================================================
--- branches/blender2.5/blender/source/blender/makesdna/DNA_scene_types.h
2009-01-30 19:14:50 UTC (rev 18757)
+++ branches/blender2.5/blender/source/blender/makesdna/DNA_scene_types.h
2009-01-30 20:35:37 UTC (rev 18758)
@@ -812,16 +812,18 @@
#define FFMPEG_MULTIPLEX_AUDIO 1
#define FFMPEG_AUTOSPLIT_OUTPUT 2
-/* SculptData.flags */
-#define SCULPT_SYMM_X 1
-#define SCULPT_SYMM_Y 2
-#define SCULPT_SYMM_Z 4
-#define SCULPT_INPUT_SMOOTH 8
-#define SCULPT_DRAW_FAST 16
-#define SCULPT_DRAW_BRUSH 32
-#define SCULPT_LOCK_X 64
-#define SCULPT_LOCK_Y 128
-#define SCULPT_LOCK_Z 256
+/* Sculpt.flags */
+typedef enum SculptFlags {
+ SCULPT_SYMM_X = 1,
+ SCULPT_SYMM_Y = 2,
+ SCULPT_SYMM_Z = 4,
+ SCULPT_INPUT_SMOOTH = 8,
+ SCULPT_DRAW_FAST = 16,
+ SCULPT_DRAW_BRUSH = 32,
+ SCULPT_LOCK_X = 64,
+ SCULPT_LOCK_Y = 128,
+ SCULPT_LOCK_Z = 256
+} SculptFlags;
/* toolsettings->imagepaint_flag */
#define IMAGEPAINT_DRAWING 1
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
