Brecht Van Lommel [Sat, 22 Oct 2011 19:06:41 +0000 (19:06 +0000)]
Cycles: svn merge -r41182:41205 ^/trunk/blender
Brecht Van Lommel [Sat, 22 Oct 2011 18:54:57 +0000 (18:54 +0000)]
Cycles: some code changes to sync with trunk.
Brecht Van Lommel [Sat, 22 Oct 2011 18:51:45 +0000 (18:51 +0000)]
Cycles: when creating nodes from a blender material, set the diffuse color in
the diffuse node, similar for lamps and world.
Joerg Mueller [Sat, 22 Oct 2011 18:08:26 +0000 (18:08 +0000)]
Fix for an unhandled exception. Campbell: please include in 2.60a.
Brecht Van Lommel [Sat, 22 Oct 2011 17:01:54 +0000 (17:01 +0000)]
Render API: add update_progress() function to update progress bar progress from
external render engines.
Also refactoring to move some render engine registration stuff out of RNA and
into render module.
Brecht Van Lommel [Sat, 22 Oct 2011 16:24:28 +0000 (16:24 +0000)]
Code refactoring: move external engine functions into own file.
Thomas Dinges [Sat, 22 Oct 2011 16:01:19 +0000 (16:01 +0000)]
* Re-commit splash screen with Alpha header.
Brecht Van Lommel [Sat, 22 Oct 2011 15:35:49 +0000 (15:35 +0000)]
Code cleanup: file operations merged into single header, some function names
made less cryptic and changed to indicate if they work on files or directories.
Campbell Barton [Sat, 22 Oct 2011 11:34:01 +0000 (11:34 +0000)]
- use defines for wmKeyMapItem & wmEvent alt/shift/ctrl/oskey
- clear utf8_buf on key up & complain if its set (should never happen)
Campbell Barton [Sat, 22 Oct 2011 10:49:35 +0000 (10:49 +0000)]
py api - added PyC_UnicodeFromByteAndSize() to match PyUnicode_FromStringAndSize()
also made RNA_property_string_get_alloc() return the length of the new string to avoid having to run strlen on it after.
Dalai Felinto [Sat, 22 Oct 2011 09:28:10 +0000 (09:28 +0000)]
utf8 OSX - cleanup
I still think utf8_buf can be 5 (4 bytes + '\0'), but even 6 may not be enough to what is coming next (NFC - precomposedStringWithCanonicalMapping)
incorporating ascii as a subset of utf8. I don't think we need to re-encode it.
U+0000 ~ U+00FF - latin1 set
Alexander Kuznetsov [Sat, 22 Oct 2011 04:36:58 +0000 (04:36 +0000)]
Fix for alt-tab in Windows.
utf8_buf can be not null terminated, plus not init as in this case. (I need to investigate more)
Campbell Barton [Sat, 22 Oct 2011 03:39:13 +0000 (03:39 +0000)]
BLI_utildefine minor edits
- removed AVG2, was only used once.
- remove unused LONGCOPY define.
- removed BLI_STRUCT_OFFSET, was only used once, replce with offsetof
- formatting edits, split some macros over multiple lines.
Alexander Kuznetsov [Sat, 22 Oct 2011 03:14:19 +0000 (03:14 +0000)]
Fix for text object on windows.
No utf8 when keyup
Campbell Barton [Sat, 22 Oct 2011 01:53:35 +0000 (01:53 +0000)]
header cleanup and typo's
Brecht Van Lommel [Fri, 21 Oct 2011 22:33:41 +0000 (22:33 +0000)]
Code cleanup: remove BLI_exist, now there is only BLI_exists. One function just
called the other, they did the same thing.
Brecht Van Lommel [Fri, 21 Oct 2011 20:26:54 +0000 (20:26 +0000)]
Cycles: svn merge -r41157:41182 ^/trunk/blender
Brecht Van Lommel [Fri, 21 Oct 2011 20:13:12 +0000 (20:13 +0000)]
Cycles: svn merge -r40934:41157 ^/trunk/blender
Dalai Felinto [Fri, 21 Oct 2011 19:09:14 +0000 (19:09 +0000)]
utf8 OSX - disabling utf8 at KeyUp, otherwise TextObject doesn't work.
This bug is also present in Windows, so I believe the real bug is in Linux (and in the text object input).
Also Cmd+C and Cmd+v doesn't work for utf8 yet.
Alexander Kuznetsov [Fri, 21 Oct 2011 17:40:35 +0000 (17:40 +0000)]
UTF8 input support for Windows.
ToDo:
* add support for dead keys
* other input methods (for hieroglyphs)
Brecht Van Lommel [Fri, 21 Oct 2011 17:37:38 +0000 (17:37 +0000)]
Code cleanup: don't use btempdir/bprogdir/bprogname globals anymore, but wrap
in BLI_ functions.
Brecht Van Lommel [Fri, 21 Oct 2011 17:10:59 +0000 (17:10 +0000)]
Code cleanup: remove some unused code in header.
Sergey Sharybin [Fri, 21 Oct 2011 11:33:18 +0000 (11:33 +0000)]
Fix compilation error with MSVC caused by recent commit.
Campbell Barton [Fri, 21 Oct 2011 09:04:40 +0000 (09:04 +0000)]
fix [#28967] Attempting to add a new pose to the Pose Library causes Blender 2.60 RC2 to crash.
Campbell Barton [Fri, 21 Oct 2011 08:31:28 +0000 (08:31 +0000)]
svn merge -r41171:41170 . --- fix coming next
Campbell Barton [Fri, 21 Oct 2011 08:16:15 +0000 (08:16 +0000)]
misc cleanup
- remove redundant casts
- replace strcmp's with "" to just check first char.
- added WM_event_print(), debug mode only to print events since the structs values are not that meaningful.
- added warnings if locale/font dirs cant be found.
Dalai Felinto [Fri, 21 Oct 2011 06:45:08 +0000 (06:45 +0000)]
disabling utf8 for OSX. It's not working 100% and it's breaking other things
Joshua Leung [Fri, 21 Oct 2011 06:36:01 +0000 (06:36 +0000)]
Bugfix [#28967] Attempting to add a new pose to the Pose Library
causes Blender 2.60 RC2 to crash
This commit just rolls back part of r.40868, which was causing crashes
when trying to treat id-property-groups as bpy.type.Property to access
a special "rna_type" attribute added as part of said commit.
The underlying Py-API voodoo here is far too evil (along with the
myriad of ways of creating custom props) to work out an API fix for,
but at least we don't get anymore crashes now. In tests here, this
check even seems redundant!
Campbell Barton [Fri, 21 Oct 2011 04:26:48 +0000 (04:26 +0000)]
remove scons files for unsupported/obscure unix variants, these configs are not maintained (aix defined FREE_WINDOWS for example and nobody noticed), and CMake builds on OpenBSD/NetBSD with no manual configuration.
Campbell Barton [Fri, 21 Oct 2011 04:23:26 +0000 (04:23 +0000)]
cleanup scons build flags, many duplicates because because of confusion between CFLAGS/CPPFLAGS/CCFLAGS/CXXFLAGS, devs would set multiple to be on the safe side.
- defines go in CPPFLAGS
- C & C++ flags go in CCFLAGS
- CFLAGS / CXXFLAGS are C OR C++ only.
also commented intended ghost unicode/ascii usage.
Campbell Barton [Fri, 21 Oct 2011 03:16:01 +0000 (03:16 +0000)]
- remove release/bin/.blender/.bfont.ttf, we have ./release/datafiles/bfont.ttf already, and its not used anymore.
- removed scons WITH_BF_FREETYPE
Campbell Barton [Fri, 21 Oct 2011 03:00:28 +0000 (03:00 +0000)]
move fonts/ and locale/ dirs into release/datafiles, since blender wasn't finding them in their current location and so to test international characters you had to 'make install'.
updated scons/cmake/translation-scripts.
Campbell Barton [Fri, 21 Oct 2011 02:13:36 +0000 (02:13 +0000)]
- add convenience functions BLI_split_dir_part / BLI_split_file_part, which just call BLI_split_dirfile().
- add a fixed value for bprogdir (the dir of bprogname), since it was being used for resource lookups.
Guillermo S. Romero [Fri, 21 Oct 2011 01:46:03 +0000 (01:46 +0000)]
Fix copyright assignment.
Campbell Barton [Fri, 21 Oct 2011 01:33:06 +0000 (01:33 +0000)]
replace BLF's blf_utf8_next() with BLI_str_utf8_as_unicode_step(),
also fixed some spelling errors.
Campbell Barton [Fri, 21 Oct 2011 00:48:02 +0000 (00:48 +0000)]
- minor edits to font drawing/utf8, was needlessly casting int/unsigned int.
- also ifdef'd out more smoke function when the modifiers disabled.
Campbell Barton [Fri, 21 Oct 2011 00:01:22 +0000 (00:01 +0000)]
replace own unicode functions with versions from glib which support more unicode characters.
added BLI_str_utf8_as_unicode(), BLI_str_utf8_from_unicode()
Bastien Montagne [Thu, 20 Oct 2011 20:38:26 +0000 (20:38 +0000)]
Cleaning i18n code.
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
Guillermo S. Romero [Thu, 20 Oct 2011 17:55:50 +0000 (17:55 +0000)]
SVN maintenance.
Brecht Van Lommel [Thu, 20 Oct 2011 16:05:32 +0000 (16:05 +0000)]
Cycles: let cmake show error when not finding openimageio on linux.
Thomas Dinges [Thu, 20 Oct 2011 15:04:48 +0000 (15:04 +0000)]
Version cycle:
* Bcon1, alpha.
Brecht Van Lommel [Thu, 20 Oct 2011 14:58:53 +0000 (14:58 +0000)]
UI tweak: user texture datablock chooser for fields and warp modifier,
more consistent with other places.
Brecht Van Lommel [Thu, 20 Oct 2011 14:55:02 +0000 (14:55 +0000)]
Fix missing node editor update when assigning/removing materials on objects.
Brecht Van Lommel [Thu, 20 Oct 2011 14:54:22 +0000 (14:54 +0000)]
Fix missing updates when changing smoke flow settings.
Campbell Barton [Thu, 20 Oct 2011 13:50:24 +0000 (13:50 +0000)]
BLI_ghash.h was including BLI_blenlib.h, remove from ghash header and include in each file
Antony Riakiotakis [Thu, 20 Oct 2011 12:15:39 +0000 (12:15 +0000)]
reverting 41124, maybe better solution is to enforce linear space in generated float images
Campbell Barton [Thu, 20 Oct 2011 11:18:57 +0000 (11:18 +0000)]
fixes for unicode input, should work for operator textinput now.
Campbell Barton [Thu, 20 Oct 2011 10:47:38 +0000 (10:47 +0000)]
unicode text input for 3d text.
Lukas Toenne [Thu, 20 Oct 2011 10:36:02 +0000 (10:36 +0000)]
Fix for #28980, could enter infinite loop during node socket verification if dynamic sockets are present.
Note: in this particular bug report the sockets have some faulty flag settings (none of them should be flagged as SOCK_DYNAMIC), needs more info.
Jens Verwiebe [Thu, 20 Oct 2011 10:35:54 +0000 (10:35 +0000)]
OSX: dalai's patch for utf8 support, todo: uppercase chars not working yet
Bastien Montagne [Thu, 20 Oct 2011 09:53:02 +0000 (09:53 +0000)]
Minor: fix [#28899] Frequently used modelling modifiers moved further out of reach by new Vertex Weight modifiers.
Campbell Barton [Thu, 20 Oct 2011 09:47:05 +0000 (09:47 +0000)]
- add BLI_string_utf8.h for unicode functions.
- move font.c unicode functions into string_utf8.c and rename to fit with other BLI_string funcs.
Sergey Sharybin [Thu, 20 Oct 2011 08:32:26 +0000 (08:32 +0000)]
Fix #28938: Black frames when composite output node even with disabled nodes
Sergey Sharybin [Thu, 20 Oct 2011 08:19:51 +0000 (08:19 +0000)]
Fix #28937: Text Editor Selection (Scroll Bar)
Do not start selection if mouse cursor.x >= scrollbar.x
Campbell Barton [Thu, 20 Oct 2011 08:12:39 +0000 (08:12 +0000)]
fix [#28902] Rendering and visibility icons in modifier panel move between clicks
Sergey Sharybin [Thu, 20 Oct 2011 08:03:29 +0000 (08:03 +0000)]
Fix #28942: Minimize stretch in UV editing has no continues grab
Bastien Montagne [Thu, 20 Oct 2011 07:56:04 +0000 (07:56 +0000)]
A big set of UI messages fixes and tweaks! No functional changes.
Mitchell Stokes [Thu, 20 Oct 2011 07:20:17 +0000 (07:20 +0000)]
Fix for bug #28979 "Action actuator breaks animation" reported by Goran Milovanovic. Apparently IPO options can be set too frequently...
Campbell Barton [Thu, 20 Oct 2011 07:12:14 +0000 (07:12 +0000)]
minor changes to test editing
- use BLI_strncpy_utf8 for utf8 buttons when pasting.
- reuse code for ui_textedit_type_ascii / ui_textedit_type_utf8.
- use memmove rather then for() loops in string editing.
- merge jump/all arguments in interface_handlers.c into one enum arg.
Joerg Mueller [Thu, 20 Oct 2011 07:03:08 +0000 (07:03 +0000)]
Fix for 7.1 audio export being misscalculated...
Dalai Felinto [Thu, 20 Oct 2011 06:38:45 +0000 (06:38 +0000)]
bge bugfix: patch #28893 "Fix for #28753 and some other changes for BGE projection code" by Juha Mäki-Kanto (kanttori)
Dalai Felinto [Thu, 20 Oct 2011 06:29:14 +0000 (06:29 +0000)]
OSX fix for recent utf8 commit
Campbell Barton [Thu, 20 Oct 2011 05:30:26 +0000 (05:30 +0000)]
initial support for unicode keyboard input for ghost & blenders WM.
- currently X11 only, depends on Xinput (but should not break other os's).
- ghost stores utf8 buffer, copies to wmEvent's
- UI text input is currently the only area that uses this - not console or text editor.
- no rna access yet.
Joshua Leung [Thu, 20 Oct 2011 05:18:02 +0000 (05:18 +0000)]
Bugfix [#28976] crash when moving keys in dopesheet editor
Campbell Barton [Thu, 20 Oct 2011 00:48:00 +0000 (00:48 +0000)]
debug build option WITH_PYTHON_UI_INFO, so you can right click and edit the python source for UI layout directly.
Campbell Barton [Thu, 20 Oct 2011 00:19:21 +0000 (00:19 +0000)]
misc edits
- rename define DISABLE_SDL --> WITH_SDL (which was already used in some places)
- blenders interation preset was using orbit rather then turntable 3d view preference (different from factory defaults).
- tagged some unused rna args.
Campbell Barton [Wed, 19 Oct 2011 23:10:54 +0000 (23:10 +0000)]
strcpy() --> BLI_strncpy(), where source strings are not fixed and target size is known.
Antony Riakiotakis [Wed, 19 Oct 2011 23:04:48 +0000 (23:04 +0000)]
#fix: Saving OpenEXR images as floats ignores color profile. This was not noticable in renderer because it works in linear color space. Painting on the image editor, saving and reloading was problematic though.
Campbell Barton [Wed, 19 Oct 2011 22:40:03 +0000 (22:40 +0000)]
replace RNA function string lookups with direct assignments, currently the lookup returns the same pointer every time. some of these functions - panel/operator poll for eg, are called many times per redraw so while not a bottleneck its unnecessary.
Campbell Barton [Wed, 19 Oct 2011 21:55:27 +0000 (21:55 +0000)]
pass -noaudio when running blender for various utilities - doc-gen and tests.
Jens Verwiebe [Wed, 19 Oct 2011 19:15:35 +0000 (19:15 +0000)]
replace former applescript with an editable one
Jens Verwiebe [Wed, 19 Oct 2011 19:12:41 +0000 (19:12 +0000)]
OSX: set at least initial OMP_NUM_THREADS value to avoid warnings in log, remove applescript for now
Thomas Dinges [Wed, 19 Oct 2011 18:46:16 +0000 (18:46 +0000)]
Revert own commit 41026.
It now had issues when hiding menus with the - icon, space selector disappeared.
I am sorry for that, but I consider this a show stopper eventually. :(
This commit introduces the issue with narrowed verts/edge/face select in solid/edit mode again.
Peter Schlaile [Wed, 19 Oct 2011 18:21:08 +0000 (18:21 +0000)]
== Sequencer ==
do_versions fix: hd audio tracks within metastrips were not properly
upgraded from 2.49 files, resulting in broken unusable tracks, which were
rendered as black strips as a bonus.
Lukas Toenne [Wed, 19 Oct 2011 17:08:35 +0000 (17:08 +0000)]
Adds an update flag to the bNode struct (similar to bNodeTree->update).
This prevents access to non-existent typeinfo during type initialization,
when node types have been removed and such nodes are deleted from older files.
All blenkernel functions now only set the node->update flag instead of directly
calling the update function. All operators, etc. calling blenkernel functions
to modify nodes should make a ntreeUpdate call afterward (they already did that
anyway).
Editor/RNA/renderer/etc. high-level functions still can do immediate updates by
using nodeUpdate and nodeUpdateID (replacing NodeTagChanged/NodeTagIDChanged
respectively). These old functions were previously used only for setting
compositor node needexec flags and clearing cached data, but have become generic
update functions that require type-specific functionality (i.e. a valid typeinfo
struct).
Campbell Barton [Wed, 19 Oct 2011 00:41:48 +0000 (00:41 +0000)]
fix for armatures in wire draw mode not displaying in solid mode.
note, this isn't a showstopper bugfix.
Brecht Van Lommel [Wed, 19 Oct 2011 00:13:41 +0000 (00:13 +0000)]
Cycles: fix some issues with mix shaders when the weight for an emission shader
was 0.0, and background shader mix wasn't working.
Jens Verwiebe [Mon, 17 Oct 2011 16:36:03 +0000 (16:36 +0000)]
Allow symlinks in user_scripts, this fixes raised exeption in copy_prefs for version_updates
Thomas Dinges [Mon, 17 Oct 2011 15:09:23 +0000 (15:09 +0000)]
BLENDER_VERSION_CYCLE:
rc > release
Ton Roosendaal [Mon, 17 Oct 2011 15:07:08 +0000 (15:07 +0000)]
Blender 2.60 release commit!
New splash: thanks to Kent Trammell!
And thanks to judges committee: Beorn Leonard, Pratik Solanki
and Brandon Phoenix.
Next: tag & build!
Campbell Barton [Mon, 17 Oct 2011 14:44:21 +0000 (14:44 +0000)]
update man before ahoy
Campbell Barton [Mon, 17 Oct 2011 13:54:47 +0000 (13:54 +0000)]
fix/update for credits script and bad formatting in sphinx docs.
Campbell Barton [Mon, 17 Oct 2011 11:54:43 +0000 (11:54 +0000)]
use CMake's CUDA_NVCC_EXECUTABLE rather then own hard coded CYCLES_CUDA variable.
Thomas Dinges [Mon, 17 Oct 2011 11:24:20 +0000 (11:24 +0000)]
Cycles:
* Auto detection of CUDA toolkit, using FIND_PACKAGE(CUDA). (Requires at least CMAKE 2.8)
Campbell Barton [Mon, 17 Oct 2011 10:43:55 +0000 (10:43 +0000)]
py docs:
added python doc section on script performance and a note on relative file paths in the gotcha's page.
also added script for spell checking py comments.
Jens Verwiebe [Mon, 17 Oct 2011 10:43:32 +0000 (10:43 +0000)]
OSX: omp script rework part2
Jens Verwiebe [Mon, 17 Oct 2011 10:41:47 +0000 (10:41 +0000)]
OSX: omp script rework part1
Jens Verwiebe [Mon, 17 Oct 2011 10:30:08 +0000 (10:30 +0000)]
OSX: Start with OMP_NUM_THREADS default unchanged, to let the user decide about optimized value, default == all cores used
Campbell Barton [Mon, 17 Oct 2011 06:58:07 +0000 (06:58 +0000)]
correct spelling errors in comments
Campbell Barton [Mon, 17 Oct 2011 06:39:13 +0000 (06:39 +0000)]
fix spelling mistakes in comments (and in some python error messages), nothing to effect translations.
Campbell Barton [Mon, 17 Oct 2011 02:20:53 +0000 (02:20 +0000)]
docs / clenup (no functional code changes)
- added API examples for mathutils.Color/Euler/Quaternion/Matrix.
- corrected own bad spelling matricies --> matrices.
- minor pep8 edits.
- update CMake ignore file list.
Brecht Van Lommel [Sun, 16 Oct 2011 22:07:55 +0000 (22:07 +0000)]
Cycles: fix crash using uv + generated texture coordinates on a single mesh.
Thomas Dinges [Sun, 16 Oct 2011 22:06:35 +0000 (22:06 +0000)]
Cycles:
Add cmake path for the CUDA toolkit (default installation) on windows.
Brecht Van Lommel [Sun, 16 Oct 2011 20:58:48 +0000 (20:58 +0000)]
Cycles: material "sample as light" option, to make the integrator sample the
object as a mesh light or not. This may result in more/less noisy renders
depending on the situation, but should converge to the same result.
Brecht Van Lommel [Sun, 16 Oct 2011 18:54:27 +0000 (18:54 +0000)]
Cycles: enable multi closure sampling and transparent shadows only on CPU and
CUDA cards with shader model >= 2 for now (GTX 4xx, 5xx, ..). The CUDA compiler
can't handle the increased kernel size currently.
Brecht Van Lommel [Sun, 16 Oct 2011 17:55:39 +0000 (17:55 +0000)]
Cycles: revert unneeded branch change to particles UI script.
Brecht Van Lommel [Sun, 16 Oct 2011 17:54:43 +0000 (17:54 +0000)]
Cycles: add transparent shadow support, i.e. shadows through Transparent BSDF
shaders, enabled by default.
Brecht Van Lommel [Sun, 16 Oct 2011 17:40:47 +0000 (17:40 +0000)]
Cycles: enable improved closure sampling, this should give less noise for mix, add
and glass shaders. How well this will work on non-fermi GPU's is unclear still, it's
a bit heavy on register usage.
Brecht Van Lommel [Sun, 16 Oct 2011 17:19:29 +0000 (17:19 +0000)]
Cycles: fix F12 render not using render resolution for modifiers.
Brecht Van Lommel [Sun, 16 Oct 2011 17:06:01 +0000 (17:06 +0000)]
Cycles: fix sampling issue with certain (transparent) max bounce settings, and
tweak presets/defaults to use 128 instead of 1024.