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
2019-02-05Cleanup: remove contributors for CMake filesCampbell Barton
Following removal from C source code. See: 8c68ed6df16d8893
2017-09-25DRW : Add new view_update mechanism.Clément Foucault
This makes updates for the viewport cleaner and also add the possibility to add a new callback called when the scene is updated.
2017-09-25Merge branch 'master' into blender2.8Sergey Sharybin
2017-09-22Remove quicktime supportAaron Carlisle
It has been deprecated since at least macOS 10.9 and fully removed in 10.12. I am unsure if we should remove it only in 2.8. But you cannot build blender with it supported when using a modern xcode version anyway so I would tend towards just removing it also for 2.79 if that ever happens. Reviewers: mont29, dfelinto, juicyfruit, brecht Reviewed By: mont29, brecht Subscribers: Blendify, brecht Maniphest Tasks: T52807 Differential Revision: https://developer.blender.org/D2333
2017-04-25Cycles: Use depsgraph instead of layersDalai Felinto
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`.
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.
2013-05-20code cleanup: replace PARALLEL define with _OPENMPCampbell Barton
2013-03-28svn merge ^/trunk/blender -r55594:55635Campbell Barton
2013-03-26I18n: various "new data translation" fixes...Bastien Montagne
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-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-30Merged changes in the trunk up to revision 41368.Tamito Kajiyama
Conflicts resolved: source/blender/blenkernel/intern/library.c source/blender/blenlib/intern/bpath.c source/blender/render/intern/source/convertblender.c
2011-10-24svn merge ^/trunk/blender -r41226:41227 .Campbell Barton
2011-10-23remove $Id: tags after discussion on the mailign list: ↵Campbell Barton
http://markmail.org/message/fp7ozcywxum3ar7n
2011-07-26svn merge -r38400:38500 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-25svn merge -r37600:37700 https://svn.blender.org/svnroot/bf-blender/trunk/blenderCampbell Barton
manually merged source/blender/editors/uvedit/uvedit_unwrap_ops.c
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-17cmake source definitions:Campbell Barton
remove missing includes and use more strict formatting.
2011-07-13dont include the preview.blend in headless modeCampbell Barton
2011-06-25Merged changes in the trunk up to revision 37799.Tamito Kajiyama
Note for VS2008 plus CMake users: I had to remove OpenEXR debug libs from the "blender" project properties > Linker > Additional Dependencies. Otherwise I got a number of linker errors concerning duplicated symbols between libcmt.lib and libcmtd.lib.
2011-06-18rename cmake include/libraries to conform with suggested cmake namesCampbell Barton
2011-06-11Merged changes in the trunk up to revision 37388.Tamito Kajiyama
Conflicts resolved: release/scripts/startup/bl_ui/properties_render.py source/creator/SConscript source/blender/blenlib/intern/bpath.c source/blender/editors/space_outliner/outliner.c
2011-05-31svn merge -r37028:37030 https://svn.blender.org/svnroot/bf-blender/trunk/blenderCampbell Barton
2011-05-31cmake maintenanceCampbell Barton
blender_add_lib now takes a separate include argument to suppress warnings in system includes (mostly ffmpeg & python). also only build wm_apple.c on apple+carbon configuration.
2011-05-20svn merge -r36725:36801 https://svn.blender.org/svnroot/bf-blender/trunk/blenderCampbell Barton
2011-05-19Code refactor: split code for render updates and opening render view intoBrecht Van Lommel
separate files, no functional changes.
2011-05-19Merged changes in the trunk up to revision 36757.Tamito Kajiyama
2011-05-10svn merge -r36564:36583 https://svn.blender.org/svnroot/bf-blender/trunk/blenderCampbell Barton
2011-05-09minor cleanup, no functional changes.Campbell Barton
2011-04-15=bmesh= merge from trunk at r36153Joseph Eagar
2011-04-11Merged changes in the trunk up to revision 36092.Tamito Kajiyama
Conflicts resolved: source/blender/makesrna/SConscript source/blender/makesrna/intern/CMakeLists.txt source/blender/render/intern/source/pipeline.c
2011-04-06add option WITH_BUILTIN_GLEW, so linux packagers can disable to use their ↵Campbell Barton
own glew library.
2011-02-27merge with/from trunk at r35190Joseph Eagar
2010-12-27Merged changes in the trunk up to revision 33894.Tamito Kajiyama
A note for branch users: CMake 2.8 on 64-bit Windows Vista raised an error in line 948 of soc-2008-mxcurioni/CMakeLists.txt due to an invalid argument for the blender_include_dirs macro: blender_include_dirs(${OPENGL_INCLUDE_DIR}) The command above should be: blender_include_dirs("${OPENGL_INCLUDE_DIR}")
2010-12-23rename blenderlib to blender_add_libCampbell Barton
2010-12-18Merged changes in the trunk up to revision 33765.Tamito Kajiyama
2010-12-08use lowercase for cmake builtin names and macros, remove contents in else() ↵Campbell Barton
and endif() which is no longer needed.
2010-12-06* Merged changes in the trunk up to revision 33492.Tamito Kajiyama
* Fixed a bug in listing all style modules in source/blender/blenlib/intern/bpath.c.
2010-11-30Add option for CMake to build libredcode, also use CODEC prefix for ffmpeg, ↵Campbell Barton
quicktime & sndfile options.
2010-11-29include headers in cmake source, added a script to check for consistency, ↵Campbell Barton
reporting missing headers & C files. this is important so IDE's using CMake integration always get blender headers. - QtCreator & MSVC for eg, probably others too.
2010-11-27Merged changes in the trunk up to revision 33348.Tamito Kajiyama
2010-11-21- include pthreads for win32 globally (as with opengl).Campbell Barton
- MSVC CFLAGS were being set by only checking WIN32, (breaking non-msvc win32 builds)
2010-10-24Merged changes in the trunk up to revision 32684.Tamito Kajiyama
2010-10-23use explicit file paths for CMake rather then globing, This is recommended ↵Campbell Barton
by cmake devs. globbing vs explicit is discussed here. http://www.cmake.org/pipermail/cmake/2008-December/025694.html Practical implications are: - developers need to keep CMakeLists.txt files up to date. - Users wont get strange linking errors if they build after a file is added, since CMake detects CMakeLists.txt is modified and automatically reconfigure.
2010-09-26Merged changes in the trunk up to revision 32124.Tamito Kajiyama
2010-09-18warning fixes and minor cmake changes.Campbell Barton
2010-09-11Merged changes in the trunk up to revision 31880.Tamito Kajiyama
2010-09-07- added back zlib include (needed for win32).Campbell Barton
- use list append in more places. - remove non existing include dir.