Age | Commit message (Collapse) | Author |
|
were not merged due to complex differences)
|
|
|
|
- minf, maxf, mini, maxi --> min_ff, max_ff, min_ii, max_ii
|
|
|
|
of warnings before committing)
|
|
|
|
our naming convention.
|
|
|
|
Summer of Code against trunk revision 50064.
Note: The new flag LIB_LOAD_ASYNC in the GE conflicted with trunks new LIB_LOAD_SCRIPTS, so I changed the value of ASYNC. So, heads up if these values has been saved in any .blend files!
Once again (see last merge note) it seems like node_draw.c had a bunch of wierd conflicts that make it look like it missed a merge or update. Not sure what is going on with that file.
Other parts of the merge had some difficulty resolving proper bracket nesting in places where it seems like the merge should have gone smoothly. Maybe that was KDiff3's fault? This reduces my confidence on if bugs were not introduced.
|
|
|
|
|
|
|
|
use BLI_rctf functions.
|
|
lists, lots of other misc. changes.
|
|
gpuMatrixCommit occurs right before glDraw* (mainly in gpu_immediate and few other places)
|
|
|
|
Note: draw_node.c seemed like it may have missed a previous merge, but otherwise this went smoothly.
|
|
use where possible.
|
|
and readable.
Changed gpuColorPack to gpuColor3x and gpuColor4x which take a hex color code.
Define common color codes as readable macros (e.g., #define CPACK_RED 0xFF0000)
Special gpuGrey function for shades of grey
Change most places that specify an alpha to use floats instead of bytes
Always format color components as 0.0f and alpha as 0.000f
There are still several places that specify compile time constants for colors and that use float or bytes instead of a single hex. I'd like to unify all of these to use hex, and then put all the colors into GPU_colors.h (if it makes sense to). Some files might do better with a local color dictionary.
|
|
|
|
Replaces glBegin/glEnd with gpuBegin/gpuEnd
Replaces client side arrays with gpuDrawArrays/gpuDrawElements/gpuDrawElements
Replaces GLUquadric and other simple geometric primitives with a new primitive library
Replaces display lists with the ability to save geometry buffers and invoke them with glDraw/glRepeat
Not complete, there are still some places where old functions remain. Especially in test programs and external libraries.
Not tested thoroughly yet! I've tested a lot, but there are still lots of regressions.
|
|
|
|
|
|
This merge was funny. The merge-info property was not up to date from the last merge and there were conflicts with things that should have been merged before.
I did my best to fix things up.
|
|
each panel. Suggested by "Bao 2".
|
|
* Add a solo mode for panels, CTRL+LMB on a panel header.
This closes all other panels.
Patch [#22233] by sneg negr (sneg) with modifications by myself to exclude panels with hidden header (like context)
|
|
|
|
replace do prefix with do_ for bool vars.
|
|
|
|
|
|
else if's
|
|
|
|
|
|
|
|
already used a lot and part of proposed style guide).
|
|
MEM_freeN calls which were on the same line as the if's.
|
|
The buttons for "hiding" (collapsing) a node, hiding unlinked sockets, additional options, the preview and for opening a node group were all using a custom mouse test function, which was broken. They now use actual buttons instead of just displaying icons. Before executing the respective operators the button's node has to be selected and activated, so the buttons use an intermediate handle function, which selects the node and then calls the operator.
|
|
right.
|
|
fix bug #29422, left expander drawing over adjacent editor.
|
|
The code here was tricky, with ED_region_panels trying to match the complex
logic in uiAlignPanelStep, now refactored the code so it's avoided.
|
|
* Add theme option to show panel header background.
* Draw panel collapse widget a bit smaller.
* Add theme option to draw icons muted.
* Code tweak: replace U.themes.first by UI_GetTheme() calls.
|
|
This way, we will be able to use it in non-UI parts of the code too.
|
|
http://markmail.org/message/fp7ozcywxum3ar7n
|
|
- clear utf8_buf on key up & complain if its set (should never happen)
|
|
Previous state:
Right now, there are "memories" of the "old" (less than a month!) translation way:
* A few remaining calls to BLF_gettext() (only UI_translate_do_iface and UI_translate_do_tooltip should be used).
* The _() macro still also calls BLF_gettext()!
New state:
Here are the changes made by the patch:
* Removing the no more needed _() macro.
* Removing most N_() and _() calls, only keeping the few needed ones (i.e. strings that are in no other way findable by xgettext and/or update_msg script).
* Defining in UI_interface.h IFACE_() and TIP_() macros (resp. for UI_translate_do_iface and UI_translate_do_tooltip).
* Replacing all calls to BLF_gettext by relevant IFACE_ or TIP_ one.
* Replacing all calls to UI_translate_do_iface by IFACE_.
* Replacing all calls to UI_translate_do_tooltip by TIP_.
All this somewhat clarifies and simplifies the code.
On the bf-translations scripts side, this only implies adding IFACE_ and TIP_ as detection markers for xgettext.
It also allows to reduce POTFILES.in quite notably (only 20 files remaining in it).
Please also have a look at those pages:
* Coder POV: http://wiki.blender.org/index.php/Dev:2.5/Source/Interface/Internationalization
* Translator POV: http://wiki.blender.org/index.php/Dev:2.5/Doc/How_to/Translate_Blender
|
|
also rename backface_culling --> use_backface_culling (which is used elsewhere in rna)
|
|
- Move all translation-related declarations to BLF_translation.h
- Reverted some changes to match trunk svn rev40365
|
|
is used only)
|
|
- Make gettext stuff draw-time. so switching between languages
can happens without restart now.
- Added option to translate visible interface (menus, buttons, labels)
and tooltips. Now it's possible to have english UI and localized tooltips.
- Clean-up sources, do not use gettext stuff for things which can be
collected with RNA.
- Fix issues with windows 64bit and ru_RU locale on my desktop
(it was codepage issue).
- Added operator "Get Messages" which generates new text block with
with all strings collected from RNA.
- Changed script for updating blender.pot so now it appends
messages collected from rna to automatically gathered messages.
To update .pot you have to re-generate messages.txt using "Get Messages"
operator and then run update_pot script.
- Clean up old translation stuff which wasn't used and most probably
wouldn't be used.
- Return back "International Fonts" option, so if it's disabled, no
gettext lookups happens on draw.
- Merged read_homefile function back. No need in splitting it.
TODO:
- Custom fonts and font size.
Current font isn't nice at least for russian locale, it's
difficult to read it.
- Put references to messages.txt so gettext can merge translation when
name/description of some property changes.
|
|
|