Revision e630644 by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval) April 21, 2019, 10:04 (GMT) |
Merge branch 'master' into greasepencil-object |
Revision 2714db0 by Campbell Barton April 21, 2019, 05:11 (GMT) |
Work in progress redesign of topbar ui |
Revision d4200f3 by Campbell Barton April 20, 2019, 15:01 (GMT) |
Work in progress redesign of topbar ui |
April 20, 2019, 06:13 (GMT) |
Merge remote-tracking branch 'origin/soc-2018-npr' into soc-2018-npr # Conflicts: # intern/opensubdiv/internal/opensubdiv_evaluator.cc # intern/opensubdiv/internal/opensubdiv_evaluator_internal.cc # release/scripts/startup/bl_ui/properties_data_modifier.py # source/blender/CMakeLists.txt # source/blender/blenkernel/intern/scene.c # source/blender/blenloader/intern/readfile.c # source/blender/blenloader/intern/versioning_280.c # source/blender/blenloader/intern/writefile.c # source/blender/bmesh/intern/bmesh_polygon.c # source/blender/draw/CMakeLists.txt # source/blender/draw/intern/draw_manager.c # source/blender/draw/modes/object_mode.c # source/blender/editors/mesh/editmesh_tools.c # source/blender/editors/mesh/mesh_ops.c # source/blender/editors/render/render_intern.h # source/blender/editors/render/render_ops.c # source/blender/editors/space_outliner/outliner_draw.c # source/blender/editors/space_view3d/space_view3d.c # source/blender/makesdna/DNA_light_types.h # source/blender/makesdna/DNA_modifier_types.h # source/blender/makesdna/DNA_scene_types.h # source/blender/makesdna/intern/makesdna.c # source/blender/makesrna/intern/CMakeLists.txt # source/blender/makesrna/intern/makesrna.c # source/blender/makesrna/intern/rna_modifier.c # source/blender/makesrna/intern/rna_scene.c # source/blender/modifiers/CMakeLists.txt # source/blender/modifiers/intern/MOD_util.c |
Revision 2c5bce2 by YimingWu (greasepencil-object, greasepencil-refactor, soc-2018-npr, soc-2019-npr, temp-gpencil-eval) April 20, 2019, 06:10 (GMT) |
Merge branch 'master' into soc-2018-npr Fix errors # Conflicts: # intern/opensubdiv/internal/opensubdiv_evaluator.cc # intern/opensubdiv/internal/opensubdiv_evaluator_internal.cc # release/scripts/startup/bl_ui/properties_data_modifier.py # source/blender/CMakeLists.txt # source/blender/blenkernel/intern/scene.c # source/blender/blenloader/intern/readfile.c # source/blender/blenloader/intern/versioning_280.c # source/blender/blenloader/intern/writefile.c # source/blender/bmesh/intern/bmesh_polygon.c # source/blender/draw/CMakeLists.txt # source/blender/draw/intern/draw_manager.c # source/blender/draw/modes/object_mode.c # source/blender/editors/mesh/editmesh_tools.c # source/blender/editors/mesh/mesh_ops.c # source/blender/editors/render/render_intern.h # source/blender/editors/render/render_ops.c # source/blender/editors/space_outliner/outliner_draw.c # source/blender/editors/space_view3d/space_view3d.c # source/blender/makesdna/DNA_light_types.h # source/blender/makesdna/DNA_modifier_types.h # source/blender/makesdna/DNA_scene_types.h # source/blender/makesdna/intern/makesdna.c # source/blender/makesrna/intern/CMakeLists.txt # source/blender/makesrna/intern/makesrna.c # source/blender/makesrna/intern/rna_modifier.c # source/blender/makesrna/intern/rna_scene.c # source/blender/modifiers/CMakeLists.txt # source/blender/modifiers/intern/MOD_util.c |
April 20, 2019, 04:51 (GMT) |
Merge branch 'master' into soc-2018-npr # Conflicts: # intern/opensubdiv/internal/opensubdiv_evaluator.cc # intern/opensubdiv/internal/opensubdiv_evaluator_internal.cc # release/scripts/startup/bl_ui/properties_data_modifier.py # source/blender/CMakeLists.txt # source/blender/blenkernel/intern/scene.c # source/blender/blenloader/intern/readfile.c # source/blender/blenloader/intern/versioning_280.c # source/blender/blenloader/intern/writefile.c # source/blender/bmesh/intern/bmesh_polygon.c # source/blender/draw/CMakeLists.txt # source/blender/draw/intern/draw_manager.c # source/blender/draw/modes/object_mode.c # source/blender/editors/mesh/editmesh_tools.c # source/blender/editors/mesh/mesh_ops.c # source/blender/editors/render/render_intern.h # source/blender/editors/render/render_ops.c # source/blender/editors/space_outliner/outliner_draw.c # source/blender/editors/space_view3d/space_view3d.c # source/blender/makesdna/DNA_light_types.h # source/blender/makesdna/DNA_modifier_types.h # source/blender/makesdna/DNA_scene_types.h # source/blender/makesdna/intern/makesdna.c # source/blender/makesrna/intern/CMakeLists.txt # source/blender/makesrna/intern/makesrna.c # source/blender/makesrna/intern/rna_modifier.c # source/blender/makesrna/intern/rna_scene.c # source/blender/modifiers/CMakeLists.txt # source/blender/modifiers/intern/MOD_util.c |
April 19, 2019, 22:14 (GMT) |
Update to new clang-format code style |
April 19, 2019, 22:09 (GMT) |
Add option to control de opacity of the sculpt mask |
April 19, 2019, 20:15 (GMT) |
Merge 'master' into 'filebrowser_redesign' |
April 19, 2019, 20:11 (GMT) |
Merge 'master' into 'filebrowser_redesign' |
April 19, 2019, 20:11 (GMT) |
Merge 'master' into 'filebrowser_redesign' |
Revision 844745d by Jacques Lucke (builtin-simulation-nodes, functions, functions-experimental-refactor, particle-solver-dev, simulation-tree) April 19, 2019, 11:56 (GMT) |
Simple range iterator with tests |
Revision 34fda46 by Jacques Lucke (builtin-simulation-nodes, functions, functions-experimental-refactor, particle-solver-dev, simulation-tree) April 19, 2019, 09:19 (GMT) |
produce lookup statistics for map and set |
Revision 866e9c3 by Jacques Lucke (builtin-simulation-nodes, functions, functions-experimental-refactor, particle-solver-dev, simulation-tree) April 19, 2019, 08:34 (GMT) |
socket builder utility function |
Revision 4d40187 by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval) April 19, 2019, 08:30 (GMT) |
Merge branch 'master' into greasepencil-object |
Revision 2a6abac by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval) April 18, 2019, 17:40 (GMT) |
Merge branch 'master' into greasepencil-object |
Revision fe9a87f by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval) April 18, 2019, 14:59 (GMT) |
Merge branch 'master' into greasepencil-object |
Revision 4047ed1 by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval) April 18, 2019, 12:29 (GMT) |
GPencil: Add option to mix color with texture This was already supported in Fill, but not in Strokes. This adds more artistic options when use textured strokes. |
Revision a656b6d by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval) April 18, 2019, 12:27 (GMT) |
Merge branch 'master' into greasepencil-object |
April 18, 2019, 12:14 (GMT) |
Merge 'master' into 'cycles_texture_cache' |
|