diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-03-26 02:34:01 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-03-26 02:34:01 +0400 |
commit | bd65fc176d39f8b083e0dbb7c6fda98de896257d (patch) | |
tree | 363e738ad1a47fb574451bd254c642af6cc9de9b /source/blender/editors/sculpt_paint/paint_intern.h | |
parent | 8703e2fe7e97ddad4f7f5bae8e5c801efbf9dddb (diff) |
revert 0da3e97, fix for T39279
Following problems:
- painting onto a cube asserts immediately (vpaint/wpaint)
- crashes with valgrind (bad memory use)
- the original intended behavior of vertex projection paint no longer works as I intended.
(its constantly refreshing geometry even when no modifiers are applied).
Best get code review for these kinds of changes.
Diffstat (limited to 'source/blender/editors/sculpt_paint/paint_intern.h')
-rw-r--r-- | source/blender/editors/sculpt_paint/paint_intern.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_intern.h b/source/blender/editors/sculpt_paint/paint_intern.h index 5f951f72a21..6dd42380a11 100644 --- a/source/blender/editors/sculpt_paint/paint_intern.h +++ b/source/blender/editors/sculpt_paint/paint_intern.h @@ -118,17 +118,12 @@ void PAINT_OT_vertex_paint(struct wmOperatorType *ot); unsigned int vpaint_get_current_col(struct VPaint *vp); -typedef struct VertProjData { - struct DMCoNo *vcosnos; - float *dists_sq; - float (*ss_co)[2]; -} VertProjData; /* paint_vertex_proj.c */ struct VertProjHandle; struct VertProjHandle *ED_vpaint_proj_handle_create( struct Scene *scene, struct Object *ob, - VertProjData **r_vcosnos); + struct DMCoNo **r_vcosnos); void ED_vpaint_proj_handle_update( struct VertProjHandle *vp_handle, /* runtime vars */ |