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
2018-04-05Merge branch 'master' into blender2.8Campbell Barton
2018-04-05Undo: split text undo steps out of the data-blockCampbell Barton
This moves undo storage into a separate struct which is passed in from the undo system.
2018-04-05Fix crash w/ empty text undo operationsCampbell Barton
2018-04-03Merge branch 'master' into blender2.8Campbell Barton
2018-04-03Cleanup: editor BKE_main includesCampbell Barton
2018-04-01Merge branch 'master' into blender2.8Campbell Barton
- Undo that changes modes currently asserts, since undo is now screen data. Most likely we will change how object mode and workspaces work since it's not practical/maintainable at the moment. - Removed view_layer from particle settings (wasn't needed and complicated undo).
2018-04-01Cleanup: remove global headerCampbell Barton
2018-03-31Undo: unified undo system w/ linear historyCampbell Barton
- Use a single undo history for all operations. - UndoType's are registered and poll the context to check if they should be used when performing an undo push. - Mode switching is used to ensure the state is correct before undo data is restored. - Some undo types accumulate changes (image & text editing) others store the state multiple times (with de-duplication). This is supported by checking UndoStack.mode `ACCUMULATE` / `STORE`. - Each undo step stores ID datablocks they use with utilities to help manage restoring correct ID's. Needed since global undo is now mixed with other modes undo. - Currently performs each undo step when going up/down history Previously this wasn't done, making history fail in some cases. This can be optimized to skip some combinations of undo steps. grease-pencil is an exception which has not been updated since it integrates undo into the draw-session. See D3113
2018-03-26Merge branch 'master' into blender2.8Sergey Sharybin
2018-03-25Text: line break always returned cancelledCampbell Barton
Harmless but incorrect.
2018-03-23Merge branch 'master' into blender2.8Campbell Barton
2018-03-23Cleanup: stray tabsCampbell Barton
Tabs in middle of code (mostly for no reason / by accident).
2018-02-14GPU: use alpha blend that works for drawing to transparent buffer.Brecht Van Lommel
It's unlikely to ever be intentional to square the source alpha, as happens with glBlendFunc, so this changes the blending throughout the code.
2018-01-19Merge remote-tracking branch 'origin/master' into blender2.8Dalai Felinto
2018-01-19Util function to determine number of digits from an integerDalai Felinto
2017-11-06Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: intern/cycles/device/device.cpp source/blender/blenkernel/intern/library.c source/blender/blenkernel/intern/material.c source/blender/editors/object/object_add.c source/blender/editors/object/object_relations.c source/blender/editors/space_outliner/outliner_draw.c source/blender/editors/space_outliner/outliner_edit.c source/blender/editors/space_view3d/drawobject.c source/blender/editors/util/ed_util.c source/blender/windowmanager/intern/wm_files_link.c
2017-11-06Rename ID_IS_LINKED_DATABLOCK to ID_IS_LINKED.Bastien Montagne
This makes code closer to id_override/assent-engine ones, which introduce a new type of linked data, and hence reserve ID_IS_LINKED_DATABLOCK to real linked datablocks.
2017-10-18Merge branch 'master' into blender2.8Campbell Barton
2017-10-18Cleanup: Use const for RNA EnumPropertyItem argsCampbell Barton
Practically all access to enum data is read-only.
2017-10-16Workspace: Move engines to workspace and Properties Editor cleanupDalai Felinto
Engine is not stored in WorkSpaces. That defines the "context" engine, which is used for the entire UI. The engine used for the poll of nodes (add node menu, new nodes when "Use Nodes") is obtained from context. Introduce a ViewRender struct for viewport settings that are defined for workspaces and scene. This struct will be populated with the hand-picked settings that can be defined per workspace as per the 2.8 design. * use_scene_settings * properties editor: workshop + organize context path Use Scene Settings ================== For viewport drawing, Workspaces have an option to use the Scene render settings (F12) instead of the viewport settings. This way users can quickly preview the final render settings, engine and View Layer. This will affect all the editors in that workspace, and it will be clearly indicated in the top-bar. Properties Editor: Add Workspace and organize context path ========================================================== We now have the properties of: Scene, Scene > Layer, Scene > World, Workspace [Scene | Workspace] > Render Layer > Object [Scene | Workspace] > Render Layer > Object > Data (...) Reviewers: Campbell Barton, Julian Eisel Differential Revision: https://developer.blender.org/D2842
2017-08-10Merge branch 'master' into blender2.8Bastien Montagne
2017-08-10Tweak and extend POV syntax hilghting.Bastien Montagne
*Changed categories of some keywords *reordered some longer keywords that didn't appear *Activated another color (reserved builtins) by Leonid *added some HGPOV and UberPOV missing keywords Patch by Maurice Raybaud (@mauriceraybaud). Thanks to Leonid for additions, feedback and Linux testing. Related diffs: D2754 and D2755. While not a regression, this is new feature and would be nice to have it backported to final 2.79.
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-06-15Merge branch 'master' into blender2.8Sergey Sharybin
2017-06-15Further improvements of text editor for POV-RayBastien Montagne
*tryed "#" as preprocessor used in POV-Ray for language keywords best behaviour was to have it as a punctuation symbol *moved "finish" to its proper category *changed order of some POV-Ray ini files keywords to have them work better *added a few keywords from latest pov version *Fixed C-style closing of multiline comments (*/) Reviewers: campbellbarton, mont29 Reviewed By: campbellbarton, mont29 Subscribers: mont29 Differential Revision: https://developer.blender.org/D2707
2017-06-08Replace all old DAG calls with direct calls to new DEG and remove ↵Luca Rood
BKE_depsgraph.h This removes BKE_depsgraph.h and depsgraph.c
2017-06-02Merge branch 'master' into blender2.8Campbell Barton
2017-06-02Cleanup: styleCampbell Barton
2017-05-23Merge branch 'master' into blender2.8Sybren A. Stüvel
2017-05-23Fix some POV keywords not colored correctly.Bastien Montagne
We need to ensure longer keywords are catched first, when there are shorter subsets of them in keywords list as well!
2017-05-23Make msvc2015 happy again.Bastien Montagne
Looks like that wanabe compiler does not support more than a few tens of if/else conditions...
2017-05-22Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: source/blender/blenloader/intern/versioning_270.c
2017-05-22Add PovRay syntax hilghting.Bastien Montagne
Since we already have a rather advanced PovRay exporter, makes sense to also nicely display generated 'code'. Patch by Maurice Raybaud (@mauriceraybaud), thanks! Cleanup (mostly styling) by @mont29.
2017-05-20Merge branch 'master' into blender2.8Campbell Barton
2017-05-20CMake: Use GCC7's -Wimplicit-fallthrough=5Campbell Barton
Use to avoid accidental missing break statements, use ATTR_FALLTHROUGH to suppress.
2017-05-02Add scene argument for notifiersCampbell Barton
From workspaces branch
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-29Getting rid of setlinestyle: Text space margin line.Bastien Montagne
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: refactor UI_draw_roundbox functionsMike Erwin
Each function takes a bool (filled vs outline) and a color. We already had multiple ways of passing color in; these are still here. Special variant for anti-aliasing. - took GLenum out of interface - removed UI_RB_ALPHA flag (only one place really used it) - use exact vertex count - removed redundant state changes (BLEND, LINE_SMOOTH)
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-03-09Immediate Mode: Fix crash on text editor when going over suggestion listDalai Felinto
2017-03-09Immediate Mode: text_draw.c 2/2Dalai Felinto
Tackle the remaining parts of the code, mainly the commented out function `draw_documentation`.
2017-03-09Immediate Mode: text_draw.c 1/2Dalai Felinto
Note 1: renamed draw_cursor to draw_text_decoration, since it was drawing cursor, margin, selection and line highlight Note 2: commented out code update coming next Part of T49043
2017-03-09Merge remote-tracking branch 'origin/master' into blender2.8Dalai Felinto
2017-03-09Remove (ifdef) draw_documentation from text_draw.cDalai Felinto
This was no longer supported.
2017-01-16Merge branch 'master' into blender2.8Bastien Montagne
2017-01-13Fix missing user when opening text from ID UI widget.Bastien Montagne
Own mistake in recent fix for Text data-block usercount (rBa9163f7d2). Reported by @sergey over IRC, thanks.
2017-01-05Merge branch 'master' into blender2.8Julian Eisel
Conflicts: source/blender/editors/gpencil/drawgpencil.c