Blender Git Loki
Revision ec0ebcd by Fabian Schempp (soc-2021-porting-modifiers-to-nodes-decimate, soc-2021-porting-modifiers-to-nodes_all) August 14, 2021, 18:52 (GMT) |
Changes based on review by Hans Goudey (HooglyBoogly) and Jacques Lucke (JacquesLucke) |
Revision ee7b2e2 by Fabian Schempp (soc-2021-porting-modifiers-to-nodes-decimate, soc-2021-porting-modifiers-to-nodes_all) August 14, 2021, 13:03 (GMT) |
Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-decimate # Conflicts: # source/blender/blenkernel/BKE_node.h |
Revision 7a2994a by Fabian Schempp (soc-2021-porting-modifiers-to-nodes-decimate, soc-2021-porting-modifiers-to-nodes_all) July 30, 2021, 22:11 (GMT) |
- reverted unneeded change |
Revision 86e359b by Fabian Schempp (soc-2021-porting-modifiers-to-nodes-decimate, soc-2021-porting-modifiers-to-nodes_all) July 30, 2021, 19:07 (GMT) |
- reverted unrelated changes |
Revision 4c8def9 by Fabian Schempp (soc-2021-porting-modifiers-to-nodes-decimate, soc-2021-porting-modifiers-to-nodes_all) July 30, 2021, 19:02 (GMT) |
Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-decimate # Conflicts: # source/blender/blenkernel/BKE_node.h # source/blender/blenloader/intern/versioning_defaults.c # source/blender/editors/asset/intern/asset_filter.cc # source/blender/editors/interface/interface.c # source/blender/editors/interface/view2d_draw.c # source/blender/freestyle/intern/winged_edge/Curvature.cpp # source/blender/makesdna/DNA_fluid_types.h # source/blender/python/intern/bpy_props.c # source/blender/windowmanager/WM_types.h # source/blender/windowmanager/intern/wm_dragdrop.c |
Revision 5e19832 by Fabian Schempp (soc-2021-porting-modifiers-to-nodes-decimate, soc-2021-porting-modifiers-to-nodes_all) July 30, 2021, 18:50 (GMT) |
- changes based on Review by Jacques Lucke (JacquesLucke) and feedback by Miro Horv�th (dreamak). |
Revision 0b060a5 by Christian Rauch / Fabian Schempp (soc-2021-porting-modifiers-to-nodes-decimate, soc-2021-porting-modifiers-to-nodes_all) July 30, 2021, 14:56 (GMT) |
GHOST/X11: enable EGL This will replace GLX with EGL for X11. GLEW does not support GLX and EGL at the same time. Most distributions build GLEW with GLX support, so we have to use the externally provided GLEW and build with EGL support. This effectively sets WITH_SYSTEM_GLEW to OFF for all Linux configurations. Differential Revision: https://developer.blender.org/D12034 |
Revision 11012a8 by Julian Eisel / Fabian Schempp (soc-2021-porting-modifiers-to-nodes-decimate, soc-2021-porting-modifiers-to-nodes_all) July 30, 2021, 14:56 (GMT) |
Assets/UI: Resolve major asset view UI template limitation Before this, all asset view templates showing the same asset library would show the same assets, even if they should show different ID types. That was a major limitation since the design did forsee that this template can be put anywhere in the UI to display various sub-sets of assets. Initially I did the ID type filtering close to the asset-list reading, because I wanted to optimize reading so that we would only actually read asset information from disk of the ID type to be shown. But this will be quite complex and I'm not sure if I'll get to work on this anytime soon. So this commit moves the filtering to the template display level solving this limitation. Note: This also adds the code to filter by tags, together with the ID type. But it's not actually used anywhere yet. |
Revision 17fba21 by Julian Eisel / Fabian Schempp (soc-2021-porting-modifiers-to-nodes-decimate, soc-2021-porting-modifiers-to-nodes_all) July 30, 2021, 14:56 (GMT) |
Assets/UI: Sanity check argument for UILayout.template_asset_view() Was already doing some sanity checks, but wasn't checking if the passed property actually is a collection property, which is important. |
Revision 3006327 by Julian Eisel / Fabian Schempp (soc-2021-porting-modifiers-to-nodes-decimate, soc-2021-porting-modifiers-to-nodes_all) July 30, 2021, 14:56 (GMT) |
Cleanup: Remove unnecessary code for asset view UI template From what I can tell there is no reason anymore to do this. The design has changed since this was added. |
Revision 350d32f by Bastien Montagne / Fabian Schempp (soc-2021-porting-modifiers-to-nodes-decimate, soc-2021-porting-modifiers-to-nodes_all) July 30, 2021, 14:56 (GMT) |
Revision 3f29b8e by Germano Cavalcante / Fabian Schempp (soc-2021-porting-modifiers-to-nodes-decimate, soc-2021-porting-modifiers-to-nodes_all) July 30, 2021, 14:56 (GMT) |
Fix T89213: Some modifier properties have wrong subtype This commit resolves these RNA warnings: ``` offset: "", WARN (bpy.rna): ...sourceblenderpythoninternbpy_rna.c:1505 pyrna_enum_to_py: current value '65536' matches no enum in 'FloatProperty', 'offset', 'subtype' project_limit: "", WARN (bpy.rna): ...sourceblenderpythoninternbpy_rna.c:1505 pyrna_enum_to_py: current value '65536' matches no enum in 'FloatProperty', 'project_limit', 'subtype' falloff_radius: "", WARN (bpy.rna): ...sourceblenderpythoninternbpy_rna.c:1505 pyrna_enum_to_py: current value '65567' matches no enum in 'FloatProperty', 'falloff_radius', 'subtype' ``` |
Revision 4b02552 by Julian Eisel / Fabian Schempp (soc-2021-porting-modifiers-to-nodes-decimate, soc-2021-porting-modifiers-to-nodes_all) July 30, 2021, 14:56 (GMT) |
Cleanup: Pass asset handle to asset iterator, rather than wrapped file This iterator was introduced before `AssetHandle` existed, so it was dealing with the file data directly. Now we want as little code as possible to deal with the file data, all access should happen via the `AssetHandle`. |
Revision 4c97a02 by Bastien Montagne / Fabian Schempp (soc-2021-porting-modifiers-to-nodes-decimate, soc-2021-porting-modifiers-to-nodes_all) July 30, 2021, 14:56 (GMT) |
install_deps: Update OSL to 1.11.14.1. This has been a huge pain to get working, for several reasons (new flags needed, patching is now mandatory, etc.). Further more, discovered that debian OIIO package is now silently relying on OpenCV, without even proper handling of this dependency (at least in the `-dev` package), so had to revert to force-build own OIIO again on that distro for the time being. Ref. T88438. |
Revision 5466552 by Ray molenkamp / Fabian Schempp (soc-2021-porting-modifiers-to-nodes-decimate, soc-2021-porting-modifiers-to-nodes_all) July 30, 2021, 14:56 (GMT) |
deps/win: Remove media foundation dep for ffmpeg This caused a blender load error on windows N, given we do not use these codecs they can safely be disabled. This will fix T90200 once the new libraries are in SVN |
Revision 6d296ff by Bastien Montagne / Fabian Schempp (soc-2021-porting-modifiers-to-nodes-decimate, soc-2021-porting-modifiers-to-nodes_all) July 30, 2021, 14:56 (GMT) |
Cleanup: OSL buildlib patch: Remove `.rej` part. This patch contained changes for an `.rej` rejection file generated by failed patch apply... Definitly nothing to do here. |
Revision 83d537c by Julian Eisel / Fabian Schempp (soc-2021-porting-modifiers-to-nodes-decimate, soc-2021-porting-modifiers-to-nodes_all) July 30, 2021, 14:56 (GMT) |
Cleanup: Consistent indent style for asset CMakeLists file Was mixing 4 and 2 space indent in a single file. |
Revision ab66f1d by Bastien Montagne / Fabian Schempp (soc-2021-porting-modifiers-to-nodes-decimate, soc-2021-porting-modifiers-to-nodes_all) July 30, 2021, 14:56 (GMT) |
Revision b23cdd5 by Brecht Van Lommel / Fabian Schempp (soc-2021-porting-modifiers-to-nodes-decimate, soc-2021-porting-modifiers-to-nodes_all) July 30, 2021, 14:56 (GMT) |
Render: remove unused Blender Internal view layer settings These should have been removed earlier but were forgotten. |
Revision ba06899 by Brecht Van Lommel / Fabian Schempp (soc-2021-porting-modifiers-to-nodes-decimate, soc-2021-porting-modifiers-to-nodes_all) July 30, 2021, 14:56 (GMT) |
Fix T90295: inconsistent render pass order between Cycles and Eevee |