HooglyBoogly/blender
1
1
Fork 0
forked from blender/blender
Code Pull Requests Activity

Cleanup: Reduce use and scope of templates in vertex paint #2

Closed
Hans Goudey wants to merge 10 commits from paint-vertex-fewer-templates into main
pull from: paint-vertex-fewer-templates
merge into: HooglyBoogly:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 0 Commits 10 Files Changed 5 +2 -2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0965c732d2 - Show all commits

2
source/blender/editors/sculpt_paint/sculpt.cc
View File

@ -4323,7 +4323,7 @@ void SCULPT_cache_free(StrokeCache *cache)
MEM_SAFE_FREE(cache->detail_directions); MEM_SAFE_FREE(cache->detail_directions);
MEM_SAFE_FREE(cache->prev_displacement); MEM_SAFE_FREE(cache->prev_displacement);
MEM_SAFE_FREE(cache->limit_surface_co); MEM_SAFE_FREE(cache->limit_surface_co);
MEM_SAFE_FREE(cache->prev_colors_vpaint); cache->prev_colors_vpaint = {};
if (cache->pose_ik_chain) { if (cache->pose_ik_chain) {
SCULPT_pose_ik_chain_free(cache->pose_ik_chain); SCULPT_pose_ik_chain_free(cache->pose_ik_chain);

2
source/blender/editors/sculpt_paint/sculpt_intern.hh
View File

@ -555,7 +555,7 @@ struct StrokeCache {
float mouse_event[2]; float mouse_event[2];
float (*prev_colors)[4]; float (*prev_colors)[4];
void *prev_colors_vpaint; GArray<> prev_colors_vpaint;
/* Multires Displacement Smear. */ /* Multires Displacement Smear. */
float (*prev_displacement)[3]; float (*prev_displacement)[3];