November 6, 2017, 23:18 (GMT) |
Fix break on duplicated instances since IDNodes depsgraph iterator |
November 6, 2017, 23:10 (GMT) |
Remove "Group Collection" functionality This may get "double-reverted" in the future. But we want to separate this from the main patch before merging it. And then eventually merging them separately. |
November 6, 2017, 23:10 (GMT) |
Merge remote-tracking branch 'origin/blender2.8' into temp-group-collections |
November 6, 2017, 21:54 (GMT) |
macOS: remove old OpenMP lib stuff from cmake |
November 6, 2017, 19:51 (GMT) |
Depsgraph: Iterates over ID Nodes instead of Bases Although this works by itself, it should actually happen after: "Reshuffle collections base flags evaluation, make it so object is gathering its base flags from collections." Meanwhile we have one single hacky function (deg_flush_base_flags_and_settings) to be removed once the task above is tackled. Reviewers: sergey Differential Revision: https://developer.blender.org/D2899 |
November 6, 2017, 19:26 (GMT) |
Merge branch 'id_override_static' into asset-engine Conflicts: source/blender/blenkernel/intern/library.c source/blender/blenkernel/intern/node.c source/blender/makesdna/DNA_ID.h |
November 6, 2017, 19:18 (GMT) |
Merge branch 'master' into id_override_static Conflicts: source/blender/makesrna/intern/rna_access.c |
Revision 866c4a8 by Antonio Vazquez (experimental_gp_weight, greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) November 6, 2017, 17:56 (GMT) |
Fix merge errors |
Revision fdf0191 by Antonio Vazquez (experimental_gp_weight, greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) November 6, 2017, 17:44 (GMT) |
Merge branch 'blender2.8' into greasepencil-object |
November 6, 2017, 17:41 (GMT) |
DRW: Fix compilation error. |
November 6, 2017, 17:02 (GMT) |
Merge branch 'master' into blender2.8 Conflicts: intern/cycles/device/device.cpp source/blender/blenkernel/intern/library.c source/blender/blenkernel/intern/material.c source/blender/editors/object/object_add.c source/blender/editors/object/object_relations.c source/blender/editors/space_outliner/outliner_draw.c source/blender/editors/space_outliner/outliner_edit.c source/blender/editors/space_view3d/drawobject.c source/blender/editors/util/ed_util.c source/blender/windowmanager/intern/wm_files_link.c |
Revision 92a3028 by Antonio Vazquez (experimental_gp_weight, greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) November 6, 2017, 16:47 (GMT) |
Merge branch 'blender2.8' into greasepencil-object |
November 6, 2017, 16:43 (GMT) |
Eevee: Remove uses of DRW_shgroup_call_dynamic_add_empty in shadows and probe rendering. This was adding an unecessary high number of DRWCall per objects. |
November 6, 2017, 16:43 (GMT) |
DRW: Use pseudo persistent memory pool for the rendering data structure. This gets rid of the bottleneck of allocation / free of thousands of elements every frame. Cache time (Eevee) (test scene is default file with cube duplicated 3241 times) pre-patch: 23ms post-patch: 14ms |
November 6, 2017, 16:32 (GMT) |
Revert moving includes to fix linux linking and just change linkorder again |
Revision 51ca8f8 by Antonio Vazquez (experimental_gp_weight, greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) November 6, 2017, 16:17 (GMT) |
Fix problem after merge One BKE function used changed |
November 6, 2017, 16:17 (GMT) |
Rename ID_IS_LINKED_DATABLOCK to ID_IS_LINKED. This makes code closer to id_override/assent-engine ones, which introduce a new type of linked data, and hence reserve ID_IS_LINKED_DATABLOCK to real linked datablocks. |
November 6, 2017, 16:14 (GMT) |
November 6, 2017, 16:01 (GMT) |
Merge branch 'id_override_static' into asset-engine Conflicts: source/blender/editors/interface/interface_regions.c |
Revision a66cae8 by Antonio Vazquez (experimental_gp_weight, greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) November 6, 2017, 15:56 (GMT) |
Merge branch 'blender2.8' into greasepencil-object |
|
|
|


Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021