198c7d3687
DRW : Add new view_update mechanism.
...
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-25 20:14:42 +02:00
98ba302f70
Merge branch 'master' into blender2.8
2017-09-25 18:57:43 +05:00
efd5e3c254
Remove quicktime support
...
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-09-22 16:40:05 -04:00
Dalai Felinto
4122eeb09a
Cycles: Use depsgraph instead of layers
2017-04-25 18:03:13 +02:00
2e2dc9b9e3
Refactor translation code out of blenfont
...
- 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-08-18 07:01:26 +10:00
8d084e8c8f
Ghost Context Refactor
...
https://developer.blender.org/D643
Separates graphics context creation from window code in Ghost so that they can vary separately.
2014-10-07 15:47:32 -05:00
7759b2743a
code cleanup: replace PARALLEL define with _OPENMP
2013-05-20 16:15:16 +00:00
f13829c782
svn merge ^/trunk/blender -r55594:55635
2013-03-27 22:24:38 +00:00
b4bd43e022
I18n: various "new data translation" fixes...
2013-03-26 14:33:53 +00:00
a462d69bbf
Another big patch set by Bastien Montagne, thanks a lot!
...
* Made Freestyle optional (turned on by default).
* Fix for missing bpath.c updates in the previous merge of trunk changes.
2012-12-20 07:57:26 +00:00
69289c978e
Merged changes in the trunk up to revision 44266 (including BMesh).
...
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
2012-02-21 01:40:04 +00:00
65668dc5eb
Merged changes in the trunk up to revision 41368.
...
Conflicts resolved:
source/blender/blenkernel/intern/library.c
source/blender/blenlib/intern/bpath.c
source/blender/render/intern/source/convertblender.c
2011-10-30 02:03:40 +00:00
15e6d6cd75
svn merge ^/trunk/blender -r41226:41227 .
2011-10-24 12:43:08 +00:00
4a04f72069
remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n
2011-10-23 17:52:20 +00:00
fc95382a97
svn merge -r38400:38500 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-07-26 03:55:23 +00:00
ac2dd40991
svn merge -r38300:38400 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-07-26 03:14:16 +00:00
a7815053ef
svn merge -r37600:37700 https://svn.blender.org/svnroot/bf-blender/trunk/blender
...
manually merged source/blender/editors/uvedit/uvedit_unwrap_ops.c
2011-07-25 12:59:54 +00:00
ce03ec4b86
Merged changes in the trunk up to revision 38543.
...
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-20 23:33:10 +00:00
410c5e3cd2
cmake source definitions:
...
remove missing includes and use more strict formatting.
2011-07-16 23:01:14 +00:00
609933208d
dont include the preview.blend in headless mode
2011-07-13 19:27:42 +00:00
d65ebf8c84
Merged changes in the trunk up to revision 37799.
...
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-25 00:49:53 +00:00
968b2a8afb
rename cmake include/libraries to conform with suggested cmake names
2011-06-18 14:12:54 +00:00
32c7e22d36
Merged changes in the trunk up to revision 37388.
...
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-06-11 00:22:10 +00:00
8949387186
svn merge -r37028:37030 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-05-31 05:28:00 +00:00
09da9d4393
cmake maintenance
...
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-31 01:15:44 +00:00
88f4087a57
svn merge -r36725:36801 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-05-20 16:52:10 +00:00
54b97c1d9d
Code refactor: split code for render updates and opening render view into
...
separate files, no functional changes.
2011-05-19 11:34:11 +00:00
dfcd015535
Merged changes in the trunk up to revision 36757.
2011-05-19 01:40:37 +00:00
21a9dc8d8b
svn merge -r36564:36583 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-05-10 00:45:06 +00:00
1e0c3d315b
minor cleanup, no functional changes.
2011-05-09 14:41:44 +00:00
c98148a963
=bmesh= merge from trunk at r36153
2011-04-15 01:19:13 +00:00
3df52d4e19
Merged changes in the trunk up to revision 36092.
...
Conflicts resolved:
source/blender/makesrna/SConscript
source/blender/makesrna/intern/CMakeLists.txt
source/blender/render/intern/source/pipeline.c
2011-04-11 00:09:56 +00:00
ca254dd37b
add option WITH_BUILTIN_GLEW, so linux packagers can disable to use their own glew library.
2011-04-05 23:31:01 +00:00
f01261d040
merge with/from trunk at r35190
2011-02-27 06:19:40 +00:00
3ead3c4ff3
Merged changes in the trunk up to revision 33894.
...
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-27 01:38:23 +00:00
5e382eb8e5
rename blenderlib to blender_add_lib
2010-12-22 23:09:30 +00:00
3368a595da
Merged changes in the trunk up to revision 33765.
2010-12-18 11:49:12 +00:00
afacd18498
use lowercase for cmake builtin names and macros, remove contents in else() and endif() which is no longer needed.
2010-12-08 08:43:06 +00:00
8a2eb1f590
* Merged changes in the trunk up to revision 33492.
...
* Fixed a bug in listing all style modules in source/blender/blenlib/intern/bpath.c.
2010-12-06 01:23:18 +00:00
42d6603cae
Add option for CMake to build libredcode, also use CODEC prefix for ffmpeg, quicktime & sndfile options.
2010-11-30 18:52:39 +00:00
e8397e6193
include headers in cmake source, added a script to check for consistency, 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-29 04:35:56 +00:00
a04603d2a0
Merged changes in the trunk up to revision 33348.
2010-11-27 12:48:35 +00:00
cd2ab75b73
- include pthreads for win32 globally (as with opengl).
...
- MSVC CFLAGS were being set by only checking WIN32, (breaking non-msvc win32 builds)
2010-11-21 09:10:50 +00:00
3b2515ba0e
Merged changes in the trunk up to revision 32684.
2010-10-24 13:05:09 +00:00
c6976e7351
use explicit file paths for CMake rather then globing, This is recommended 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-10-23 04:05:55 +00:00
df528a9209
Merged changes in the trunk up to revision 32124.
2010-09-25 21:03:16 +00:00
dea59cc5eb
warning fixes and minor cmake changes.
2010-09-18 03:55:56 +00:00
fdb4b0c3ed
Merged changes in the trunk up to revision 31880.
2010-09-11 11:16:55 +00:00
2406ebe1a4
- added back zlib include (needed for win32).
...
- use list append in more places.
- remove non existing include dir.
2010-09-07 01:13:10 +00:00
c11c196efa
part 1 of merge from trunk at r30358; it compiles, but doesn't link quite yet :)
2010-07-19 04:44:37 +00:00
