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
2012-05-10Merge 46051-46053 to ensure compilation on Windowsv2.63aNathan Letwory
2012-05-09blender 2.63a: merge last bunch of fixes for 'a' releaseSergey Sharybin
This merges commits form trunk: 46423, 46424, 46450, 46439, 46445, 46449, 46453, 46454 Changes checked up to rev46454
2012-05-09blender 2.63a: merge rest of changes from trunk into tag up to r46419Sergey Sharybin
Includes commits from Aligorith (46345, 46338, 46336) Collada commits 46214, 46215 and 46246 and one Aligorith's commit 46342 were already merged in previous merge.
2012-05-09blender 2.63a: merge changes from trunk into tagSergey Sharybin
For details see http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.63/Bug_Fixes#Fixes_since_2.63_.28for_bugfix_release.29 Merged listed revisions until 46419, currently not merged revisions from Collada and Aligorith sections. Revisions which caused difficulties with merge and which need to be verified: * 46159: seems to be a fix for post-release merge tomato into trunk 46023 with bunch of optimizations, changes are currently ignored * 46179: some of changes in camera.cpp and object.cpp are related on 46114 which added support for motion vector and UV passes, later Brecht cleaned up all changes related holdout due to the got mixed with motion blur. * 46181: changes in rna_lamp touches code from rev46134 (merge Harmony branch) and can not be applied on pre-merge state * 46222: none changes applied - all of them is for code introduced in 46175 which isn't getting backported to tag * 46341: completely skip -- related to changes from 46279 which is not getting backported * 46277: changes to mesh.c (which the only actual interesting changes here) are ignored. Comment says "improvement to LAST commit" and this LAST commit is not getting merged. Hopefully merge conflicts were resolved in a way which keeps file in a state previous to 46276. * Commits related on solidify modifier. They got totally screwed up MOD_solidify.c due to all that style cleanup and so. Finished up backporting MOD_solidify.c from trunk into tag by reverting style commits (seems all actual changes need to be backported there). Hopefully it's fine now. * 46417: some Changes in smoke.c are related on changes made in merge commit from smoke2 branch into trunk. Hopefully the same changes works fine with pre-merged smoke.
2012-04-29Also updating CMakeLists.txt.Joerg Mueller
2012-04-29fix pthread path for windows buildsNathan Letwory
2012-04-29Fix for windows compile.Joerg Mueller
2012-04-29Smoke: Support for moving obstacles. (Merge from Smoke2 branch)Daniel Genrich
Sponsored by the Blender Development Fund. http://www.blender.org/blenderorg/blender-foundation/development-fund/ Remarks: The original code was not designed to support moving obstacles so I had to introduce some velocity constraints into the code to prevent smoke from exploding. If this causes problems with "fire" emulation, please let me know.
2012-04-28bmesh api functions, not used yet:Campbell Barton
BM_iter_elem_count_flag() BM_iter_mesh_count_flag()
2012-04-28User Preferences/ ThemesThomas Dinges
* Tooltip section was there twice (User Interface category) Issue introduced in r45092!
2012-04-28Code and style cleanup in own modules in BKE and also mball moduleSergey Sharybin
- 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.
2012-04-28style cleanup: editors / mesh & objectCampbell Barton
2012-04-28style cleanup: format 'for' loop macros the same as for loops, some renaming ↵Campbell Barton
to BLI_array macros.
2012-04-28Correction to recent commmit related on splitting audio channels: ↵Sergey Sharybin
descriptions shouldn't end with dot.
2012-04-28Camera tracking: support of tripod motion solvingSergey Sharybin
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.
2012-04-28Hopefully a fix for [#31097] glibc error when playing sound using BGEJoerg Mueller
2012-04-28Audio:Joerg Mueller
* 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
2012-04-28code cleanup: remove editmesh code left hanging around thats already been ↵Campbell Barton
ported to bmesh, also remove main editmesh header.
2012-04-28patch [#31104] Correct comment for mul_qt_v3Campbell Barton
from Bill Currie (taniwha)
2012-04-28code cleanup: replace some long ELEM7 checks with macro ↵Campbell Barton
OB_TYPE_SUPPORT_EDITMODE()
2012-04-28Camera tracking: if there's no image for current frame display default gridSergey Sharybin
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
2012-04-28Fix #31117: Segfault when removing Meshdeform ModifierSergey Sharybin
2012-04-28Fix: #31095: Incorrect clamping of labels for multibyte languagesSergey Sharybin
2012-04-28Cycles: fix for CUDA build.Brecht Van Lommel
2012-04-28Point Cache: allow baking external smoke caches. This needs to be cleaned upBrecht Van Lommel
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.
2012-04-28Addons: "persistent" parameter for addon_utils.enable(), so that you can enableBrecht Van Lommel
addons from a startup script and keep them enabled after loading .blend files.
2012-04-28Cycles: merging features from tomato branch.Brecht Van Lommel
=== 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.
2012-04-28bump commit count, mingw32 -> mingw64Nathan Letwory
2012-04-28Add MingW as "platform"Nathan Letwory
2012-04-28Style cleanup in own compositor nodesSergey Sharybin
2012-04-28* UI fix for last commit, forgot to remove the plugin text strings. Thomas Dinges
2012-04-28code cleanup: Campbell Barton
- replace inline face UV center calc. - use const float[3] for mesh and uv functions. - remove unused define
2012-04-28Plugin system:Thomas Dinges
* 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.
2012-04-28fix memory leak in BM_face_copy()Campbell Barton
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.
2012-04-28fix for incorrect selection check in opencollada integration.Campbell Barton
2012-04-28fix for crash when multires subdividing a mesh with no faces (new bug in ↵Campbell Barton
bmesh grr!)
2012-04-28Release Cycles for 2.64 begins.Thomas Dinges
* BCon1: Alpha.
2012-04-28style cleanup: changes to brace placement / newlines - for/while/if/switchCampbell Barton
2012-04-28Same mingw fix as for compileNathan Letwory
2012-04-28add back lasso tool in the UV editor (Ctrl+LMB / Ctrl+Shift+LMB)Campbell Barton
2012-04-27Changes to get mingw buildslaves going.Nathan Letwory
2012-04-27fix for select flushing in UV-sync-selection mode (regression from 2.62), ↵Campbell Barton
both border select and circle select failed in edge and vertex mode (though de-selecting worked ok).
2012-04-27Patch by Jose Geraldo BritoJens Ole Wund
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
2012-04-27fix for modal timer template, wasnt updated for changes to themes.Campbell Barton
2012-04-27code cleanup:Campbell Barton
- 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)
2012-04-27code cleanup: quiet msvc warningsCampbell Barton
2012-04-27cleanup msvc build flags, many were included more than once.Campbell Barton
also make use of C_WARNINGS, CXX_WARNINGS as other platforms do.
2012-04-26rename WholeCharacter in C too, add pthreads include back for msvc which ↵v2.63Campbell Barton
needs it.
2012-04-26don't have spaces in idnames, confuses py types:Campbell Barton
http://www.blender.org/documentation/blender_python_api_2_62_4/bpy.types.Whole%20Character.html
2012-04-26remove pthread include for windows, after this was added I couldn't build ↵Campbell Barton
anymore with mingw, gave and error with ./source/icons/winblender.rc