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
2016-01-04Remove SCons building systemSergey Sharybin
While SCons building system was serving us really good for ages it's no longer having much attention by the developers and started to become quite a difficult task to maintain. What's even worse -- there started to be quite serious divergence between SCons and CMake which was only accumulating over the releases now. The fact that none of the active developers are really using SCons and that our main studio is also using CMake spotting bugs in the SCons builds became quite a difficult task and we aren't always spotting them in time. Meanwhile CMake became really mature building system which is available on every platform we support and arguably it's also easier and more robust to use. This commit includes: - Removal of actual SCons building system - Removal of SCons git submodule - Removal of documentation which is stored in the sources and covers SCons - Tweaks to the buildbot master to stop using SCons submodule (this change requires deploying to the server) - Tweaks to the install dependencies script to skip installing or mentioning SCons building system - Tweaks to various helper scripts to avoid mention of SCons folders/files as well Reviewers: mont29, dingto, dfelinto, lukastoenne, lukasstockner97, brecht, Severin, merwin, aligorith, psy-fi, campbellbarton, juicyfruit Reviewed By: campbellbarton, juicyfruit Differential Revision: https://developer.blender.org/D1680
2015-12-10Eigen: fold remaining OpenNL code into intern/eigen.Brecht Van Lommel
Differential Revision: https://developer.blender.org/D1662
2015-08-04OpenSubdiv: Modifiers module missed WITH_OPENSUBDIV defineSergey Sharybin
2015-05-12Depsgraph: New dependency graph integration commitSergey Sharybin
This commit integrates the work done so far on the new dependency graph system, where goal was to replace legacy depsgraph with the new one, supporting loads of neat features like: - More granular dependency relation nature, which solves issues with fake cycles in the dependencies. - Move towards all-animatable, by better integration of drivers into the system. - Lay down some basis for upcoming copy-on-write, overrides and so on. The new system is living side-by-side with the previous one and disabled by default, so nothing will become suddenly broken. The way to enable new depsgraph is to pass `--new-depsgraph` command line argument. It's a bit early to consider the system production-ready, there are some TODOs and issues were discovered during the merge period, they'll be addressed ASAP. But it's important to merge, because it's the only way to attract artists to really start testing this system. There are number of assorted documents related on the design of the new system: * http://wiki.blender.org/index.php/User:Aligorith/GSoC2013_Depsgraph#Design_Documents * http://wiki.blender.org/index.php/User:Nazg-gul/DependencyGraph There are also some user-related information online: * http://code.blender.org/2015/02/blender-dependency-graph-branch-for-users/ * http://code.blender.org/2015/03/more-dependency-graph-tricks/ Kudos to everyone who was involved into the project: - Joshua "Aligorith" Leung -- design specification, initial code - Lukas "lukas_t" Toenne -- integrating code into blender, with further fixes - Sergey "Sergey" "Sharybin" -- some mocking around, trying to wrap up the project and so - Bassam "slikdigit" Kurdali -- stressing the new system, reporting all the issues and recording/writing documentation. - Everyone else who i forgot to mention here :)
2014-10-15SCons: Fix compilation error with booleans disabledSergey Sharybin
2014-10-08Ghost Context RefactorJason Wilkins
https://developer.blender.org/D643 Separates graphics context creation from window code in Ghost so that they can vary separately.
2014-09-26Fix the skin modifier crashing when building without Bullet.Brecht Van Lommel
2014-02-14Fix scons compiling after carve changesJens Verwiebe
2014-02-13fix scons / cmake desynchronization issue with including carve headersMartijn Berger
2014-02-13Rework carve integration into boolean modifierSergey Sharybin
Goal of this commit is to support NGons for boolean modifier (currently mesh is being tessellated before performing boolean operation) and also solve the limitation of loosing edge custom data layers after boolean operation is performed. Main idea is to make it so boolean modifier uses Carve library directly via it's C-API, avoiding BSP intermediate level which was doubling amount of memory needed for the operation and which also used quite reasonable amount of overhead time. Perhaps memory usage and CPU usage are the same after all the features are implemented but we've got support now: - ORIGINDEX for all the geometry - Interpolation of edge custom data (seams, crease) - NGons support Triangulation rule is changed now as well, so now non-flat polygons are not being merged back after Carve work. This is so because it's not so trivial to support for NGons and having different behavior for quads and NGons is even more creepy. Reviewers: lukastoenne, campbellbarton Differential Revision: https://developer.blender.org/D274
2013-05-28move BLO_sys_types.h -> BLI_sys_types.h (it had nothing todo with loading)Campbell Barton
remove MEM_sys_types.h which was a duplicate.
2013-04-11And another compile fix for Windows / scons for r55946.Thomas Dinges
2013-01-24use inline functions for subsurf MVert,MEdge mesh array functions, also some ↵Campbell Barton
include cleanup for scons/cmake.
2013-01-24add bullet define & include for scons makesrna, also move meshcache utils ↵Campbell Barton
into own file.
2012-12-17Added GPL header to sconscripts!Bastien Montagne
Also changed shebang to '#!/usr/bin/env python', this is more portable across unixes...
2012-10-24Merge GSoC project from branch: Laplacian Smooth (Operator & Modifier)Daniel Genrich
by Alexander Pinzon Fernandez (apinzonf) Supported by Google Summer of Code 2012 Project Documentation: http://wiki.blender.org/index.php/User:Apinzonf Manual Page: http://wiki.blender.org/index.php/User:Apinzonf/Doc:2.6/Manual/Modifiers/Deform/Laplacian_Smooth
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-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 ;) ).
2012-01-03svn merge ^/trunk/blender -r43085:43092Campbell Barton
2012-01-03Remesh Modifier:Thomas Dinges
* Fix for Campbell's "option to build without remesh modifier for cmake and scons" commit, this broke scons!
2011-12-31svn merge ^/trunk/blender -r43009:43033Campbell Barton
2011-12-31option to build without remesh modifier for cmake and sconsCampbell Barton
2011-12-31Add remesh modifier (dual contouring).Nicholas Bishop
This patch adds a new remeshing modifier. The algorithm is based on the paper "Dual Contouring of Hermite Data", and the implementation was contributed to Blender by Dr. Tao Ju. The contributed code is in intern/dualcon, and was modified to compile under gcc and work on 64-bit systems. Files not needed for Blender were removed and a small C wrapper was added in order to interface it with Blender. The rest of the patch is just standard modifier stuff. Reviewed by Sergey, code review link: http://codereview.appspot.com/5491053/ The remesh icon was contributed by Zafio: http://blenderartists.org/forum/showthread.php?240751-Request-for-modifier-icon/page2. Thanks to everyone in that thread for the icon proposals and discussion. Documentation and examples on the Blender wiki: http://wiki.blender.org/index.php/User:Nicholasbishop/RemeshModifier In case the history is needed for anything, check the remesh-modifier branch of this git repository: https://gitorious.org/~nicholasbishop/blenderprojects/nicholasbishop-blender
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-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-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-12svn merge -r40124:40140 https://svn.blender.org/svnroot/bf-blender/trunk/blenderCampbell Barton
2011-09-11Recast: fix bad level calls, Recast compiled out if BGE not enabled. SCons ↵Benoit Bolsee
updated but not tested.
2011-09-11svn merge -r40075:40104 https://svn.blender.org/svnroot/bf-blender/trunk/blenderCampbell Barton
2011-09-07svn merge -r 37306:39975 ↵Benoit Bolsee
https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-06svn merge -r39890:39951 https://svn.blender.org/svnroot/bf-blender/trunk/blenderCampbell Barton
2011-09-06Merged the particles-2010 branch with node improvements into trunk.Lukas Toenne
This branch adds mostly organizational improvements to the node system by renaming the node folders and files. A couple of internal features have been added too. Detailed information can be found on the wiki page: http://wiki.blender.org/index.php/User:Phonybone/Particles2010
2011-05-17synched with trunk at revision 36569Nick Samarin
2011-05-11more syncing with trunk.Campbell Barton
2011-03-18scons fixJoseph Eagar
2011-03-18scons fixJoseph Eagar
2011-02-27merge with/from trunk at r35190Joseph Eagar
2011-02-21I swear, it was just an innocence change in guardedalloc!Nathan Letwory
The butterfly wing flap, causing a nice storm in the rest of blender. Now all dependencies should point ok again. CMakers, do double-test.
2011-02-16synched with trunk at revision 34793Nick Samarin
2011-02-15Tweak priority so link error on Linux is solved. Reported by Hypercrush on IRC.Nathan Letwory
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-23CMake options to disable Decimate and Boolean Modifiers: WITH_MOD_BOOLEAN, ↵Campbell Barton
WITH_MOD_DECIMATE, renamed WITH_FLUID to WITH_MOD_FLUID
2010-10-03synched with trunk at revision 32129Nick Samarin
2010-09-26scons fix, should work now yaypython scons/scons.py Joseph Eagar
2010-09-25scons priority tweakJoseph Eagar
2010-09-07merge from trunk at r31523Joseph Eagar
2010-09-02Recast: add SCons build system.Benoit Bolsee