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
2011-11-20svn merge ^/trunk/blender -r41961:41998Campbell Barton
2011-11-20Replace "&" with "and" since on windows it separates the string and causes ↵Antony Riakiotakis
errors in the console.
2011-11-18svn merge ^/trunk/blender -r41939:41954Campbell Barton
2011-11-17exclude addons_contrib/ for release builds.Campbell Barton
2011-11-17centralize some of the came install commands, were being copied between ↵Campbell Barton
osx/win/linux
2011-11-16svn merge -r41847:41899 ^/trunk/blenderCampbell Barton
2011-11-16Fix #29232: on background render where it could not find the .blend file, theBrecht Van Lommel
default cube would be rendered instead, now stops processing arguments after failed file load.
2011-11-10svn merge -r41655:41715 ^/trunk/blender --- this is the real cycles merge, ↵Campbell Barton
needs some edits to cycles its self before cycles will build
2011-11-09Fixes for MinGW cmake debug build:Antony Riakiotakis
* OpenEXR doesn't need debug suffix * Fix libmv template issue when linking by removing duplicate libmv inclusion. I wonder how this never turned up in release builds as well. Important: Since OpenImageIO went into trunk, OpenEXR, possibly along with other image libraries will need to be turned on too because OIIO depends on them.
2011-11-09Build system fixes:Thomas Dinges
* Fixed Boost libs names after upgrade to 1.47 * Remove old reference to space_sound from cmake.
2011-11-08svn merge ^/trunk/blender -r41602:41638 .Campbell Barton
2011-11-07Cycles: svn merge -r41613:41627 ^/trunk/blenderBrecht Van Lommel
2011-11-07CMake: add delayed_install macro to specify files to be installed from modulesBrecht Van Lommel
other than source/creator.
2011-11-07Cycles: svn merge -r41531:41613 ^/trunk/blenderBrecht Van Lommel
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-11-06svn merge ^/trunk/blender -r41503:41575Campbell Barton
2011-11-05macro formatting & remve some unused code.Campbell Barton
2011-11-05Cycles: svn merge -r41467:41531 ^/trunk/blenderBrecht Van Lommel
2011-11-04svn merge -r41480:41503 ^/trunk/blenderCampbell Barton
2011-11-03ability to have permanent callbacks that stay active when new blend files ↵Campbell Barton
are loaded. this works by tagging functions, eg: def my_func(scene): pass bpy.app.handlers.permanent_tag(my_func, True) # <-- important bit bpy.app.handlers.frame_change_pre.append(my_func)
2011-11-02Cycles: svn merge -r41266:41467 ^/trunk/blenderBrecht Van Lommel
2011-11-01minor cleanup editsCampbell Barton
2011-10-26svn merge -r41266:41287 ^/trunk/blenderCampbell Barton
2011-10-25Cycles: svn merge -r41225:41232 ^/trunk/blenderBrecht Van Lommel
2011-10-24svn merge ^/trunk/blender -r41226:41227 .Campbell Barton
2011-10-24fix for errors with mergeCampbell Barton
2011-10-24svn merge ^/trunk/blender -r41175:41200 --- will need to apply fix afterCampbell Barton
2011-10-24svn merge ^/trunk/blender -r41150:41175Campbell Barton
2011-10-24svn merge ^/trunk/blender -r41100:41150Campbell Barton
2011-10-23remove $Id: tags after discussion on the mailign list: ↵Campbell Barton
http://markmail.org/message/fp7ozcywxum3ar7n
2011-10-22Code refactoring: move external engine functions into own file.Brecht Van Lommel
2011-10-22Cycles: svn merge -r41157:41182 ^/trunk/blenderBrecht Van Lommel
2011-10-22Cycles: svn merge -r40934:41157 ^/trunk/blenderBrecht Van Lommel
2011-10-21Code cleanup: don't use btempdir/bprogdir/bprogname globals anymore, but wrapBrecht Van Lommel
in BLI_ functions.
2011-10-21- remove release/bin/.blender/.bfont.ttf, we have ↵Campbell Barton
./release/datafiles/bfont.ttf already, and its not used anymore. - removed scons WITH_BF_FREETYPE
2011-10-21move fonts/ and locale/ dirs into release/datafiles, since blender wasn't ↵Campbell Barton
finding them in their current location and so to test international characters you had to 'make install'. updated scons/cmake/translation-scripts.
2011-10-21- add convenience functions BLI_split_dir_part / BLI_split_file_part, which ↵Campbell Barton
just call BLI_split_dirfile(). - add a fixed value for bprogdir (the dir of bprogname), since it was being used for resource lookups.
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-10-17svn merge ^/trunk/blender -r41005:41075Campbell Barton
2011-10-15misc editsCampbell Barton
- cmake/windows was installing locale & font when internationalization was disabled, twice when enabled. - file selector was using the string size-1, where this isn't needed since string buttons expected this value to be the sizeof(), accounting for '\0'. - use const char for extension checking funcs. - minor pep8 edits
2011-10-11Cycles: svn merge -r40411:40934 ^/trunk/blenderBrecht Van Lommel
2011-10-09svn merge ^/trunk/blender -r40720:40872Campbell Barton
2011-10-07Patch [#28660] x64 thumbnail handler not being installed in CMake builds by ↵Thomas Dinges
Tom Edwards.
2011-10-03remove .Blanguages, its not used anymoreCampbell Barton
2011-09-30formatting edits onlyCampbell Barton
2011-09-28svn merge ^/trunk/blender -r40587:40643Campbell Barton
2011-09-27OSX CMake bundle - blenderplayer doesn't need locale, data, ..Dalai Felinto
also blenderplayer is a subset of Blender, so no need to repeat the macros here.
2011-09-27OSX: fix player bundle_creationJens Verwiebe
2011-09-27svn merge ^/trunk/blender -r40511:40587Campbell Barton
2011-09-26replace strncpy with BLI_strncpy, in some cases strncpy was being misused ↵Campbell Barton
since it doesnt ensure \0 termination. also dont call CTX_data_scene() twice when checking for function arguments.