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
2017-03-25Merge branch 'master' into blender2.8Campbell Barton
2017-03-24Buildbot: Use proper NVCC pathSergey Sharybin
In fact, we could probably remove this option all together.
2017-03-22Fix T51024: Switch install_deps to set OSL_ROOT_DIR instead of CYCLES_OSL.Bastien Montagne
Path by @alekulyn, thanks. Differential Revision: https://developer.blender.org/D2571
2017-03-17move Gawain library to internMike Erwin
Before now it lived in source/blender/gpu for convenience. Only a few files in the gpu module use Gawain directly. Tested on Mac, time to push and test on Windows. Todo: some CMake magic to make it easy to #include "gawain/some_header.h" from any C or H file. Main problem here is the many editors that include GPU_immediate.h which includes Gawain's immediate.h -- is there a way to avoid changing every editor's CMakeLists?
2017-03-16set required MacOS version to 10.9Mike Erwin
We could do more to simplify build files, but this is a start.
2017-03-11Merge branch 'master' into blender2.8Campbell Barton
2017-03-11Cleanup: code style & cmakeCampbell Barton
2017-03-01Merge branch 'master' into blender2.8Campbell Barton
2017-02-28Cleanup: update copyright and Blender descriptionAaron Carlisle
2017-02-15Revert "Collection Editor based on patch by Julian Eisel"Dalai Felinto
This reverts commit 3da834e83ce9d7056c033148dab04885a6d3b1b7. We will use the outliner for this now. I'm also moving the collections_ops.c to outliner_collections.c
2017-02-08Merge branch 'master' into blender2.8Sybren A. Stüvel
# Conflicts: # source/blender/blenloader/intern/writefile.c
2017-02-07Clay-Engine (merge clay-engine)Clément Foucault
Initial work by Clément Foucault with contributions from Dalai Felinto (mainly per-collection engine settings logic, and depsgraph iterator placeholder). This makes Blender require OpenGL 3.3. Which means Intel graphic card and OSX will break. Disable CLAY_ENGINE in CMake in those cases. This is a prototype render engine intended to help the design of real render engines. This is mainly an engine with enphasis in matcap and ambient occlusion. Implemented Features -------------------- * Clay Render Engine, following the new API, to be used as reference for future engines * A more complete Matcap customization with more options * Per-Collection render engine settings * New Ground Truth AO - not enabled Missing Features ---------------- * Finish object edit mode - Fix shaders to use new matrix - Fix artifacts when edge does off screen - Fix depth issue - Selection sillhouette - Mesh wires - Use mesh normals (for higher quality matcap) - Non-Mesh objects drawing - Widget drawing - Performance issues * Finish mesh edit mode - Derived-Mesh-less edit mode API (mesh_rende.c) * General edit mode - Per-collection edit mode settings * General engines - Per-collection engine settings (they are their, but they still need to be flushed by depsgraph, and used by the drawing code)
2017-02-07Render Layers and Collections (merge from render-layers)Dalai Felinto
Design Documents ---------------- * https://wiki.blender.org/index.php/Dev:2.8/Source/Layers * https://wiki.blender.org/index.php/Dev:2.8/Source/DataDesignRevised User Commit Log --------------- * New Layer and Collection system to replace render layers and viewport layers. * A layer is a set of collections of objects (and their drawing options) required for specific tasks. * A collection is a set of objects, equivalent of the old layers in Blender. A collection can be shared across multiple layers. * All Scenes have a master collection that all other collections are children of. * New collection "context" tab (in Properties Editor) * New temporary viewport "collections" panel to control per-collection visibility Missing User Features --------------------- * Collection "Filter" Option to add objects based on their names * Collection Manager operators The existing buttons are placeholders * Collection Manager drawing The editor main region is empty * Collection Override * Per-Collection engine settings This will come as a separate commit, as part of the clay-engine branch Dev Commit Log -------------- * New DNA file (DNA_layer_types.h) with the new structs We are replacing Base by a new extended Base while keeping it backward compatible with some legacy settings (i.e., lay, flag_legacy). Renamed all Base to BaseLegacy to make it clear the areas of code that still need to be converted Note: manual changes were required on - deg_builder_nodes.h, rna_object.c, KX_Light.cpp * Unittesting for main syncronization requirements - read, write, add/copy/remove objects, copy scene, collection link/unlinking, context) * New Editor: Collection Manager Based on patch by Julian Eisel This is extracted from the layer-manager branch. With the following changes: - Renamed references of layer manager to collections manager - I doesn't include the editors/space_collections/ draw and util files - The drawing code itself will be implemented separately by Julian * Base / Object: A little note about them. Original Blender code would try to keep them in sync through the code, juggling flags back and forth. This will now be handled by Depsgraph, keeping Object and Bases more separated throughout the non-rendering code. Scene.base is being cleared in doversion, and the old viewport drawing code was poorly converted to use the new bases while the new viewport code doesn't get merged and replace the old one. Python API Changes ------------------ ``` - scene.layers + # no longer exists - scene.objects + scene.scene_layers.active.objects - scene.objects.active + scene.render_layers.active.objects.active - bpy.context.scene.objects.link() + bpy.context.scene_collection.objects.link() - bpy_extras.object_utils.object_data_add(context, obdata, operator=None, use_active_layer=True, name=None) + bpy_extras.object_utils.object_data_add(context, obdata, operator=None, name=None) - bpy.context.object.select + bpy.context.object.select = True + bpy.context.object.select = False + bpy.context.object.select_get() + bpy.context.object.select_set(action='SELECT') + bpy.context.object.select_set(action='DESELECT') -AddObjectHelper.layers + # no longer exists ```
2017-02-03Buildbot: Re-enable cuda support for OSXSergey Sharybin
2017-02-02install_deps.sh: don't use backticksSybren A. Stüvel
The script complained that it could not find the executable "--build-all".
2017-02-02install_deps.sh: don't use backticksSybren A. Stüvel
The script complained that it could not find the executable "--build-all".
2017-01-31Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: source/blender/blenkernel/intern/depsgraph.c source/blender/blenkernel/intern/library_query.c
2017-01-29[msvc] Set proper OpenSubdiv flags when not using find_package to find ↵lazydodo
opensubdiv. Fixes T50548
2017-01-26Merge branch 'master' into blender2.8Sergey Sharybin
2017-01-25[Cycles/MSVC/Testing] Fix broken test code.lazydodo
Currently the tests don't run on windows for the following reasons 1) render_graph_finalize has an linking issue due missing a bunch of libraries (not sure why this is not an issue for linux) 2) This one is more interesting, in test/python/cmakelists.txt ${TEST_BLENDER_EXE_BARE} and ${TEST_BLENDER_EXE} are flat out wrong, but for some reason this doesn't matter for most tests, cause ctest will actually go out and look for the executable and fix the path for you *BUT* only for the command, if you use them in any of the parameters it'll happily pass on the wrong path. 3) on linux you can just run a .py file, windows is not as awesome and needs to be told to run it with pyton. 4) had to use the NAME/COMMAND long form of add_test otherwise $<TARGET_FILE:blender> doesn't get expanded, why? beats me. 5) missing idiff.exe for msvc2015/x64 in the libs folder. This patch addresses 1-4 , but given I have no working Linux build environment, I'm unsure if it'll break anything there 5 has been fixed in rBL61751 Reviewers: juicyfruit, brecht, sergey Reviewed By: sergey Subscribers: Blendify Tags: #cycles, #automated_testing Differential Revision: https://developer.blender.org/D2367
2017-01-24Merge branch 'master' into blender2.8Sergey Sharybin
2017-01-24Install deps: Bump OpenSubdiv version to 3.1.1Sergey Sharybin
Required to have some crash fixes.
2016-12-12Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: source/blender/blenkernel/intern/depsgraph.c source/blender/blenloader/intern/versioning_270.c source/blender/depsgraph/intern/builder/deg_builder_relations.cc source/blender/makesrna/intern/rna_main_api.c source/blender/makesrna/intern/rna_particle.c
2016-12-07Fix install_deps.sh failing to build ffmpeg 3.Bastien Montagne
--disable-libfaac is no more ffmpeg build option.
2016-12-04Fix macOS 10.9 build when using OIIO without FFmpeg.Brecht Van Lommel
2016-12-04[msvc] Changes for new oiio/ffmpeg versions.lazydodo
2016-12-03CMake: update for macOS 10.9 libs with ffmpeg 3.2.1 and webp support.Brecht Van Lommel
2016-12-01install_deps.sh: Update official (default) lib versions of ↵Bastien Montagne
py/oiio/osl/osd/ffmpeg.
2016-12-01Buildbot: Disable glibc211 slavesSergey Sharybin
2016-12-01Merge branch 'master' into blender2.8Lukas Tönne
2016-11-29[msvc] remove /opt all together and revert to the default behavior /opt:ref ↵lazydodo
for release builds, /opt:noref for debug builds.
2016-11-28[msvc] change linker options from /opt:noref to /opt:ref, saves about 20% ↵lazydodo
off the executable size Nobody appears to know why this option was on (and just on for just x64 at that)
2016-11-22Install_deps: fix warning message not showing up in case build fails.Bastien Montagne
Kinda stupid, but big nice warning about need to try clean build if something fails was only showing in case install_deps completed successfully... :P
2016-11-19Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: source/blender/blenloader/intern/versioning_270.c source/blender/depsgraph/intern/builder/deg_builder_nodes.cc source/blender/depsgraph/intern/builder/deg_builder_relations.cc source/blender/editors/space_view3d/drawobject.c
2016-11-17[MSVC] Preliminary VS2017 support.lazydodo
2016-11-16Merge remote-tracking branch 'origin/master' into blender2.8Dalai Felinto
2016-11-14intsall_deps / OSL use c++11 ABI when install_deps is asking for c++11Martijn Berger
2016-11-10buidlbot, msbuild is slightly different in that is wants to build debug ↵Martijn Berger
anyway even if we told cmake we want release
2016-11-10buidlbot, msbuild is slightly different in that is wants to build debug ↵Martijn Berger
anyway even if we told cmake we want release
2016-11-10let cmake handle calling msbuild for windows buildbotsMartijn Berger
2016-11-07Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: intern/cycles/blender/addon/properties.py
2016-11-07Buildbot: Update copy of buildbot master configurationSergey Sharybin
2016-11-03install_deps cleanup: some Debian stuff was still present in the 'generic ↵Bastien Montagne
compile-only' part of the script.
2016-11-02CMake: Make ld.gold linker optionalSergey Sharybin
Some platforms are having hard time using this linker so added an option to not use it. The options is an advanced one and enabled by default so should not cause any changes for current users.
2016-10-25Merge remote-tracking branch 'origin/master' into blender2.8Dalai Felinto
2016-10-25CMake: Followup to previous commit, try to ensure -ldl is always lastSergey Sharybin
Seems CMake will rearrange and copy libraries which are passed to the linker when some of the libraries is listed twice (for example, -lz from png libraries and -l for blender itself). This was causing libopenimageio to be added somewhere at the end of linking flags without -ldl followed after which was causing linking issues.
2016-10-25Fix possible compilation error with OIIO enabledSergey Sharybin
OIIO library has plugin API which uses dlopen()/dlclose() so need to link OIO libraries against dl library.
2016-10-22Fix T49656: Crash when starting playback while using JACK audio with A/V syncJörg Müller
When ED_screen_animation_play is called from wm_event_do_handlers,ScrArea *sa = CTX_wm_area(C); is NULL in ED_screen_animation_timer. Informing the audio system in CTX_data_main_set, that a new Main has been set.
2016-10-22Fix T49657: Audio backend "Jack" should be named "JACK".Jörg Müller
2016-10-21Merge remote-tracking branch 'origin/master' into blender2.8Dalai Felinto
Conflicts: source/blender/blenloader/intern/versioning_defaults.c