Blender Git Loki
Git Commits -> Revision 4745049
Revision 4745049 by Jason Wilkins (soc-2010-jwilkins) June 8, 2010, 13:54 (GMT) |
* Stencil buffer pixel format request for Mac OSX (Cocoa) * Only the current projected or unprojected size slider appears in the UI at one time * "Lock Brush" or "Use Surface Size" is now "Blender Units" * Added UI for controlling the scale, offset, and rotation of the texture * Added overlay graphic for "Tiled" texture map mode. Can be turned off and on. Transparency can be adjusted. - Known bug: overlay may not draw properly if texture is modified from an image to a prodedural texture. - Known bug: overlay regenerates and uploads a texture every time it is drawn. * Added "Restore Mesh" feature to strokes that allows you to drag a shape around on the surface to place it carefully * Unchecking "Original Normal" now hides the "Normal Direction" list box * Added 'Edge-to-edge' checkbox that appears when 'Anchored' is selected. It allows 'anchor' daubs to be applied by selecting accross the diameter where the user wishes to place it. * The airbrush rate, smoothstroke, and spacing modifiers are hidden now when their respective strokes are not selected * Added controls to select the color of each individual brush in both add and subtract mode. * Only the add color is used for brushes that only have one mode. * Layer does not use direction so removed the add/subtract button for it. - Possible bug? The layer tool does not behave correctly in subtract mod if it is allowed * Renamed 'offset' in the texture controls to 'depth offset' * Added defaults of red for + and blue for - in new_brush and readfile - Possible bug? It feels like the UI loses focus where it shouldn't. Everything gets greyed out. * Commented out notification functions for changes in Brush values. Since both sliders aren't visible anymore. * Moving the mouse cursor keeps track of the direction of movement so that 'rake' has a more sensible starting angle. * The thickness and transparency of the 'on surface' brush changes depending on strength and tablet pressure * The anchor brush shows a small dot as a cursor which expands to surround the area that is being stamped - Bug: it is not advisable to combine 'use blender units' with an overlay because it is too unstable with changes in brush size - Bug: it does not appear to me that loading textures as GL_LUMINANCE_ALPHA makes dark areas more transparent - Bug: even though I have tried to adjust the anchor brush so that it only outlines areas outside its influence it seems too small still * Careful coding in several places to make sure that textures are consistently offset, scaled, and rotated in the overlay and in tiled and fixed modes * The f-key now scales the brush in blender units or pixels depending on which one is selected * The 'on surface' brush requires that the depth buffer be saved so I modified the "triple" update path to save depth values as well. - The defaults for OpenGL pixel transfers are used to insure speed, this is a much better solution than the alternative of rerendering the viewport completely. - The implementation uses Read/DrawPixels which is considered 'slow', a better implementation would use ARB_depth_texture and ARB_fragment_program * There is a potential for bugs around where I changed opengl state because although I tried to ensure I set all state I need, I do not know what Blender considers to be its defaults. * Fixed non-standard C in sculpt.c * Made outline of brush on surface thinner * fixed the horrible hack I was using to make the on-surface brush routine work. cpu usage when the brush is over the model is now reasonable |
Commit Details:
Full Hash: 4745049f63c86aa8e342a44441ed06c2c586890d
SVN Revision: 29341
Parent Commit: 801b807
Lines Changed: +767, -162
9 Modified Paths:
/intern/ghost/intern/GHOST_WindowCocoa.mm (+7, -0) (Diff)
/release/scripts/ui/space_view3d_toolbar.py (+60, -34) (Diff)
/source/blender/blenkernel/intern/brush.c (+21, -1) (Diff)
/source/blender/blenloader/intern/readfile.c (+25, -4) (Diff)
/source/blender/editors/sculpt_paint/paint_stroke.c (+351, -38) (Diff)
/source/blender/editors/sculpt_paint/sculpt.c (+118, -61) (Diff)
/source/blender/makesdna/DNA_brush_types.h (+48, -22) (Diff)
/source/blender/makesrna/intern/rna_brush.c (+67, -1) (Diff)
/source/blender/windowmanager/intern/wm_draw.c (+70, -1) (Diff)
/release/scripts/ui/space_view3d_toolbar.py (+60, -34) (Diff)
/source/blender/blenkernel/intern/brush.c (+21, -1) (Diff)
/source/blender/blenloader/intern/readfile.c (+25, -4) (Diff)
/source/blender/editors/sculpt_paint/paint_stroke.c (+351, -38) (Diff)
/source/blender/editors/sculpt_paint/sculpt.c (+118, -61) (Diff)
/source/blender/makesdna/DNA_brush_types.h (+48, -22) (Diff)
/source/blender/makesrna/intern/rna_brush.c (+67, -1) (Diff)
/source/blender/windowmanager/intern/wm_draw.c (+70, -1) (Diff)