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-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
2017-01-04Fix (IRC reported) bad handling of Text data-block user count.Bastien Montagne
Reported on IRC by dfelinto, thanks. Root of the issue was that opening a new text file would create datablock with one user, when Text editor is actually a 'user one' user. This was leaving Text datablocks in inconsitent user count, and generating asserts in BKE_library area. Also changed a weird piece of code related to that extra user thing in main remapping func.
2016-11-15blender 2.8: Opengl: UI_draw_roundboxMike Erwin
all is in the title too.. Reviewers: merwin Reviewed By: merwin Subscribers: Blendify, Severin Tags: #bf_blender_2.8, #opengl_gfx Maniphest Tasks: T49043 Differential Revision: https://developer.blender.org/D2337
2016-09-19UI Messages: Consistent spelling of term "data-block"Julian Eisel
Was using a bunch of different spellings, mostly "data-block" though, so went with that one (would have been my #1 choice anyway ;) )
2016-08-04UI: Correct tooltips for properties region toggle OPJulian Eisel
Now all consistent and using term "properties region" instead of "properties panel". Ideally we had a more generic operator for all those. Fixes T49006.
2016-07-06Replace of (id->lib != NULL) check by meaningful macro.Bastien Montagne
Idea is to replace hard-to-track (id->lib != NULL) 'is linked datablock' check everywhere in Blender by a macro doing the same thing. This will allow to easily spot those checks in future, and more importantly, to easily change it (see work done in asset-engine branch). Note: did not touch to readfile.c, since there most of the time 'id->lib' check actually concerns the pointer, and not a check whether ID is linked or not. Will have a closer look at it later. Reviewers: campbellbarton, brecht, sergey Differential Revision: https://developer.blender.org/D2082
2016-06-27Fix (unreported) wrong ID type check in Text editor's ID remap callback.Bastien Montagne
2016-06-25Cleanup: get rid of BKE_text_unlink(), replace by usage of generic ↵Bastien Montagne
BKE_libblock_... API.
2016-06-22ID-Remap - Step one: core work (cleanup and rework of generic ID datablock ↵Bastien Montagne
handling). This commit changes a lot of how IDs are handled internally, especially the unlinking/freeing processes. So far, this was very fuzy, to summarize cleanly deleting or replacing a datablock was pretty much impossible, except for a few special cases. Also, unlinking was handled by each datatype, in a rather messy and prone-to-errors way (quite a few ID usages were missed or wrongly handled that way). One of the main goal of id-remap branch was to cleanup this, and fatorize ID links handling by using library_query utils to allow generic handling of those, which is now the case (now, generic ID links handling is only "knwon" from readfile.c and library_query.c). This commit also adds backends to allow live replacement and deletion of datablocks in Blender (so-called 'remapping' process, where we replace all usages of a given ID pointer by a new one, or NULL one in case of unlinking). This will allow nice new features, like ability to easily reload or relocate libraries, real immediate deletion of datablocks in blender, replacement of one datablock by another, etc. Some of those are for next commits. A word of warning: this commit is highly risky, because it affects potentially a lot in Blender core. Though it was tested rather deeply, being totally impossible to check all possible ID usage cases, it's likely there are some remaining issues and bugs in new code... Please report them! ;) Review task: D2027 (https://developer.blender.org/D2027). Reviewed by campbellbarton, thanks a bunch.
2016-06-14Text Editor: auto-complete removed entire word on undoCampbell Barton
2016-04-29Cleanup: warnings. spellingCampbell Barton
2016-04-19Fix T48198: Missing plus sign to open the tool shelf in text editorJulian Eisel
Did not happen when using screen layout saved in default startup.blend
2016-03-10Text Editor: Auto indent for backspace/deleteCampbell Barton
Editing with spaces + auto-indent didn't delete indentation as expected.
2016-03-05Cleanup: unnecessary comma useCampbell Barton
2016-02-07Cleanup: line widthCampbell Barton
2016-01-09Text Editor: Autocomplete suggestion wrap-aroundCampbell Barton
D1716 by @someonewithpc
2016-01-04Remove SCons building systemSergey Sharybin
While SCons building system was serving us really good for ages it's no longer having much attention by the developers and started to become quite a difficult task to maintain. What's even worse -- there started to be quite serious divergence between SCons and CMake which was only accumulating over the releases now. The fact that none of the active developers are really using SCons and that our main studio is also using CMake spotting bugs in the SCons builds became quite a difficult task and we aren't always spotting them in time. Meanwhile CMake became really mature building system which is available on every platform we support and arguably it's also easier and more robust to use. This commit includes: - Removal of actual SCons building system - Removal of SCons git submodule - Removal of documentation which is stored in the sources and covers SCons - Tweaks to the buildbot master to stop using SCons submodule (this change requires deploying to the server) - Tweaks to the install dependencies script to skip installing or mentioning SCons building system - Tweaks to various helper scripts to avoid mention of SCons folders/files as well Reviewers: mont29, dingto, dfelinto, lukastoenne, lukasstockner97, brecht, Severin, merwin, aligorith, psy-fi, campbellbarton, juicyfruit Reviewed By: campbellbarton, juicyfruit Differential Revision: https://developer.blender.org/D1680
2015-12-31Cleanup: Py API namingCampbell Barton
Use BPY_execute_* prefix for all Python execution commands
2015-12-01Fix minor order of init error w/ text drawCampbell Barton
2015-12-01minor error in recent text-draw commitCampbell Barton
2015-12-01Text Editor: store font id in a drawing contextCampbell Barton
2015-11-28Cleanup: 'area' vs 'region'Julian Eisel
Apparently this is the result of some sloppiness during 2.5 project and since then it confused people who were trying to understand the area-region relation (myself included). Sorry if this causes merge conflicts for anyone, but at some point we really had to do it :/
2015-11-10Text Editor: use line-number color for marginCampbell Barton
also use stipple so you can see the cursor behind it.
2015-10-04Clenup: Text Editor: Fix inconsistencies in textline handling (makes coverty ↵Bastien Montagne
happy).
2015-10-01Fix T46340: Auto scrolling in text editor with upward selection not work.Bastien Montagne
Cleanup and rework a bit text_cursor_set_to_pos_wrapped(), it did not handle correctly negative y valuesi, because it was only checking lines starting from first visible one. Mostly, we now directly get line matching given y position (be it an invisible one) from the helper (renamed `get_line_pos_wrapped()`), instead of first visible one, which allows us to get rid of additional complexity of looping over next lines until we find correct one. This code remains rather complex to follow, added some asserts to ensure everything works as expected, and tested it rather seriously, but DO NOT backport this to 2.76!
2015-09-28Fix T46293: Text Editor: Convert to spaces/to tabs was totally broken with ↵Bastien Montagne
non-ASCII strings. Code was totally unaware of UTF8, also it was needlessly complicated...
2015-09-04Partial revert of warning cleanupCampbell Barton
These warnings are false-positives
2015-09-04Quiet warningsJulian Eisel
We had too many warnings lately... was awaiting that someone would kill them - didn't happen -> goes to my commit ratio! :P
2015-08-23This commit makes it possible to select the sort mode whenever we invoke an ↵Thomas Beck
operator. It's needed especially for the menu entry "recover auto save" where you'd like to have the files sorted by date most of the time but it could be useful in other places too. There should be no functional change in other areas, I just added the missing parameter (FILE_SORT_ALPHA). Was a request from @sebastian_k at #BCon13, so at least one guy needs it ;) Reviewers: mont29 Reviewed By: mont29 Subscribers: sebastian_k Differential Revision: https://developer.blender.org/D1476
2015-08-18Refactor translation code out of blenfontCampbell Barton
- Add blentranslation `BLT_*` module. - moved & split `BLF_translation.h` into (`BLT_translation.h`, `BLT_lang.h`). - moved `BLF_*_unifont` functions from `blf_translation.c` to new source file `blf_font_i18n.c`.