Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-11-29Merge branch 'master' into blender2.8Brecht Van Lommel
2017-11-29Sequencer: add many more color blend modes, and a new color mix strip.Maikon Araujo
Differential Revision: https://developer.blender.org/D2872
2017-11-27Merge branch 'master' into blender2.8Sergey Sharybin
2017-11-27Sequencer: Add option to render OpenGL preview with DoFSergey Sharybin
The title says it all actually, controlled with DoF check box next to textured solid check box. Thanks Campbell for review!
2017-10-24Merge branch 'master' into blender2.8Brecht Van Lommel
2017-10-23VSE: draw grid lines at every secondCampbell Barton
Was hard-coded to 25 frames. D2893 by @jooert
2017-09-26Cleanup: naming (GPU immediate util)Campbell Barton
2017-09-13Cleanup: use explicit 2d suffix for imm utilsCampbell Barton
Avoid ambiguity between 2d/3d (which were already named).
2017-08-12Merge branch 'master' into blender2.8Campbell Barton
2017-08-11iFix T52050: Empty VSE preview for scene strips with OpenGL preview + ↵Bastien Montagne
Rendered settings. 'OpenGL Preview' checkbox was redundant now, just use seq_prev_type value only. Might be OK for 2.79, but should be double-checked first...
2017-07-13Cleanup/rename etc. dashed line shaders.Bastien Montagne
Goal is to make them more modular, to allow more variants (variable single-color, thickness, ...) to be added without having to copy-and-change-one-line of whole chain of shaders.
2017-06-19Gawain API naming refactorCampbell Barton
Use consistent prefix for gawain API names as well as some abbreviations to avoid over-long names, see: D2678
2017-05-08Fix wrong attributes and shader binding in sequencer when using OCIOSergey Sharybin
2017-05-01Reworked version of dashed line shader.Bastien Montagne
Using geometry shader allows us to get rid of the 'line origin' extra vertex attribute, which means dashed shader no longer requires fiddling with those vertex attributes definition, and, most importantly, does not require anymore special drawing code! As you can see, this makes code much simpler, and much less verbose, especially in complex cases. In addition, changed how dashes are handled, to have two 'modes', a simple one with single color (using default "color" uniform name), and a more advanced one allowing more complex and multi-color patterns. Note that since GLSL 1.2 does not support geometry shaders, a hack was added for now (which gives solid lines, but at least does not make Blender crash).
2017-04-262D dashed line shader: changed to use viewport side instead of scale.Bastien Montagne
The scale version was working(ish), but it was not really extendable to a 3D line version of the shader. Also note that sequencer view still keeps its 'UI scale' adaptation (dashes grow together with UI scale setting). Would be nice to do that everywhere ultimately imho, but nothing urgent here.
2017-04-26Getting rid of setlinestyle: Squencer space.Bastien Montagne
Not much to add here, except that it needs the scale of its MVP matrix to be taken into account here... Reviewers: merwin, dfelinto Differential Revision: https://developer.blender.org/D2647
2017-04-26Getting rid of setlinestyle: 3DView camera view.Bastien Montagne
Use new 2D dashed line shader in 3DView camera view. Note that this also involved converting UI_draw_safe_areas() to this dashed shader, which means it cannot be used anymore with other shaders. Part of D2647.
2017-04-16cleanup use of immUniformColorMike Erwin
- use best function for the job - don't specify alpha if 100% - 'f' for floating point literals
2017-04-16use immUniformColor instead of immUniform("color"Mike Erwin
The specialized color functions are better in every way: - faster lookup (don't have to match "color" string) - flexible inputs (RGB with separate alpha) - automatic alpha = 1.0 if not specified Sort of related to T49043
2017-04-07OpenGL: use PRIM instead of GL enum for immBeginMike Erwin
Getting ready for a Gawain API change... Part of T49043
2017-04-07OpenGL: transition away from GL_QUADSMike Erwin
Single quads are drawn as a TRIANGLE_FAN, with 4 verts in the same order. Multiple quads now use PRIM_QUADS_XXX and will need further work. Only 8 places still use this. Part of T49043
2017-04-06Gawain: VertexFormat_add_attrib (function name change)Mike Erwin
See intern/gawain for the API change. Other files are updated to use the new name. Also updated every call site to the recommended style: unsigned int foo = VertexFormat_add_attrib(format, "foo", COMP_ ... )
2017-04-05Cleanup: Move imm_draw utils into own fileCampbell Barton
These were in BIF_glutil which is documented to be removed, so best not define new API's there.
2017-03-27OpenGL: remove several glMatrixMode callsMike Erwin
A few of these were redundant, others could be converted to new matrix API. Part of T49450
2017-03-22OpenGL: convert to new matrix API (part 5)Mike Erwin
Pretty sure source/blender is now finished, with all legacy matrix calls confined to gpu_matrix.c. This was the easy part, but doing it first makes the next part much easier. TODO and XXX notes describe what is left. glMatrixMode is still in place, since the new API does not share this concept of modes. Similar for glOrtho and glFrustum which I'll tackle very soon. Part of T49450
2017-03-20Cleanup: remove useless `glDisable(GL_LINE_STIPPLE)` call.Bastien Montagne
Note that muted strips have solid border currently, marked as TODO to add back stippled lines (if with want them back?).
2017-03-01Merge branch 'master' into blender2.8Campbell Barton
2017-03-01Cleanup: code-style, duplicate headerCampbell Barton
2017-02-28clean up GL / GPU #includesMike Erwin
2017-02-18fix OpenGL line count in VSE backdropMike Erwin
2017-02-17OpenGL immediate mode: sequencer_draw.c (finished)Luca Rood
Converted the remaining diagonal stripes thingies... Part of T49043
2017-02-16Minor cleanup in sequencer_draw.cLuca Rood
Minor style cleanup, and also replaced manual checker drawing by a call to `imm_draw_checker_box`. Part of T49043
2017-02-15OpenGL immediate mode: sequencer_draw.cLuca Rood
Other than the general conversion: * Made some slight aesthetic improvements. ** Removed gradients. ** Replaced stipples with transparency for hidden strips. ** Made strip borders less harsh. ** Removed stripes from offsets and made them brighter. * Made only the visible parts of waveforms be drawn. * Fixed a few drawing bugs. ** Background was not being drawn when buffer is NULL, and no grease pencil is being drawn. ** Offset drawing ignored strip visibility. Also, note that diagonal stripes for locked and error strips, are still being drawn with the old api, as they await a new shader in order to be converted. Part of 49043
2017-02-15Remove redundant draw call (sequencer)Luca Rood
`SEQUENCER_OT_slip` was calling `draw_sequence_extensions` to redraw the extensions during modal operation, but that is redundant, as it is already called by the regular draw loop. Because it was called on top of the draw loop, it was actually obscuring other parts of the strip that would normally be drawn on top of it. Somewhat part of 49043
2017-02-06OpenGL immediate mode: interface_draw.cClément Foucault
2016-10-14Immediate mode: use new util functions, and border draw functionsDalai Felinto
Part of T49043 Reviewers: merwin
2016-08-05VSE sound strips: draw either the waveform or text label, not both.Sybren A. Stüvel
Drawing both text and the wave onto a sound strip makes both hard to read, which is a concrete issue for Hjalti at the moment. This was the simplest fix I could think of to give him control over what he sees.
2016-06-14VSE: minor drawing glitch with meta'sCampbell Barton
Meta contents could obscure meta selection outline, draw after.
2016-06-11Fix T48617: VSE: Do not draw backdrop in Seq + Preview mode, only makes ↵Bastien Montagne
sense when no preview is available...
2016-06-09Flat shading for basic shaderAlexander Romanov
The purpose of the patch is to replace deprecated glShadeModel. To decrease glShadeModel calls I've set GL_SMOOTH by default Reviewers: merwin, brecht Reviewed By: brecht Subscribers: blueprintrandom, Evgeny_Rodygin, AlexKowel, yurikovelenov Differential Revision: https://developer.blender.org/D1958
2016-02-16Set line-width for sequencer bordersCampbell Barton
2016-01-25Fix regression in sequencer overlay draw optionCampbell Barton
Drawing alpha backdrop would obscure image data behind the overlay.
2016-01-04Fix crash sequencer drawing with no soundCampbell Barton
2015-12-27OpenGL: stipple support added to basic GLSL shaderAlexander Romanov
The is intended to replace the deprecated glPolygonStipple() calls with a shader based alternative, once we switch over to GLSL shaders. Reviewers: brecht Differential Revision: https://developer.blender.org/D1688
2015-12-06OpenGL: rename simple shader to basic shader.Brecht Van Lommel
2015-12-06OpenGL: use simple shader for texture drawing in a few places.Brecht Van Lommel
Differential Revision: https://developer.blender.org/D1645
2015-12-02Fix T46909: Text strip not themeableJulian Eisel
Normally we don't allow adding new theme options if we can avoid it, but this is a legit exception since all other strips are themeable. Default color for text strip is now yellow-ish. Not nice but there are also not many other colors left.
2015-11-28OpenGL: remove unnecessarily paranoid bound texture preservation.Brecht Van Lommel
2015-11-28OpenGL: assume GL_TEXTURE_ENV_MODE GL_MODULATE is the default state.Brecht Van Lommel
2015-11-25Sequencer: nested scene strip support (like metas)Campbell Barton
This makes it possible to use scenes as a kind of multi-user meta-strip (with their own time). Currently this supports rendering & drawing nested strips, but no convenient way to tab-enter into a scene strip.