Blender Git Commits

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

Render Branch: disable some lowres/highres raytracing code, isn't working
well and causing some problems.

Render Branch: fix ray shadow samples not being taken into account correctly.

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

Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r29923:29994

* 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

Experimental feature, multires apply base, as suggested by renderdemon

* Attempts to fix the "spike" problem with multires
* For example, take the grab brush and pulling a large chunk of the mesh around will create ugly spikes at lower levels
* Another problem is that a multires mesh heavily changed in sculpt mode will still have the original shape in editmode, which might not be very useful
* Solution here is a new operator "Apply Base" that modifies the mesh to conform better to the sculpt multires mesh.
* Like applying the modifier, this changes actual mesh data, not disps
* Some attempt is made to avoid shrinking the base mesh too much, but the algorithm used is just my guess based on how catmull clark behaves
* So far as I know there are no published algorithms for correctly reversing catmull clark when the subdivided mesh has been deformed

* 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.

* fixed python syntax error

* The filter function submitted to template_ID can override dot prefix hiding of names by returning true for such a name. This will be used to allow hiding of image icons in other menus while still showing them in the brush icon roll out.

* I have everything set up to only show names that begin with .imageicon., however I have not hooked it up in the UI because I believe that the open function for icons should automatically rename the image id blocks by prefixing them with .imageicon. and doing so will require a lot more work.
For that reason I'm going to leave this as is for now, also there may be a better solution.

Merged with trunk: 29341-29923