From 20f7aaf6be0dc186f6551761693133bb562a5be1 Mon Sep 17 00:00:00 2001 From: Antony Riakiotakis Date: Tue, 6 May 2014 23:30:51 +0300 Subject: Fix issue discovered while investigating T39950: Sculpt mode drawing fails after deleting a subsurf modifier in sculpt mode and undoing. This was quite difficult to spot. Main cause was that mesh data was not synchronized properly between undo and sculpt code because we generated a pbvh on derivedmesh invalidation without really refreshing the rest of the data. This could result in undo and drawing operating on different data. To solve this and avoid bad level calls I had to move quite some code around. Crazyspace is now moved to blenkernel, as did some sculpt calls that make sure sculpt data are properly refreshed. --- source/blender/blenkernel/BKE_paint.h | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'source/blender/blenkernel/BKE_paint.h') diff --git a/source/blender/blenkernel/BKE_paint.h b/source/blender/blenkernel/BKE_paint.h index df72cb988b1..cb521382bd3 100644 --- a/source/blender/blenkernel/BKE_paint.h +++ b/source/blender/blenkernel/BKE_paint.h @@ -47,6 +47,7 @@ struct Object; struct Paint; struct PBVH; struct Scene; +struct Sculpt; struct StrokeCache; struct Tex; struct ImagePool; @@ -176,4 +177,14 @@ void free_sculptsession(struct Object *ob); void free_sculptsession_deformMats(struct SculptSession *ss); void sculptsession_bm_to_me(struct Object *ob, bool reorder); void sculptsession_bm_to_me_for_render(struct Object *object); +void sculpt_update_mesh_elements(struct Scene *scene, struct Sculpt *sd, struct Object *ob, + bool need_pmap, bool need_mask); +struct MultiresModifierData *sculpt_multires_active(struct Scene *scene, struct Object *ob); +int ED_sculpt_mask_layers_ensure(struct Object *ob, + struct MultiresModifierData *mmd); + +enum { + ED_SCULPT_MASK_LAYER_CALC_VERT = (1 << 0), + ED_SCULPT_MASK_LAYER_CALC_LOOP = (1 << 1) +}; #endif -- cgit v1.2.3 From 2e07109febc31f86763a53d08bae66f7fe421619 Mon Sep 17 00:00:00 2001 From: Antony Riakiotakis Date: Wed, 7 May 2014 02:59:23 +0300 Subject: Code cleanup: naming. Prepend BKE_ to the functions moved in blenkernel for recent bug fix. --- source/blender/blenkernel/BKE_paint.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'source/blender/blenkernel/BKE_paint.h') diff --git a/source/blender/blenkernel/BKE_paint.h b/source/blender/blenkernel/BKE_paint.h index cb521382bd3..0061280684f 100644 --- a/source/blender/blenkernel/BKE_paint.h +++ b/source/blender/blenkernel/BKE_paint.h @@ -173,18 +173,18 @@ typedef struct SculptSession { int average_stroke_counter; } SculptSession; -void free_sculptsession(struct Object *ob); -void free_sculptsession_deformMats(struct SculptSession *ss); -void sculptsession_bm_to_me(struct Object *ob, bool reorder); -void sculptsession_bm_to_me_for_render(struct Object *object); -void sculpt_update_mesh_elements(struct Scene *scene, struct Sculpt *sd, struct Object *ob, +void BKE_free_sculptsession(struct Object *ob); +void BKE_free_sculptsession_deformMats(struct SculptSession *ss); +void BKE_sculptsession_bm_to_me(struct Object *ob, bool reorder); +void BKE_sculptsession_bm_to_me_for_render(struct Object *object); +void BKE_sculpt_update_mesh_elements(struct Scene *scene, struct Sculpt *sd, struct Object *ob, bool need_pmap, bool need_mask); -struct MultiresModifierData *sculpt_multires_active(struct Scene *scene, struct Object *ob); -int ED_sculpt_mask_layers_ensure(struct Object *ob, +struct MultiresModifierData *BKE_sculpt_multires_active(struct Scene *scene, struct Object *ob); +int BKE_sculpt_mask_layers_ensure(struct Object *ob, struct MultiresModifierData *mmd); enum { - ED_SCULPT_MASK_LAYER_CALC_VERT = (1 << 0), - ED_SCULPT_MASK_LAYER_CALC_LOOP = (1 << 1) + SCULPT_MASK_LAYER_CALC_VERT = (1 << 0), + SCULPT_MASK_LAYER_CALC_LOOP = (1 << 1) }; #endif -- cgit v1.2.3