Blender Git Loki

Fix build errors under linux, and cleanup a bunch of warnings.

Merge branch 'master' into soc-2016-pbvh-painting

Added initial PBVH creation for weight painting on toggle. PBVH is visible using gui debug number 14.

Copied PBVH painting from dm->drawFacesSolid to draw_mesh_paint.

Added PBVH & drawing to vertex paint. Now free'ing when vertex/weight paint is toggled off.

Changed PBVH material to match sculpt mode.

Merge branch 'master' into soc-2016-pbvh-painting

Remove call to BKE_pbvh_draw from draw_mesh_paint, add pbvh BB drawing to dm's mappedfaces drawing callbacks.

Reading BKE_draw_pbvh code, this function actually handles the whole drawing,
seems like it does a partial update of only modified geometry (optimized drawing
in solid shadding case), don?t think we need that for v/wpaint, at least for now.

So rather just added a call to BKE_pbvh_draw_BB (in case debug value is set)
in dm's mappedfaces drawing callbacks, should do for now.

Moved StrokeCache to sculpt_intern.h and included sculpt_intern.h in paint_vertex.c similar to how sculpt.c includes paint_intern.h.

Alloc'd/free'd a stroke cache in both vertex and weight paint toggles.

separated sculpt and vwpaint init stroke cache variants and invariants. Now creating a stroke cache in weight paint.

Quick bug fix causing sculptcache to crash sculpt.

Added PBVH leaf painting to vertex paint. Weight painting not implemented, but wont take long at all to do.

Merge branch 'master' into soc-2016-pbvh-painting

Preliminary PBVH painting on vertex paint. Should have weight painting at a similar stage relatively soon. Still need to select all leaves within brush region.

Merge branch 'master' into soc-2016-pbvh-painting

Added support for painting multiple leaves at the same time. Also added brush strength and curve fade support. I need to optimize how maps for vert->loops are generated and destroyed.

Now free'ing maps. Removed unused function.

Updated map to be more efficient. Fixed bug with brush radius. Next, looking into getting the nearest ray trace location.

Merge branch 'master' into soc-2016-pbvh-painting

Did a little cleanup. Noticed I

Merge branch 'master' into soc-2016-pbvh-painting

Fixed a bug that was preventing me from implementing the blur functionality. Should have blur working in 24 hours.

Added blur, although I might rename this tool as smudge and make a seperate blur tool.

Forgot to free stroke cache. Something isn't quite right with vert to loop freeing...

Merge branch 'master' into soc-2016-pbvh-painting

Fixed memory leak on map.

Merge branch 'master' into soc-2016-pbvh-painting

Fixed a bug where some vertices under the brush wouldn't paint.

Moved some code around. Got brush strength working.

Moved map creation into the toggle.

Commented out some old code which made the average brush slow. Created a vert to poly map for the blur brush.

Brought back traditional blur, renamed new blur to average, and added an average mode.

Moved maps out of strokecache and into sculptsession.

Merge branch 'soc-2016-pbvh-painting' of git.blender.org:blender into soc-2016-pbvh-painting

Fixed undo bug.

Added mirror painting and radial symmetry.

Merge branch 'master' into soc-2016-pbvh-painting

merged master, but something in the merge broke my windows build, so I had to change something. Also fixed a bug in mirrored painting.

merged master

Added mirror buttons to weight paint, and added pbvh leaf selection and mirrored symmetry code. Still need to create callbacks for pbvh leaf selection.

Rough weight painting working. Fade coming soon.

weight paint is now fading out according to the curve settings. Doing a partial redraw instead of a full screen redraw.

Got the mirror button working. Got multipaint working again.

Changed weight paint to recycle current colors as previous colors instead of copying every weight every click. Also set openMP flags to true, although I still need to add a checkbox in options to enable multiple threads. Added blur support, but...

...still need to add blur support for multi-paint mode.

Copying old wpaints every click is slow in wpaint test start, and only is used to prevent paint overlap. I'm working on doing the same logic using a flag buffer instead, which should speed up the test start. Still need to add blur for multipaint.

...nt. I accidentally removed the accumulate option, but my blur code does essentially the same thing. Will add average brush, since it's been requested a lot.

Working on speeding up wpaint somemore. Added average brush. Average brush is now a default tool option for weight and vertex paint.

Merged master into branch

Merge branch 'master' into soc-2016-pbvh-painting

Forgot to commit modified toolbar.

Merge branch 'soc-2016-pbvh-painting' of git.blender.org:blender into soc-2016-pbvh-painting

Disregard last commit.

Merge branch 'master' into soc-2016-pbvh-painting

Calculating surface normal and direction for smudge, splash prevention, and cone painting

Added smudge tool to vertex paint. WPaint implementation coming soon. Fixed blend to use physically accurate blending model.

added smudge to wpaint. Fixed some strength issues with wpaint. Still need to add spray support.

Merge branch 'master' into soc-2016-pbvh-painting

Merge branch 'master' into soc-2016-pbvh-painting

implemented brush normal based splash prevention

added spray support to weight paint. Vertex paint spray support is giving me grief...

Fixed bug where radial mirror would not work without normal mirror being enabled.

Merge branch 'master' into soc-2016-pbvh-painting

Differential Revision: https://developer.blender.org/D2150

Fixed bug where radial mirror would not work without normal mirror being enabled.

added spray support to weight paint. Vertex paint spray support is giving me grief...

implemented brush normal based splash prevention

Merge branch 'master' into soc-2016-pbvh-painting

Merge branch 'master' into soc-2016-pbvh-painting

added smudge to wpaint. Fixed some strength issues with wpaint. Still need to add spray support.

Added smudge tool to vertex paint. WPaint implementation coming soon. Fixed blend to use physically accurate blending model.

Calculating surface normal and direction for smudge, splash prevention, and cone painting

Merge branch 'master' into soc-2016-pbvh-painting

Conflicts:
source/blender/blenloader/intern/versioning_defaults.c

Disregard last commit.

Merge branch 'soc-2016-pbvh-painting' of git.blender.org:blender into soc-2016-pbvh-painting

Forgot to commit modified toolbar.

Merge branch 'master' into soc-2016-pbvh-painting

Merged master into branch

Working on speeding up wpaint somemore. Added average brush. Average brush is now a default tool option for weight and vertex paint.

Copying old wpaints every click is slow in wpaint test start, and only is used to prevent paint overlap. I'm working on doing the same logic using a flag buffer instead, which should speed up the test start. Still need to add blur for multipaint. I accidentally removed the accumulate option, but my blur code does essentially the same thing. Will add average brush, since it's been requested a lot.

Changed weight paint to recycle current colors as previous colors instead of copying every weight every click. Also set openMP flags to true, although I still need to add a checkbox in options to enable multiple threads. Added blur support, but still need to add blur support for multi-paint mode.