Blender Git Commits

* more fixing problems caused by past bad merges

Mergopaloza!

29927-30013, 29660, and several other revisions from a month ago that were missed because of my inexperience with merging.

No idea why 29660 was missed since it was in the range of an earlier merge I did...

We'll probably find more missed merges as we continue to try and produce a clean patch.

* more in-between mouse event code from the trunk

* last merge did something weird in paint_image.c

* added code from trunk for getting proper paint events
* cleaned up some commented code

Merged with trunk revision 29465

* Hopefully this will fix a texture paint bug introduced by quieting some warnings earlier. Somebody needs to look at the code (marked with XXX) and see what its supposed to be doing, atm the comment says it does one thing but it does another.

* smooth stroke doesn't work well with anchored or drag dot strokes

* smooth stroke is a modifier of strokes, not a stroke method itself

* made stroke method into a drop down menu
* made modifiers disappear unless they are relevant to current stroke method

* cleaned up stroke panel so that mutually exclusive items are more clearly marked

* on surface brush converts to old style brush when its not on the model
* old style brush no longer disappears when cursor isn't touching the model

* clamp bstrength in smooth to 1 so that it doesn't do more than 4 iterations

* removed deleted property usage from ui

* for some reason rna_sequencer_api.c didn't get added to my local working copy

* on-surface brush cursor now takes scaling into account

Interestingly enough, it also shows the distortion of the brush caused by uneven scaling much better than the normal brush cursor.

* reduced maximum thickness of the on-surface brush to 12% from 16%

* providing separate fragment shaders for GLSlang version 1.00 and 1.30 because apparently some drivers either do not accept shaders marked "#version 100" (which I think is actually the shading language for OpenGL ES) or they do not like old shaders period (unlikely). I also removed the explicit "#version 100" from the old version of the shader.

Although I think all drivers should accept the one version of the shader, it contains code that has been deprecated for about 6 years so may as well provide a version that is not deprecated.

Blender requires fixed function compatibility, so there is no reason at this time to remove or change the shader code that requires fixed-function compatibility.