September 12, 2019, 13:45 (GMT) |
Merge branch 'master' into asset-engine Note: reworking filebrowser UI is still TODO. Conflicts: release/scripts/startup/bl_ui/space_filebrowser.py source/blender/blenloader/intern/versioning_280.c source/blender/editors/include/ED_fileselect.h source/blender/editors/space_file/file_draw.c source/blender/editors/space_view3d/space_view3d.c |
Revision 971ad95 by Jacques Lucke (builtin-simulation-nodes, functions, functions-experimental-refactor, particle-solver-dev, simulation-tree) September 12, 2019, 12:59 (GMT) |
solve merge conflicts |
Revision cabc40d by Jacques Lucke (builtin-simulation-nodes, functions, functions-experimental-refactor, particle-solver-dev, simulation-tree) September 12, 2019, 12:49 (GMT) |
Merge branch 'master' into functions |
September 12, 2019, 11:00 (GMT) |
Merge branch 'master' into greasepencil-object |
Revision e23abea by Jacques Lucke (builtin-simulation-nodes, functions, functions-experimental-refactor, particle-solver-dev, simulation-tree) September 12, 2019, 10:49 (GMT) |
add license header to memory utils |
Revision 7b4a2d5 by Jacques Lucke (builtin-simulation-nodes, functions, functions-experimental-refactor, particle-solver-dev, simulation-tree) September 12, 2019, 10:48 (GMT) |
rename BLI_memory.h to BLI_memory_utils_cxx.h |
Revision e7aa065 by Jacques Lucke (builtin-simulation-nodes, functions, functions-experimental-refactor, particle-solver-dev, simulation-tree) September 12, 2019, 10:45 (GMT) |
change .cpp to .cc in blenlib |
Revision 2e21ec0 by Jacques Lucke (builtin-simulation-nodes, functions, functions-experimental-refactor, particle-solver-dev, simulation-tree) September 12, 2019, 10:41 (GMT) |
change .hpp to .h in blenlib |
Revision 54350b7 by Jacques Lucke (builtin-simulation-nodes, functions, functions-experimental-refactor, particle-solver-dev, simulation-tree) September 12, 2019, 10:23 (GMT) |
change .hpp to .h |
Revision 590b231 by Jacques Lucke (builtin-simulation-nodes, functions, functions-experimental-refactor, particle-solver-dev, simulation-tree) September 12, 2019, 10:21 (GMT) |
reflow comment |
September 12, 2019, 09:18 (GMT) |
Merge branch 'master' into greasepencil-object |
September 12, 2019, 09:09 (GMT) |
LANPR: Apply cleanup branch result. |
September 12, 2019, 08:38 (GMT) |
LANPR: Remove feature line modifier file. |
September 12, 2019, 08:23 (GMT) |
Cleanup: Symbol in space_view3d.py. |
Revision 7825047 by Jacques Lucke (builtin-simulation-nodes, functions, functions-experimental-refactor, particle-solver-dev, simulation-tree) September 12, 2019, 08:09 (GMT) |
Merge branch 'master' into functions |
September 12, 2019, 07:30 (GMT) |
LANPR: Clean patch without freestyle changes. |
September 12, 2019, 07:06 (GMT) |
Cleanup: Make format. |
September 12, 2019, 06:43 (GMT) |
LANPR: target multiple material functionality. |
September 12, 2019, 04:58 (GMT) |
LANPR: Fix merge errors. |
September 12, 2019, 04:48 (GMT) |
Merge remote-tracking branch 'origin/master' into temp-lanpr-staging |
|
|
RSS Syötteet |
Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021