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-10-22remove LOD_Decimator (c++ decimator), now replaced by bmesh decimator. also ↵Campbell Barton
remove CTR c++ classes that are no longer used.
2012-09-15Color Management, Stage 2: Switch color pipeline to use OpenColorIOSergey Sharybin
Replace old color pipeline which was supporting linear/sRGB color spaces only with OpenColorIO-based pipeline. This introduces two configurable color spaces: - Input color space for images and movie clips. This space is used to convert images/movies from color space in which file is saved to Blender's linear space (for float images, byte images are not internally converted, only input space is stored for such images and used later). This setting could be found in image/clip data block settings. - Display color space which defines space in which particular display is working. This settings could be found in scene's Color Management panel. When render result is being displayed on the screen, apart from converting image to display space, some additional conversions could happen. This conversions are: - View, which defines tone curve applying before display transformation. These are different ways to view the image on the same display device. For example it could be used to emulate film view on sRGB display. - Exposure affects on image exposure before tone map is applied. - Gamma is post-display gamma correction, could be used to match particular display gamma. - RGB curves are user-defined curves which are applying before display transformation, could be used for different purposes. All this settings by default are only applying on render result and does not affect on other images. If some particular image needs to be affected by this transformation, "View as Render" setting of image data block should be set to truth. Movie clips are always affected by all display transformations. This commit also introduces configurable color space in which sequencer is working. This setting could be found in scene's Color Management panel and it should be used if such stuff as grading needs to be done in color space different from sRGB (i.e. when Film view on sRGB display is use, using VD16 space as sequencer's internal space would make grading working in space which is close to the space using for display). Some technical notes: - Image buffer's float buffer is now always in linear space, even if it was created from 16bit byte images. - Space of byte buffer is stored in image buffer's rect_colorspace property. - Profile of image buffer was removed since it's not longer meaningful. - OpenGL and GLSL is supposed to always work in sRGB space. It is possible to support other spaces, but it's quite large project which isn't so much important. - Legacy Color Management option disabled is emulated by using None display. It could have some regressions, but there's no clear way to avoid them. - If OpenColorIO is disabled on build time, it should make blender behaving in the same way as previous release with color management enabled. More details could be found at this page (more details would be added soon): http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.64/Color_Management -- Thanks to Xavier Thomas, Lukas Toene for initial work on OpenColorIO integration and to Brecht van Lommel for some further development and code/ usecase review!
2012-08-12Fix own mistake: Space got stripped before pathDaniel Genrich
2012-08-12El Topo: Fix missing includes (Scons + Cmake)Daniel Genrich
2012-07-05code cleanup: remove Python.h include from blenkernel.Campbell Barton
2012-06-04mask mode for clip editor developed by Sergey Sharybin, Pete Larabell and ↵Campbell Barton
myself. see: http://wiki.blender.org/index.php/User:Nazg-gul/MaskEditor note - mask editing tools need continued development, feather option is not working 100%
2012-04-24Add libMV and Scons support for MinGW-w64, patches by Caleb Joseph with ↵Antony Riakiotakis
slight modifications. Thanks!
2012-04-15Scons ToDo:Thomas Dinges
* Made Frameserver building optional, added WITH_BF_FRAMESERVER. * Enabled per default in btools.py
2012-04-15Scons ToDo:Thomas Dinges
* Made Smoke building optional, added WITH_BF_SMOKE. * Enabled per default in btools.py
2012-03-17Fix for yesterday i18n own commit (r44924): we now need to define ↵Bastien Montagne
WITH_INTERNATIONAL everywhere TIP_/IFACE_ macros are used (else, we get non-international, dummy NOP macros instead!). Also fixed in main CMakeList file, when no addon dir found, we want to disable WITH_PYTHON (I guess, certainly not WITH_INTERNATIONAL ;) ).
2011-11-15svn merge -r41779:41847 ^/trunk/blenderCampbell Barton
2011-11-13Ocean Sim modifier patchLukas Toenne
by Matt Ebb, Hamed Zaghaghi This adds a new Modifier "Ocean" to simulate large-scale wave motion. Details can be found in the wiki documentation [1], the project homepage [2] and the patch tracker [3] The modifier is disabled by default for now. To enable it, the WITH_OCEANSIM (cmake) / WITH_BF_OCEANSIM (scons) flags have to be set. The code depends on fftw3, so this also has to be enabled. [1] http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Ocean [2] http://www.savetheoceansim.com [3] http://projects.blender.org/tracker/?group_id=9&atid=127&func=detail&aid=28338
2011-11-08svn merge ^/trunk/blender -r41602:41638 .Campbell Barton
2011-11-07Camera tracking integrationSergey Sharybin
=========================== Commiting camera tracking integration gsoc project into trunk. This commit includes: - Bundled version of libmv library (with some changes against official repo, re-sync with libmv repo a bit later) - New datatype ID called MovieClip which is optimized to work with movie clips (both of movie files and image sequences) and doing camera/motion tracking operations. - New editor called Clip Editor which is currently used for motion/tracking stuff only, but which can be easily extended to work with masks too. This editor supports: * Loading movie files/image sequences * Build proxies with different size for loaded movie clip, also supports building undistorted proxies to increase speed of playback in undistorted mode. * Manual lens distortion mode calibration using grid and grease pencil * Supervised 2D tracking using two different algorithms KLT and SAD. * Basic algorithm for feature detection * Camera motion solving. scene orientation - New constraints to "link" scene objects with solved motions from clip: * Follow Track (make object follow 2D motion of track with given name or parent object to reconstructed 3D position of track) * Camera Solver to make camera moving in the same way as reconstructed camera This commit NOT includes changes from tomato branch: - New nodes (they'll be commited as separated patch) - Automatic image offset guessing for image input node and image editor (need to do more tests and gather more feedback) - Code cleanup in libmv-capi. It's not so critical cleanup, just increasing readability and understanadability of code. Better to make this chaneg when Keir will finish his current patch. More details about this project can be found on this page: http://wiki.blender.org/index.php/User:Nazg-gul/GSoC-2011 Further development of small features would be done in trunk, bigger/experimental features would first be implemented in tomato branch.
2011-10-30svn merge -r41335:41371Campbell Barton
2011-10-30Modifier compilation tweaks (Blender conference commit) Thomas Dinges
* Fluid compilation: Inverse the compile flag from DISABLE_ELBEEM to WITH_MOD_FLUID for consistency. (scons/cmake) * Use WITH_BF_FLUID in your user config (scons) * Add support for scons to disable build with Decimate and Boolean modifier. (WITH_BF_DECIMATE and WITH_BF_BOOLEAN)
2011-10-24svn merge ^/trunk/blender -r41100:41150Campbell Barton
2011-10-20misc editsCampbell Barton
- 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.
2011-09-23svn merge ^/trunk/blender -r40395:40405Campbell Barton
2011-09-20Get rid of c++ in blenkernel and modifiersSergey Sharybin
Also use guarded allocations for navmesh stuff.
2011-09-17svn merge -r40166:40279 ^/trunk/blenderCampbell Barton
2011-09-14resolve bad level calls from blenkenel/ into editors/ & remove editors from ↵Campbell Barton
the include path from CMake & SCons. * ED_curve_editnurbs --> curve_editnurbs * ED_sculpt_modifiers_changed --> object_sculpt_modifiers_changed
2011-09-12svn merge -r40124:40140 https://svn.blender.org/svnroot/bf-blender/trunk/blenderCampbell Barton
2011-09-11Fixes for Win+SCons and disable recastnavigationif game engine is disabled ↵Sergey Sharybin
in SCons
2011-09-11Recast: fix bad level calls, Recast compiled out if BGE not enabled. SCons ↵Benoit Bolsee
updated but not tested.
2011-07-26svn merge -r38500:38600 https://svn.blender.org/svnroot/bf-blender/trunk/blenderCampbell Barton
2011-07-26svn merge -r38300:38400 https://svn.blender.org/svnroot/bf-blender/trunk/blenderCampbell Barton
2011-07-22cmake - option to disable the frame serverCampbell Barton
2011-07-13cmake option to build without smoke sim: WITH_MOD_SMOKECampbell Barton
2011-05-31svn merge -r36900:37028 https://svn.blender.org/svnroot/bf-blender/trunk/blenderCampbell Barton
2011-05-28== FFMPEG ==Peter Schlaile
Added central compatibility header file, which enables blender to compile against very old ffmpeg versions as well as very new versions using the *NEW* API. (Old API functions are simulated using macros and inline functions) Added a whole lot of additional checks, tested against 6 different versions down the timeline, hopefully, now finally all is well.
2011-05-17svn merge -r36672:36725 https://svn.blender.org/svnroot/bf-blender/trunk/blenderCampbell Barton
2011-05-16LCMS code removed, was an experiment but never finished.Brecht Van Lommel
2011-05-09more syncing with trunk, also cleared many warnings with gcc4.6Campbell Barton
2011-05-09=bmesh= merge from trunk at r36529Joseph Eagar
2011-05-02build system changes to eltopo, re-applied.Campbell Barton
2011-05-02=trunk=Joseph Eagar
Recommitted eltopo collision code (but disabled by default) with Genscher's permission. To use, you need to install liblapack and libblas
2011-04-12revert Joseph Eagar's eltopo commits r36073, 36075 (& some minor edits)Campbell Barton
discussed with Janne, Ton, Nathan and we agreed this kind of change at least needs discussion with module owners. Its also too close to release to be making these kinds of changes. commands used: # reverse merge svn merge -r36073:36072 . # for some reason this gave a lot of property changes svn revert `svn st | grep "^ M" | awk '{print $2}'` # reverse merging didn't work here, removing while dir. svn rm extern/eltopo/ # manually fixed conflict in # ./source/blenderplayer/CMakeLists.txt # # also manually removed 2 lines from # ./CMakeLists.txt
2011-04-10=cloth collisions=Joseph Eagar
Plugged the eltopo library into the cloth solver. I was playing with it earlier, and it's so easy to use I decided to quickly put it in (trunk's) cloth. See http://www.cs.ubc.ca/labs/imager/tr/2009/eltopo/eltopo.html . The authors are on the bleeding edge of continuous collision detection (one of them did ILM's cloth sim). I don't really have to time to plug it into softbody, particles, bullet, fluid, etc, but doing so would be pretty straightforward. I'll leave that up to someone else. To use, turn on USE_ELTOPO (in cmake) or WITH_BF_ELTOPO in scons.
2011-03-20Some changes to get bmesh compiling with scons.Nathan Letwory
2011-02-27merge with/from trunk at r35190Joseph Eagar
2011-02-15Move mikktspace code to own library, so it is clear that it is alsoNathan Letwory
intended as a standalone library for use in other applications that want the same tangent space as Blender. This also keeps blenkernel clean(er) from extra math functions.
2010-12-21Workaround for blenderplayer not linking on linux with scons.Nathan Letwory
Maybe as a next big, uncool project would be: solve bad level calls.
2010-10-31rename and negate DISABLE_PYTHON --> WITH_PYTHONCampbell Barton
2010-10-27Change /WX away for now, some odd thing going on between cloned ↵Nathan Letwory
environments. Need to check after release.
2010-10-21Enable /WX in blenkernelNathan Letwory
Silence warnings
2010-10-18_DEBUG -> DEBUGNathan Letwory
2010-10-02Fix for [#24051] Scrubbing Timeline in VSE with Jack Audio doesn't scrub ↵Joerg Mueller
just plays the audio track There were actually two bugs, the one reported and that the Sync Callback never has been called after someone had to add #ifdefs around the call without checking that the build systems are even configured to add the needed definition, am I right Cam? :P
2010-09-04merge with trunk at r31523Joseph Eagar
2010-08-30Finally change SConscript tabs to spaces.Nathan Letwory