Tamito Kajiyama [Sun, 29 Apr 2012 00:59:04 +0000 (00:59 +0000)]
Merged changes in the trunk up to revision 46045.
Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/makesdna/DNA_scene_types.h
Tamito Kajiyama [Sun, 29 Apr 2012 00:19:05 +0000 (00:19 +0000)]
Suppressed "unused but set variable" warnings.
Campbell Barton [Sat, 28 Apr 2012 18:39:37 +0000 (18:39 +0000)]
bmesh api functions, not used yet:
BM_iter_elem_count_flag()
BM_iter_mesh_count_flag()
Thomas Dinges [Sat, 28 Apr 2012 17:16:38 +0000 (17:16 +0000)]
User Preferences/ Themes
* Tooltip section was there twice (User Interface category)
Issue introduced in r45092!
Sergey Sharybin [Sat, 28 Apr 2012 16:49:00 +0000 (16:49 +0000)]
Code and style cleanup in own modules in BKE and also mball module
- Make sure functions are named in way BKE_<object>_<action> (same way as RNA callbacks)
- Make functions which are used by mball.c only static and remove their prototypes
from public header file.
Further cleanup is coming.
Campbell Barton [Sat, 28 Apr 2012 15:42:27 +0000 (15:42 +0000)]
style cleanup: editors / mesh & object
Campbell Barton [Sat, 28 Apr 2012 15:14:16 +0000 (15:14 +0000)]
style cleanup: format 'for' loop macros the same as for loops, some renaming to BLI_array macros.
Sergey Sharybin [Sat, 28 Apr 2012 15:05:35 +0000 (15:05 +0000)]
Correction to recent commmit related on splitting audio channels: descriptions shouldn't end with dot.
Sergey Sharybin [Sat, 28 Apr 2012 14:54:45 +0000 (14:54 +0000)]
Camera tracking: support of tripod motion solving
Expose option into interface to use modal solver which currently
supports only tripod motion.
This solver requires two tracks at least to reconstruct motion.
Using more tracks aren't improving solution in general, just adds
instability into solution and slows down things a lot.
Refirement of camera intrinsics was disabled due to it's not only
refines camera intrinsics but also adjusts camera position which
isn't necessary here
To use this solver just activate "Tripod Motion" checkbox in
solver panel.
Merged from tomato: svn merge ^/branches/soc-2011-tomato -r45622:45624 -r46036:46037
P.S. Quite experimental yet, requires more checking and probably
tweaks to prevent camera jumps when tracks apperars/disappears
from the screen.
Joerg Mueller [Sat, 28 Apr 2012 13:37:44 +0000 (13:37 +0000)]
Hopefully a fix for [#31097] glibc error when playing sound using BGE
Joerg Mueller [Sat, 28 Apr 2012 13:16:29 +0000 (13:16 +0000)]
Audio:
* Fix for [#31099] Audio in Meta-Strips Plays Beyond Strip Cut
* Adding a split files option to the mixdown operator which then renders each channel into a separate file
Campbell Barton [Sat, 28 Apr 2012 12:23:05 +0000 (12:23 +0000)]
code cleanup: remove editmesh code left hanging around thats already been ported to bmesh, also remove main editmesh header.
Campbell Barton [Sat, 28 Apr 2012 11:45:28 +0000 (11:45 +0000)]
patch [#31104] Correct comment for mul_qt_v3
from Bill Currie (taniwha)
Campbell Barton [Sat, 28 Apr 2012 10:33:32 +0000 (10:33 +0000)]
code cleanup: replace some long ELEM7 checks with macro OB_TYPE_SUPPORT_EDITMODE()
Sergey Sharybin [Sat, 28 Apr 2012 10:09:58 +0000 (10:09 +0000)]
Camera tracking: if there's no image for current frame display default grid
and allow to interact with tracks for operators which doesn't require image.
Merged from tomato branch: svn merge ^/branches/soc-2011-tomato -r45624:45625
Sergey Sharybin [Sat, 28 Apr 2012 09:32:55 +0000 (09:32 +0000)]
Fix #31117: Segfault when removing Meshdeform Modifier
Sergey Sharybin [Sat, 28 Apr 2012 09:21:16 +0000 (09:21 +0000)]
Fix: #31095: Incorrect clamping of labels for multibyte languages
Brecht Van Lommel [Sat, 28 Apr 2012 09:10:20 +0000 (09:10 +0000)]
Cycles: fix for CUDA build.
Brecht Van Lommel [Sat, 28 Apr 2012 09:00:11 +0000 (09:00 +0000)]
Point Cache: allow baking external smoke caches. This needs to be cleaned up
a bit, I couldn't fully understand how the External setting is supposed to
work to make further changes, but this should make it work at least.
Brecht Van Lommel [Sat, 28 Apr 2012 09:00:09 +0000 (09:00 +0000)]
Addons: "persistent" parameter for addon_utils.enable(), so that you can enable
addons from a startup script and keep them enabled after loading .blend files.
Brecht Van Lommel [Sat, 28 Apr 2012 08:53:59 +0000 (08:53 +0000)]
Cycles: merging features from tomato branch.
=== BVH build time optimizations ===
* BVH building was multithreaded. Not all building is multithreaded, packing
and the initial bounding/splitting is still single threaded, but recursive
splitting is, which was the main bottleneck.
* Object splitting now uses binning rather than sorting of all elements, using
code from the Embree raytracer from Intel.
http://software.intel.com/en-us/articles/embree-photo-realistic-ray-tracing-kernels/
* Other small changes to avoid allocations, pack memory more tightly, avoid
some unnecessary operations, ...
These optimizations do not work yet when Spatial Splits are enabled, for that
more work is needed. There's also other optimizations still needed, in
particular for the case of many low poly objects, the packing step and node
memory allocation.
BVH raytracing time should remain about the same, but BVH build time should be
significantly reduced, test here show speedup of about 5x to 10x on a dual core
and 5x to 25x on an 8-core machine, depending on the scene.
=== Threads ===
Centralized task scheduler for multithreading, which is basically the
CPU device threading code wrapped into something reusable.
Basic idea is that there is a single TaskScheduler that keeps a pool of threads,
one for each core. Other places in the code can then create a TaskPool that they
can drop Tasks in to be executed by the scheduler, and wait for them to complete
or cancel them early.
=== Normal ====
Added a Normal output to the texture coordinate node. This currently
gives the object space normal, which is the same under object animation.
In the future this might become a "generated" normal so it's also stable for
deforming objects, but for now it's already useful for non-deforming objects.
=== Render Layers ===
Per render layer Samples control, leaving it to 0 will use the common scene
setting.
Environment pass will now render environment even if film is set to transparent.
Exclude Layers" added. Scene layers (all object that influence the render,
directly or indirectly) are shared between all render layers. However sometimes
it's useful to leave out some object influence for a particular render layer.
That's what this option allows you to do.
=== Filter Glossy ===
When using a value higher than 0.0, this will blur glossy reflections after
blurry bounces, to reduce noise at the cost of accuracy. 1.0 is a good
starting value to tweak.
Some light paths have a low probability of being found while contributing much
light to the pixel. As a result these light paths will be found in some pixels
and not in others, causing fireflies. An example of such a difficult path might
be a small light that is causing a small specular highlight on a sharp glossy
material, which we are seeing through a rough glossy material. With path tracing
it is difficult to find the specular highlight, but if we increase the roughness
on the material the highlight gets bigger and softer, and so easier to find.
Often this blurring will be hardly noticeable, because we are seeing it through
a blurry material anyway, but there are also cases where this will lead to a
loss of detail in lighting.
Nathan Letwory [Sat, 28 Apr 2012 08:47:37 +0000 (08:47 +0000)]
bump commit count, mingw32 -> mingw64
Nathan Letwory [Sat, 28 Apr 2012 08:45:55 +0000 (08:45 +0000)]
Add MingW as "platform"
Sergey Sharybin [Sat, 28 Apr 2012 08:43:24 +0000 (08:43 +0000)]
Style cleanup in own compositor nodes
Thomas Dinges [Sat, 28 Apr 2012 08:32:00 +0000 (08:32 +0000)]
* UI fix for last commit, forgot to remove the plugin text strings.
Campbell Barton [Sat, 28 Apr 2012 08:29:20 +0000 (08:29 +0000)]
code cleanup:
- replace inline face UV center calc.
- use const float[3] for mesh and uv functions.
- remove unused define
Thomas Dinges [Sat, 28 Apr 2012 08:27:09 +0000 (08:27 +0000)]
Plugin system:
* Remove RNA, Operator and UI for Texture and Sequence plugins.
Since 2.5x no effort has been done to bring that back, so there is simply no reason in keeping that code and the UI for that ;-)
* Low Level code still exists and is unchanged.
Campbell Barton [Sat, 28 Apr 2012 07:43:21 +0000 (07:43 +0000)]
fix memory leak in BM_face_copy()
note that this doesnt run when duplicating faces normally, only way to cause this bug I could find was to knife cut a 33+ sided ngon with multi-res applied.
also small improvement not to grow the array but allocate at once if needed.
Campbell Barton [Sat, 28 Apr 2012 07:02:44 +0000 (07:02 +0000)]
fix for incorrect selection check in opencollada integration.
Campbell Barton [Sat, 28 Apr 2012 07:00:53 +0000 (07:00 +0000)]
fix for crash when multires subdividing a mesh with no faces (new bug in bmesh grr!)
Thomas Dinges [Sat, 28 Apr 2012 06:40:12 +0000 (06:40 +0000)]
Release Cycles for 2.64 begins.
* BCon1: Alpha.
Campbell Barton [Sat, 28 Apr 2012 06:31:57 +0000 (06:31 +0000)]
style cleanup: changes to brace placement / newlines - for/while/if/switch
Nathan Letwory [Sat, 28 Apr 2012 06:28:07 +0000 (06:28 +0000)]
Same mingw fix as for compile
Campbell Barton [Sat, 28 Apr 2012 01:59:21 +0000 (01:59 +0000)]
add back lasso tool in the UV editor (Ctrl+LMB / Ctrl+Shift+LMB)
Nathan Letwory [Fri, 27 Apr 2012 13:18:55 +0000 (13:18 +0000)]
Changes to get mingw buildslaves going.
Campbell Barton [Fri, 27 Apr 2012 12:44:32 +0000 (12:44 +0000)]
fix for select flushing in UV-sync-selection mode (regression from 2.62), both border select and circle select failed in edge and vertex mode (though de-selecting worked ok).
Jens Ole Wund [Fri, 27 Apr 2012 11:49:09 +0000 (11:49 +0000)]
Patch by Jose Geraldo Brito
Tracker 31061
It cures the stiff quad option and does not seem to harm.
Nowever the stiff quads behave strange in a ngom mesh.
I can imagine that other parts in the sofybody module may be broken by the ngon structure. Well ngons and softbodies are not relly friends:
negon wants less edges softbodies would work better if more structural edges were possible
Campbell Barton [Fri, 27 Apr 2012 10:00:21 +0000 (10:00 +0000)]
fix for modal timer template, wasnt updated for changes to themes.
Campbell Barton [Fri, 27 Apr 2012 07:26:28 +0000 (07:26 +0000)]
code cleanup:
- move lasso functions into BLI (were in 3D view but UV editor needs access)
- remove unused UV functions (ones that assumed 3-4 sized UVs only)
Campbell Barton [Fri, 27 Apr 2012 03:01:27 +0000 (03:01 +0000)]
code cleanup: quiet msvc warnings
Campbell Barton [Fri, 27 Apr 2012 02:29:37 +0000 (02:29 +0000)]
cleanup msvc build flags, many were included more than once.
also make use of C_WARNINGS, CXX_WARNINGS as other platforms do.
Campbell Barton [Thu, 26 Apr 2012 18:18:09 +0000 (18:18 +0000)]
rename WholeCharacter in C too, add pthreads include back for msvc which needs it.
Campbell Barton [Thu, 26 Apr 2012 18:07:15 +0000 (18:07 +0000)]
don't have spaces in idnames, confuses py types:
http://www.blender.org/documentation/blender_python_api_2_62_4/bpy.types.Whole%20Character.html
Campbell Barton [Thu, 26 Apr 2012 17:56:21 +0000 (17:56 +0000)]
remove pthread include for windows, after this was added I couldn't build anymore with mingw, gave and error with ./source/icons/winblender.rc
Sergey Sharybin [Thu, 26 Apr 2012 17:51:41 +0000 (17:51 +0000)]
And for sure we're in release stage now!
Sergey Sharybin [Thu, 26 Apr 2012 17:49:48 +0000 (17:49 +0000)]
Release commit, 2.63!
Special thanks to Mango team for awesome splash screen!
And everybody else who made this release! :)
Brecht Van Lommel [Thu, 26 Apr 2012 17:48:07 +0000 (17:48 +0000)]
Fix crash clicking Render button in render layer compositing node. Actually
this crash could happen in other situations too, problem was a bug in the
jobs system. A job could be suspended, and the operator would stop before
the job was actually done since it was not marked as running.
Sergey Sharybin [Thu, 26 Apr 2012 17:01:04 +0000 (17:01 +0000)]
Fix for undefined reference to abort() in outliner selection module
Campbell Barton [Thu, 26 Apr 2012 16:32:30 +0000 (16:32 +0000)]
fix [#31113] bmesh.types.BMLayerCollection getter calculate key indices wrong (own fault)
also add check so layer.name won't crash incase the layer becomes invalid.
Campbell Barton [Thu, 26 Apr 2012 15:38:16 +0000 (15:38 +0000)]
fix for bevel modifier creating invalid geometry - simply tell BM_face_split() to check for doubles.
Campbell Barton [Thu, 26 Apr 2012 15:20:26 +0000 (15:20 +0000)]
fix memory leak in validating mesh and remove unneeded knife operator settings store.
Brecht Van Lommel [Thu, 26 Apr 2012 12:30:37 +0000 (12:30 +0000)]
Fix #31066: cycles keeps rendering in viewport after window closed.
Brecht Van Lommel [Thu, 26 Apr 2012 12:13:26 +0000 (12:13 +0000)]
Fix #31058: missing Simplify panel for cycles.
Brecht Van Lommel [Thu, 26 Apr 2012 12:13:22 +0000 (12:13 +0000)]
Fix related to #31067: missing update when toggling Premultiply on a sequencer strip.
Thomas Dinges [Thu, 26 Apr 2012 11:48:36 +0000 (11:48 +0000)]
* Compile fix for recent Outliner header cleanup.
Bastien Montagne [Thu, 26 Apr 2012 11:23:37 +0000 (11:23 +0000)]
Minor fix in response to Koji Iigura's mail. Own error, sorry about that (I tend to forget not all OS are utf-8 yet :/ ).
Campbell Barton [Thu, 26 Apr 2012 08:27:50 +0000 (08:27 +0000)]
code cleanup: bmesh comments/todos, no functional changes.
Nathan Letwory [Thu, 26 Apr 2012 08:04:11 +0000 (08:04 +0000)]
Fix OIIO dll copying for win32-mingw
Campbell Barton [Thu, 26 Apr 2012 05:17:54 +0000 (05:17 +0000)]
outliner header cleanup (copy pasted headers when split up Im guessing)
Campbell Barton [Thu, 26 Apr 2012 04:41:27 +0000 (04:41 +0000)]
fix for memory leak in the knife tool
Campbell Barton [Thu, 26 Apr 2012 04:15:27 +0000 (04:15 +0000)]
removed unneeded fnmatch include from outliner, comment files as needing header cleanup.
Campbell Barton [Thu, 26 Apr 2012 04:03:25 +0000 (04:03 +0000)]
fix for buffer overrun crash with saving scene name longer then 24 characters.
writing render info would try write= 64 length string into 24 length buffer.
updated py script to extract render info too.
Campbell Barton [Thu, 26 Apr 2012 03:40:10 +0000 (03:40 +0000)]
bmesh: inset tool depth used bad normals for edge verts.
Campbell Barton [Thu, 26 Apr 2012 02:24:55 +0000 (02:24 +0000)]
fix invalid memcpy() use in text editor (backspace would call memcpy with overlapping source and destination).
Thomas Dinges [Wed, 25 Apr 2012 18:12:41 +0000 (18:12 +0000)]
2.6 Ocean Modifier UI:
* Fix an alignment issue, column_flow layout apparently does not use the whole width, leaving a small gap on the right side. This should be fixed in the layout engine, but too close to release now.
Campbell Barton [Wed, 25 Apr 2012 11:31:01 +0000 (11:31 +0000)]
fix for border de-selecting with sync selection
Antony Riakiotakis [Wed, 25 Apr 2012 11:15:55 +0000 (11:15 +0000)]
Enable building of the installer with MinGW-w64, patch by Caleb Joseph (Dobz) thanks a lot!
Campbell Barton [Wed, 25 Apr 2012 10:24:31 +0000 (10:24 +0000)]
disable bevel for release after discussion with brecht and sergey, this works far too poorly to be included in release.
Campbell Barton [Wed, 25 Apr 2012 10:09:31 +0000 (10:09 +0000)]
temp disable 'use last operator settings' - too unreliable, we keep getting reports in about some menu item not working right, will try have this ready by next release.
Campbell Barton [Wed, 25 Apr 2012 07:23:20 +0000 (07:23 +0000)]
mesh.validate() / BKE_mesh_validate() --- functions now check for duplicate vertices used within the same polygon.
(which would crash otherwise)
Sergey Sharybin [Wed, 25 Apr 2012 06:28:45 +0000 (06:28 +0000)]
Update for startup.blend: remove vertex color layer from default cube
Pardon for updating this so close to release, but it's annoying to have
such a layer and in some cases it leads to unwanted sideeffects.
This layer was added by accident when was fixing flags for brushes,
didn't notice entering vertex paint mode automatically creates
vertex color layer.
Campbell Barton [Wed, 25 Apr 2012 06:06:40 +0000 (06:06 +0000)]
code cleanup: typos and set gcc attributes for string formatting.
Nicholas Bishop [Wed, 25 Apr 2012 03:44:01 +0000 (03:44 +0000)]
Small type fix for BMEditMesh.lastDataMask, should be 64-bit.
Campbell Barton [Wed, 25 Apr 2012 02:46:32 +0000 (02:46 +0000)]
fix [#31080], edge slide UV correction wasnt working for UVs surrounding the end of the slide selection (one edge sliding on a grid for example).
Campbell Barton [Wed, 25 Apr 2012 01:24:55 +0000 (01:24 +0000)]
code cleanup: edge slide code had oddly named variables, added some comments and renamed vars.
also made BM_elem_select_set() a function (was a macro calling a function).
Mike Erwin [Wed, 25 Apr 2012 01:24:29 +0000 (01:24 +0000)]
ndof: avoid potential buffer overflow in libspnav
Campbell Barton [Tue, 24 Apr 2012 23:47:10 +0000 (23:47 +0000)]
now vertex paint uses the same overrides as weight paint - so wire draw mode allows vertex paint to be unlit (which is quite handy, previously you had to hide lamps).
Campbell Barton [Tue, 24 Apr 2012 22:50:49 +0000 (22:50 +0000)]
style cleanup: no functional changes
Campbell Barton [Tue, 24 Apr 2012 21:19:18 +0000 (21:19 +0000)]
code cleanup: no functional change - had both EDBM_editselection_* and BM_editselection_* funcs, replace EDBM_ funcs.
Campbell Barton [Tue, 24 Apr 2012 20:33:39 +0000 (20:33 +0000)]
code cleanup: dont use bmesh operator flags outside a bmesh operator, use hflag tagging instead.
Campbell Barton [Tue, 24 Apr 2012 19:59:06 +0000 (19:59 +0000)]
code cleanup: rename UV functions to closer match bmesh api
Campbell Barton [Tue, 24 Apr 2012 19:53:00 +0000 (19:53 +0000)]
bmesh: fix selection flushing when editing UV's and sync selection is enabled, and edge mode is in the 3D view.
Campbell Barton [Tue, 24 Apr 2012 19:28:18 +0000 (19:28 +0000)]
bmesh/uv editor
- selecting in UV window with sync-sel enabled now sets/validates sel-history.
- border de-select now clears sel history.
Campbell Barton [Tue, 24 Apr 2012 17:50:01 +0000 (17:50 +0000)]
fix [#31083] "Hide Selected" through Menu Operation doesn't work well
Antony Riakiotakis [Tue, 24 Apr 2012 17:20:51 +0000 (17:20 +0000)]
Lower optimization settings for MinGW-w64. Full optimization causes artifacts with empties and gods know what else. Turned on -ftree-vectorize to match MSVC behaviour for 64bit.
Sergey Sharybin [Tue, 24 Apr 2012 16:35:20 +0000 (16:35 +0000)]
Prevent adding objects to be added to a group which is used as dupli-group for this object
when using "Add Selected to Active Group" operator,
Antony Riakiotakis [Tue, 24 Apr 2012 16:23:47 +0000 (16:23 +0000)]
remove leftover files from last commit
Antony Riakiotakis [Tue, 24 Apr 2012 16:14:23 +0000 (16:14 +0000)]
revert 45924, not a very clean solution, especially for external libraries and looks like -fpermissive is used in linux too
Antony Riakiotakis [Tue, 24 Apr 2012 14:51:23 +0000 (14:51 +0000)]
MinGW-w64 enable full optimization for C++ too
Antony Riakiotakis [Tue, 24 Apr 2012 14:33:44 +0000 (14:33 +0000)]
Remove mingw-w64 errors from loss of precision by converting 64bit pointers to ints. All cases found were harmless and the error behaviour could be turned off by the -fpermissive flag but I'd rather keep that off to detect any real problems should they arise.
Antony Riakiotakis [Tue, 24 Apr 2012 12:57:58 +0000 (12:57 +0000)]
Add libMV and Scons support for MinGW-w64, patches by Caleb Joseph with slight modifications.
Thanks!
Campbell Barton [Tue, 24 Apr 2012 12:27:38 +0000 (12:27 +0000)]
crash fix for brush select when no object is active
Campbell Barton [Tue, 24 Apr 2012 10:25:12 +0000 (10:25 +0000)]
fix [#31079] Revision 45893 crashes when I try to open a certain file created in it.
nasty bug going from 2.63 --> 2.62 --> 2.63, could have incorrect/corrupt data.
fix checks for this case and clears the customdata layer.
Antony Riakiotakis [Tue, 24 Apr 2012 09:58:03 +0000 (09:58 +0000)]
Add cycles support for MinGW-w64
Campbell Barton [Tue, 24 Apr 2012 09:45:56 +0000 (09:45 +0000)]
fix for possible error building with debian
Campbell Barton [Tue, 24 Apr 2012 05:38:11 +0000 (05:38 +0000)]
fix [#30997] Bevel angle option is broken (bevel vertex only)
Erwin Coumans [Tue, 24 Apr 2012 05:28:19 +0000 (05:28 +0000)]
Peer pressure :) Fix some very public (but probably harmless) errors in extern/bullet2, it will propagate to the Bullet soon from here:
https://www.assembla.com/code/bullet3/subversion/nodes
Thanks to Campbell for letting me know
Fixed described by Sean here:
http://stackoverflow.com/questions/818535/how-can-i-set-all-bits-to-1-in-a-binary-number-of-an-unknown-size
Campbell Barton [Tue, 24 Apr 2012 05:02:53 +0000 (05:02 +0000)]
workaround for vertex bevel modifier failing since the BMesh update.
Campbell Barton [Tue, 24 Apr 2012 04:44:51 +0000 (04:44 +0000)]
- remove unneeded len_v3v3 in bevel code
- remove dead assignments from vgroup-blend
Campbell Barton [Tue, 24 Apr 2012 02:01:23 +0000 (02:01 +0000)]
screenshot operator now adds file extension in the file selector and has its own save options rather then using the render options (works like image save a copy).