May 4, 2019, 13:55 (GMT) |
Merge branch 'master' into fluid-mantaflow |
May 4, 2019, 13:55 (GMT) |
Merge 'master' into 'fluid-mantaflow' Conflicts: release/scripts/startup/bl_ui/properties_physics_common.py release/scripts/startup/bl_ui/properties_physics_smoke.py source/blender/blenkernel/CMakeLists.txt source/blender/blenkernel/intern/particle_system.c source/blender/blenkernel/intern/pointcache.c source/blender/blenkernel/intern/smoke.c source/blender/editors/physics/CMakeLists.txt source/blender/makesdna/DNA_smoke_types.h source/blender/modifiers/intern/MOD_smoke.c |
May 4, 2019, 10:36 (GMT) |
Merge 'master' into 'fluid-mantaflow' |
May 4, 2019, 10:35 (GMT) |
Merge 'master' into 'fluid-mantaflow' Conflicts: build_files/cmake/macros.cmake intern/smoke/CMakeLists.txt source/blender/blenkernel/CMakeLists.txt source/blender/blenkernel/intern/smoke.c source/blender/draw/engines/eevee/eevee_volumes.c |
May 4, 2019, 09:19 (GMT) |
Merge branch 'greasepencil-object' into greasepencil-experimental |
Revision 4a3fb26 by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval) May 4, 2019, 08:59 (GMT) |
GPencil: More code reorganization Part of the reorganization to implement modifiers in Edit mode. |
Revision c6cf0b9 by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval) May 4, 2019, 08:52 (GMT) |
GPencil: Move Runtime Cache data definition to BKE This is the first step to prepare the code for using the modifiers data in Edit mode. |
May 4, 2019, 07:42 (GMT) |
Merge branch 'greasepencil-object' into greasepencil-experimental |
May 3, 2019, 21:48 (GMT) |
Merge branch 'master' into filebrowser_redesign |
Revision 2c869e4 by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval) May 3, 2019, 16:44 (GMT) |
Merge branch 'master' into greasepencil-object |
Revision 9a13815 by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval) May 3, 2019, 16:38 (GMT) |
Merge branch 'master' into greasepencil-object |
Revision 3595919 by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval) May 3, 2019, 15:38 (GMT) |
GPencil: Use default Brush material in Popover For pinned materials, the stroke color must be the brush color, not selected slot. |
Revision bbb3770 by Jacques Lucke (builtin-simulation-nodes, functions, functions-experimental-refactor, particle-solver-dev, simulation-tree) May 3, 2019, 10:42 (GMT) |
speedup size constructor of small vector |
Revision 4913127 by Jacques Lucke (builtin-simulation-nodes, functions, functions-experimental-refactor, particle-solver-dev, simulation-tree) May 3, 2019, 10:39 (GMT) |
generate more readable IR |
Revision c1267d9 by Jacques Lucke (builtin-simulation-nodes, functions, functions-experimental-refactor, particle-solver-dev, simulation-tree) May 3, 2019, 10:18 (GMT) |
allow passing function pointer name |
Revision 4cd8792 by Jacques Lucke (builtin-simulation-nodes, functions, functions-experimental-refactor, particle-solver-dev, simulation-tree) May 3, 2019, 10:16 (GMT) |
cleanup code builder interface |
Revision 6ad32d6 by Jacques Lucke (builtin-simulation-nodes, functions, functions-experimental-refactor, particle-solver-dev, simulation-tree) May 3, 2019, 10:09 (GMT) |
create llvm wrapper function for calls to pointers |
Revision 4390091 by Jacques Lucke (builtin-simulation-nodes, functions, functions-experimental-refactor, particle-solver-dev, simulation-tree) May 3, 2019, 09:38 (GMT) |
utility to create a float constant |
Revision 2a957e4 by Jacques Lucke (builtin-simulation-nodes, functions, functions-experimental-refactor, particle-solver-dev, simulation-tree) May 3, 2019, 09:37 (GMT) |
cleanup small vector |
Revision c38b9e1 by Jacques Lucke (builtin-simulation-nodes, functions, functions-experimental-refactor, particle-solver-dev, simulation-tree) May 3, 2019, 08:43 (GMT) |
Merge branch 'master' into functions |
|