December 22, 2017, 17:38 (GMT) |
Merge branch 'blender2.8' into temp-workspace_mode |
December 22, 2017, 17:27 (GMT) |
Cleanup: Encapsulate primitive creation data into struct, remove unused argument Should make it easier to add new and modify existing parameters. |
December 22, 2017, 16:04 (GMT) |
Fix manipulators not updating when changing workspace view-layer There are more issues when changing view-layer (esp. with edit-mode). |
Revision 3e9db0a 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) December 22, 2017, 15:58 (GMT) |
Fix merge error in brackets |
Revision 046d8ef 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) December 22, 2017, 15:46 (GMT) |
Merge branch 'blender2.8' into greasepencil-object Conflicts: source/blender/blenloader/intern/versioning_280.c |
December 22, 2017, 15:37 (GMT) |
Task scheduler: Clarify why do we need an atomic add of 0 |
December 22, 2017, 14:41 (GMT) |
Sub-mode for groom editing, for editing different parts of the topology. |
December 22, 2017, 13:41 (GMT) |
Collection: Name collection based on parent's name So they are: House -> House 1 -> House 2 -> ... The exception is when the parent collection is the master collection. In this case we get: Master Collection -> Collection 1 -> Collection 2 -> ... This is part of "T53495: View layer and collection editing - Design Task" |
December 22, 2017, 12:40 (GMT) |
Revert unused displist changes. |
December 22, 2017, 11:51 (GMT) |
Subsurf: Avoid possible use of partially initialized edge hash |
December 22, 2017, 11:50 (GMT) |
Subsurf: Avoid global lock for loops and orig index layers This is a bit annoying to have per-DM locking, but it's way better (as in, up to 4 times better) for playback speed when having lots of subsurf objects, |
December 22, 2017, 11:25 (GMT) |
Task scheduler: Start with suspended pool to avoid threading overhead on push The idea is to avoid any threading overhead when we start pushing tasks in a loop. Similarly to how we do it from the new dependency graph. Gives couple of percent of speedup here, but also improves scalability. |
December 22, 2017, 11:17 (GMT) |
In object mode just draw simple wires for groom objects for now. |
December 22, 2017, 11:02 (GMT) |
Simple operator for adding a single groom curve in edit mode. |
December 22, 2017, 08:57 (GMT) |
Merge branch 'master' into soc-2017-normal-tools |
Revision 4523a35 by Joshua Leung (experimental_gp_weight, greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) December 22, 2017, 04:07 (GMT) |
Cleanup: Put includes in alphabetical order |
Revision 3c5d358 by Joshua Leung (experimental_gp_weight, greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) December 22, 2017, 04:04 (GMT) |
Joining GP objects also merges + fixes animation data for the merged datablocks |
Revision 8931c90 by Joshua Leung (experimental_gp_weight, greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) December 22, 2017, 02:03 (GMT) |
Cleanup: Make it clearer which datablock/object we're dealing with * gpd_act -> gpd_dst ("_act" could also mean "active one we're looking at now) * gpd -> gpd_src (we sometimes refer to "gpd" as the active one we're working on) |
December 22, 2017, 01:25 (GMT) |
T53610: Crash opening file with linked particles I could done a subversion bump, but I found a safe way to avoid it. It leads a bit of an ugly code, but once we bump the subversion next time we can clean it up easily. |
Revision 3d7732e 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) December 21, 2017, 17:21 (GMT) |
Fix parameter list after merge |
|
|
|


Master Commits
MiikaHweb | 2003-2021