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-08-18Refactor translation code out of blenfontCampbell Barton
- Add blentranslation `BLT_*` module. - moved & split `BLF_translation.h` into (`BLT_translation.h`, `BLT_lang.h`). - moved `BLF_*_unifont` functions from `blf_translation.c` to new source file `blf_font_i18n.c`.
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 :)
2015-01-20Reimplemented the voxel texture type for displaying hair continuum grids.Lukas Tönne
Conflicts: source/blender/physics/intern/BPH_mass_spring.cpp
2014-12-19Code cleanup: include directory for sconsSergey Sharybin
This directory does not exist even.
2014-10-04Typo fix for new WITH_BF_CYCLES_DEBUG option.Thomas Dinges
2014-10-04Cycles: Add support for debug passesSergey Sharybin
Currently only summed number of traversal steps and intersections used by the camera ray intersection pass is implemented, but in the future we will support more debug passes which would help checking what things makes the scene slow. Example of such extra passes could be number of bounces, time spent on the shader tree evaluation and so. Implementation from the Cycles side is pretty much straightforward, could only mention here that it's a build-time option disabled by default. From the blender side it's implemented as a PASS_DEBUG with several subtypes possible. This way we don't need to create an extra DNA pass type for each of the debug passes, saving us a bits. Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D813
2013-05-30remove redundant includes from cmake and scons.Campbell Barton
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-05-20code cleanup: scons - binreloc include was copied all over the place for no ↵Campbell Barton
reason, -pthread too.
2013-05-20code cleanup: split scons includes onto multiple lines, reduce chance of ↵Campbell Barton
include conflicts later on.
2013-03-18Merged changes in the trunk up to revision 55357.Tamito Kajiyama
Resolved conflicts: release/datafiles/startup.blend source/blender/editors/space_nla/nla_buttons.c Also updated source/blender/blenkernel/intern/linestyle.c as a follow-up of recent changes for the use of bool.
2013-03-10More UI message i18n fixes and improvements...Bastien Montagne
Rendering messages are now translatable.
2012-12-20Another big patch set by Bastien Montagne, thanks a lot!Tamito Kajiyama
* Made Freestyle optional (turned on by default). * Fix for missing bpath.c updates in the previous merge of trunk changes.
2012-12-19Merged changes in the trunk up to revision 53146.Tamito Kajiyama
Conflicts resolved: release/datafiles/startup.blend source/blender/blenkernel/CMakeLists.txt source/blender/blenlib/intern/bpath.c source/blender/blenloader/intern/readfile.c
2012-12-17Added GPL header to sconscripts!Bastien Montagne
Also changed shebang to '#!/usr/bin/env python', this is more portable across unixes...
2012-04-29Merged changes in the trunk up to revision 46045.Tamito Kajiyama
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
2012-04-24Add libMV and Scons support for MinGW-w64, patches by Caleb Joseph with ↵Antony Riakiotakis
slight modifications. Thanks!
2012-04-21Merged changes in the trunk up to revision 45820.Tamito Kajiyama
Conflicts resolved: source/creator/creator.c
2012-04-15Scons ToDo:Thomas Dinges
* Made Smoke building optional, added WITH_BF_SMOKE. * Enabled per default in btools.py
2012-04-15Blender Internal:Thomas Dinges
* Remove some remaining (already commented) radiosity cruft.
2012-03-11Merged changes in the trunk up to revision 44797.Tamito Kajiyama
Conflicts resolved: doc/python_api/sphinx_doc_gen.py source/blender/makesdna/DNA_mesh_types.h source/blender/makesrna/intern/rna_action.c source/blender/makesrna/intern/rna_ID.c source/blender/makesrna/intern/rna_mesh.c
2012-03-04Many i18n fixings, based on [#30428] [2.62] Translation Issues.Bastien Montagne
In fact, most "UI special cases" are not well translated, currently. :/ This affects especially the "Properties" panels. This commit should address problems in Graph editors, and 3D View (but probably not yet all of them). Yet it already adds more than 100 new messages (and fixes translated drawing of more). Also done some style edits…
2012-02-21Merged changes in the trunk up to revision 44266 (including BMesh).Tamito Kajiyama
Freestyle edge/face marks were ported to BMesh. Conflicts resolved: source/blender/editors/mesh/editface.c source/blender/editors/space_view3d/drawobject.c source/blender/makesdna/DNA_meshdata_types.h source/blender/blenkernel/intern/editderivedmesh.c
2011-10-29Merged changes in the trunk up to revision 41225.Tamito Kajiyama
Conflicts resolved: source/blender/render/intern/source/pipeline.c
2011-10-24svn merge ^/trunk/blender -r41200:41226 .Campbell Barton
2011-10-22Render API: add update_progress() function to update progress bar progress fromBrecht Van Lommel
external render engines. Also refactoring to move some render engine registration stuff out of RNA and into render module.
2011-08-24svn merge -r39493:39664 https://svn.blender.org/svnroot/bf-blender/trunk/blenderCampbell Barton
2011-08-24Merged changes in the trunk up to revision 39661.Tamito Kajiyama
2011-08-21Fix #28154: linux3-config.py doesn't existSergey Sharybin
Change OURPLATFORM from "linux<major_version>" to simple "linux". Since new policy for linux kernel versions that major version in platform doesn't make much sense for building rules so the same rules could be used for both of linux2 and linux3 now/ Tested on both of linux2 and linux3 systems.
2011-07-26svn merge -r38300:38400 https://svn.blender.org/svnroot/bf-blender/trunk/blenderCampbell Barton
2011-07-21Merged changes in the trunk up to revision 38543.Tamito Kajiyama
Conflicts resolved: doc/python_api/sphinx_doc_gen.py source/blender/blenkernel/CMakeLists.txt source/blender/makesdna/DNA_material_types.h source/blender/render/intern/source/pipeline.c source/creator/CMakeLists.txt
2011-07-13cmake option to build without smoke sim: WITH_MOD_SMOKECampbell Barton
2011-03-18scons fixJoseph Eagar
2011-02-27merge with/from trunk at r35190Joseph Eagar
2011-02-20Merged changes in the trunk up to revision 34996.Tamito Kajiyama
Conflicts resolved: C:\bf-blender\soc-2008-mxcurioni\doc\python_api\sphinx_doc_gen.py C:\bf-blender\soc-2008-mxcurioni\source\blender\makesrna\RNA_types.h C:\bf-blender\soc-2008-mxcurioni\source\blender\render\SConscript
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-09-04merge with trunk at r31523Joseph Eagar
2010-07-20Merged changes in the trunk up to revision 30551.Tamito Kajiyama
2010-07-20Workaround #20324: clouds (and other) textures bump mapping generates blackBrecht Van Lommel
faces. Only happens with scons/msvc and SSE enabled for raytracing. Why this happens exactly I don't know, I've tried to look for errors in the code but couldn't find any, the perlin noise code somehow is generating NaN values, but it is getting sane inputs. I suspect this is due to the render module being compiled with /arch:SSE and other parts not. For now I've made only the render_raytrace module compile with SSE, which seems to solve the problem, but is mostly a workaround.
2010-03-11BMesh branchKen Hughes
------------ Add bmesh to scons include path
2010-02-01Merged changes in the trunk up to revision 26533.Tamito Kajiyama
2010-02-01this restores building on mingw with Collada support, also it restores cross ↵Tom Musgrove
compiling, thanks to Sergey Sharybin for the patch. Note that the icons for linux cross might not be committed here, if not i'll add them in another commit
2009-12-22Merged changes in the trunk up to revision 25508.Tamito Kajiyama
2009-12-10wrong code order made linux+scons barf.Nathan Letwory
2009-12-10* WITH_BF_RAYOPTIMIZATION cleanup and flag separation by matd.Nathan Letwory
This adds BF_RAYOPTIMIZATION_SSE_FLAGS through which one can manage what SSE flags are best for the platform built for. Note that the ray optimizations coded by jaguarandi are SSE-intrinsics only.
2009-12-06Merged changes in the trunk up to revision 25149.Tamito Kajiyama
After the merge operation, running the diff command showed that the branch had a significant amount of differences from the trunk revision 25149. I had no idea where these differences came from. To resolve them and make the branch up-to-date, I just copied the following files from the trunk: release/scripts/io/import_anim_bvh.py release/scripts/io/import_scene_obj.py release/scripts/ui/space_image.py release/scripts/ui/space_view3d.py source/blender/blenkernel/intern/object.c source/blender/blenlib/BLI_math_base.h source/blender/blenlib/intern/math_base.c source/blender/editors/animation/anim_markers.c source/blender/editors/armature/armature_intern.h source/blender/editors/armature/armature_ops.c source/blender/editors/armature/editarmature.c source/blender/editors/curve/curve_intern.h source/blender/editors/curve/curve_ops.c source/blender/editors/include/ED_mesh.h source/blender/editors/include/ED_object.h source/blender/editors/include/ED_particle.h source/blender/editors/mesh/editface.c source/blender/editors/mesh/editmesh_mods.c source/blender/editors/mesh/mesh_intern.h source/blender/editors/mesh/mesh_ops.c source/blender/editors/metaball/mball_edit.c source/blender/editors/metaball/mball_intern.h source/blender/editors/metaball/mball_ops.c source/blender/editors/object/object_intern.h source/blender/editors/object/object_lattice.c source/blender/editors/object/object_ops.c source/blender/editors/object/object_select.c source/blender/editors/physics/particle_edit.c source/blender/editors/physics/physics_intern.h source/blender/editors/physics/physics_ops.c source/blender/editors/sculpt_paint/paint_intern.h source/blender/editors/sculpt_paint/paint_ops.c source/blender/editors/sculpt_paint/paint_utils.c source/blender/editors/space_view3d/view3d_select.c source/blender/editors/uvedit/uvedit_ops.c source/blender/windowmanager/WM_api.h source/blender/windowmanager/intern/wm_operators.c
2009-12-05* proper SSE setting for mingw.Nathan Letwory
* some cleanup of render module SConscript
2009-12-05* provide SCons support to enabling jaguarandi SIMD raytracer optimizations ↵Nathan Letwory
for real :) Until now only SSE switches were defined, but to really enjoy the SIMD structures, the __SSE__ define needs to be given. This can now be done with setting in your user-config.py WITH_BF_RAYOPTIMIZATION=True (or WITH_BF_RAYOPTIMIZATION=1 on command-line)
2009-11-30Merged changes to revision 25007.Tamito Kajiyama
The following files were according to the Math Lib reorganization (see the commit log of revision 24464 for more information): source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h The file release/scripts/ui/properties_render.py was also updated according the RNA UI API renaming in revision 24795.