Revision: 21201
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21201
Author: nicholasbishop
Date: 2009-06-27 23:14:04 +0200 (Sat, 27 Jun 2009)
Log Message:
-----------
2.5/Sculpt:
Improved sculpting in perspective mode; starting a stroke on the background
would sometimes result in the brush having a huge effect on the mesh. Fixed by
waiting to start the stroke until the mouse moves over the model.
The fix is not quite perfect, because detection of the edge of the model is
based on the depth buffer, so other things that change the depth buffer, like
the grid and axis lines in the 3d view, can throw off the calculation.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/editors/sculpt_paint/sculpt.c
Modified:
branches/blender2.5/blender/source/blender/editors/sculpt_paint/sculpt.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/sculpt_paint/sculpt.c
2009-06-27 17:14:14 UTC (rev 21200)
+++ branches/blender2.5/blender/source/blender/editors/sculpt_paint/sculpt.c
2009-06-27 21:14:04 UTC (rev 21201)
@@ -1343,10 +1343,7 @@
Sculpt *sd = CTX_data_tool_settings(C)->sculpt;
view3d_operator_needs_opengl(C);
- sculpt_brush_stroke_init_properties(C, op, event, sd->session);
- sculptmode_update_all_projverts(sd->session);
-
/* TODO: Shouldn't really have to do this at the start of every
stroke, but sculpt would need some sort of notification when
changes are made to the texture. */
@@ -1414,35 +1411,54 @@
{
PointerRNA itemptr;
Sculpt *sd = CTX_data_tool_settings(C)->sculpt;
+ ARegion *ar = CTX_wm_region(C);
float center[3];
int mouse[2] = {event->x, event->y};
+ float cur_depth;
sculpt_update_mesh_elements(C);
- unproject(sd->session->cache->mats, center, event->x, event->y,
- read_cached_depth(&sd->session->cache->vc, event->x,
event->y));
+ if(!sd->session->cache) {
+ ViewContext vc;
+ view3d_set_viewcontext(C, &vc);
+ cur_depth = read_cached_depth(&vc, event->x, event->y);
- /* Add to stroke */
- RNA_collection_add(op->ptr, "stroke", &itemptr);
- RNA_float_set_array(&itemptr, "location", center);
- RNA_int_set_array(&itemptr, "mouse", mouse);
- RNA_boolean_set(&itemptr, "flip", event->shift);
- sculpt_update_cache_variants(sd, &itemptr);
+ /* Don't start the stroke until a valid depth is found */
+ if(cur_depth < 1.0 - FLT_EPSILON) {
+ sculpt_brush_stroke_init_properties(C, op, event,
sd->session);
+ sculptmode_update_all_projverts(sd->session);
+ }
- sculpt_restore_mesh(sd);
- do_symmetrical_brush_actions(CTX_data_tool_settings(C)->sculpt,
sd->session->cache);
+ ED_region_tag_redraw(ar);
+ }
- sculpt_flush_update(C);
- sculpt_post_stroke_free(sd->session);
+ if(sd->session->cache) {
+ cur_depth = read_cached_depth(&sd->session->cache->vc,
event->x, event->y);
+ unproject(sd->session->cache->mats, center, event->x, event->y,
cur_depth);
+ /* Add to stroke */
+ RNA_collection_add(op->ptr, "stroke", &itemptr);
+ RNA_float_set_array(&itemptr, "location", center);
+ RNA_int_set_array(&itemptr, "mouse", mouse);
+ RNA_boolean_set(&itemptr, "flip", event->shift);
+ sculpt_update_cache_variants(sd, &itemptr);
+
+ sculpt_restore_mesh(sd);
+ do_symmetrical_brush_actions(CTX_data_tool_settings(C)->sculpt,
sd->session->cache);
+
+ sculpt_flush_update(C);
+ sculpt_post_stroke_free(sd->session);
+ }
+
/* Finished */
if(event->type == LEFTMOUSE && event->val == 0) {
- request_depth_update(sd->session->cache->vc.rv3d);
+ if(sd->session->cache) {
+ request_depth_update(sd->session->cache->vc.rv3d);
+ sculpt_cache_free(sd->session->cache);
+ sd->session->cache = NULL;
+ sculpt_undo_push(C, sd);
+ }
- sculpt_cache_free(sd->session->cache);
-
- sculpt_undo_push(C, sd);
-
return OPERATOR_FINISHED;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
