Blender Git Commit Log
Git Commits -> Revision 35823bb
Revision 35823bb by Sergey Sharybin (greasepencil-experimental) January 5, 2019, 07:12 (GMT) |
Merge branch 'greasepencil-object' |
Commit Details:
Full Hash: 35823bb99e44672125ba76ff9bbd94a2ede8920b
Parent Commit: c918a8b
Committed By: Charlie Jolly
Lines Changed: +319, -164
57 Modified Paths:
/release/scripts/presets/keyconfig/keymap_data/blender_default.py (+7, -1) (Diff)
/release/scripts/startup/bl_operators/wm.py (+12, -2) (Diff)
/release/scripts/startup/bl_ui/space_image.py (+2, -2) (Diff)
/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py (+6, -1) (Diff)
/release/scripts/startup/bl_ui/space_topbar.py (+4, -2) (Diff)
/source/blender/blenkernel/BKE_particle.h (+12, -0) (Diff)
/source/blender/blenkernel/BKE_subdiv.h (+15, -15) (Diff)
/source/blender/blenkernel/BKE_subdiv_eval.h (+8, -4) (Diff)
/source/blender/blenkernel/intern/gpencil.c (+12, -4) (Diff)
/source/blender/blenkernel/intern/gpencil_modifier.c (+1, -0) (Diff)
/source/blender/blenkernel/intern/particle.c (+18, -0) (Diff)
/source/blender/blenkernel/intern/subdiv_displacement_multires.c (+25, -10) (Diff)
/source/blender/blenkernel/intern/subdiv_eval.c (+12, -0) (Diff)
/source/blender/blenloader/intern/readfile.c (+1, -9) (Diff)
/source/blender/blenloader/intern/versioning_280.c (+17, -0) (Diff)
/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc (+5, -0) (Diff)
/source/blender/draw/engines/eevee/eevee_depth_of_field.c (+2, -2) (Diff)
/source/blender/editors/gpencil/gpencil_edit.c (+3, -1) (Diff)
/source/blender/editors/gpencil/gpencil_select.c (+9, -5) (Diff)
/source/blender/editors/gpencil/gpencil_utils.c (+3, -4) (Diff)
/source/blender/editors/include/ED_gpencil.h (+1, -1) (Diff)
/source/blender/editors/include/ED_object.h (+1, -1) (Diff)
/source/blender/editors/include/UI_interface.h (+2, -0) (Diff)
/source/blender/editors/interface/interface_layout.c (+6, -1) (Diff)
/source/blender/editors/interface/interface_region_menu_popup.c (+16, -0) (Diff)
/source/blender/editors/interface/interface_templates.c (+4, -2) (Diff)
/source/blender/editors/interface/view2d.c (+7, -5) (Diff)
/source/blender/editors/mask/mask_add.c (+5, -1) (Diff)
/source/blender/editors/mask/mask_intern.h (+1, -1) (Diff)
/source/blender/editors/mask/mask_ops.c (+4, -1) (Diff)
/source/blender/editors/object/object_modifier.c (+20, -12) (Diff)
/source/blender/editors/physics/particle_edit.c (+0, -19) (Diff)
/source/blender/editors/screen/screen_ops.c (+1, -5) (Diff)
/source/blender/editors/space_node/drawnode.c (+1, -1) (Diff)
/source/blender/editors/space_node/node_intern.h (+1, -0) (Diff)
/source/blender/editors/space_outliner/outliner_draw.c (+5, -0) (Diff)
/source/blender/editors/space_outliner/outliner_intern.h (+1, -1) (Diff)
/source/blender/editors/space_outliner/space_outliner.c (+5, -0) (Diff)
/source/blender/editors/space_text/text_draw.c (+7, -7) (Diff)
/source/blender/editors/space_view3d/view3d_buttons.c (+0, -1) (Diff)
/source/blender/editors/transform/transform.c (+1, -1) (Diff)
/source/blender/editors/transform/transform_conversions.c (+1, -1) (Diff)
/source/blender/editors/transform/transform_generics.c (+1, -1) (Diff)
/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp (+1, -1) (Diff)
/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp (+3, -1) (Diff)
/source/blender/freestyle/intern/python/BPy_SShape.cpp (+1, -1) (Diff)
/source/blender/freestyle/intern/python/BPy_ViewShape.cpp (+2, -5) (Diff)
/source/blender/freestyle/intern/scene_graph/Rep.h (+10, -8) (Diff)
/source/blender/freestyle/intern/view_map/Silhouette.h (+6, -8) (Diff)
/source/blender/freestyle/intern/view_map/ViewMap.h (+2, -2) (Diff)
/source/blender/freestyle/intern/winged_edge/WEdge.h (+6, -8) (Diff)
/source/blender/gpu/intern/gpu_extensions.c (+8, -1) (Diff)
/source/blender/makesdna/DNA_scene_types.h (+2, -2) (Diff)
/source/blender/makesrna/intern/rna_scene.c (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_sculpt_paint.c (+8, -0) (Diff)
/source/blender/modifiers/intern/MOD_mirror.c (+1, -1) (Diff)
/source/blender/windowmanager/intern/wm_window.c (+3, -1) (Diff)
/release/scripts/startup/bl_operators/wm.py (+12, -2) (Diff)
/release/scripts/startup/bl_ui/space_image.py (+2, -2) (Diff)
/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py (+6, -1) (Diff)
/release/scripts/startup/bl_ui/space_topbar.py (+4, -2) (Diff)
/source/blender/blenkernel/BKE_particle.h (+12, -0) (Diff)
/source/blender/blenkernel/BKE_subdiv.h (+15, -15) (Diff)
/source/blender/blenkernel/BKE_subdiv_eval.h (+8, -4) (Diff)
/source/blender/blenkernel/intern/gpencil.c (+12, -4) (Diff)
/source/blender/blenkernel/intern/gpencil_modifier.c (+1, -0) (Diff)
/source/blender/blenkernel/intern/particle.c (+18, -0) (Diff)
/source/blender/blenkernel/intern/subdiv_displacement_multires.c (+25, -10) (Diff)
/source/blender/blenkernel/intern/subdiv_eval.c (+12, -0) (Diff)
/source/blender/blenloader/intern/readfile.c (+1, -9) (Diff)
/source/blender/blenloader/intern/versioning_280.c (+17, -0) (Diff)
/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc (+5, -0) (Diff)
/source/blender/draw/engines/eevee/eevee_depth_of_field.c (+2, -2) (Diff)
/source/blender/editors/gpencil/gpencil_edit.c (+3, -1) (Diff)
/source/blender/editors/gpencil/gpencil_select.c (+9, -5) (Diff)
/source/blender/editors/gpencil/gpencil_utils.c (+3, -4) (Diff)
/source/blender/editors/include/ED_gpencil.h (+1, -1) (Diff)
/source/blender/editors/include/ED_object.h (+1, -1) (Diff)
/source/blender/editors/include/UI_interface.h (+2, -0) (Diff)
/source/blender/editors/interface/interface_layout.c (+6, -1) (Diff)
/source/blender/editors/interface/interface_region_menu_popup.c (+16, -0) (Diff)
/source/blender/editors/interface/interface_templates.c (+4, -2) (Diff)
/source/blender/editors/interface/view2d.c (+7, -5) (Diff)
/source/blender/editors/mask/mask_add.c (+5, -1) (Diff)
/source/blender/editors/mask/mask_intern.h (+1, -1) (Diff)
/source/blender/editors/mask/mask_ops.c (+4, -1) (Diff)
/source/blender/editors/object/object_modifier.c (+20, -12) (Diff)
/source/blender/editors/physics/particle_edit.c (+0, -19) (Diff)
/source/blender/editors/screen/screen_ops.c (+1, -5) (Diff)
/source/blender/editors/space_node/drawnode.c (+1, -1) (Diff)
/source/blender/editors/space_node/node_intern.h (+1, -0) (Diff)
/source/blender/editors/space_outliner/outliner_draw.c (+5, -0) (Diff)
/source/blender/editors/space_outliner/outliner_intern.h (+1, -1) (Diff)
/source/blender/editors/space_outliner/space_outliner.c (+5, -0) (Diff)
/source/blender/editors/space_text/text_draw.c (+7, -7) (Diff)
/source/blender/editors/space_view3d/view3d_buttons.c (+0, -1) (Diff)
/source/blender/editors/transform/transform.c (+1, -1) (Diff)
/source/blender/editors/transform/transform_conversions.c (+1, -1) (Diff)
/source/blender/editors/transform/transform_generics.c (+1, -1) (Diff)
/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp (+1, -1) (Diff)
/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp (+3, -1) (Diff)
/source/blender/freestyle/intern/python/BPy_SShape.cpp (+1, -1) (Diff)
/source/blender/freestyle/intern/python/BPy_ViewShape.cpp (+2, -5) (Diff)
/source/blender/freestyle/intern/scene_graph/Rep.h (+10, -8) (Diff)
/source/blender/freestyle/intern/view_map/Silhouette.h (+6, -8) (Diff)
/source/blender/freestyle/intern/view_map/ViewMap.h (+2, -2) (Diff)
/source/blender/freestyle/intern/winged_edge/WEdge.h (+6, -8) (Diff)
/source/blender/gpu/intern/gpu_extensions.c (+8, -1) (Diff)
/source/blender/makesdna/DNA_scene_types.h (+2, -2) (Diff)
/source/blender/makesrna/intern/rna_scene.c (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_sculpt_paint.c (+8, -0) (Diff)
/source/blender/modifiers/intern/MOD_mirror.c (+1, -1) (Diff)
/source/blender/windowmanager/intern/wm_window.c (+3, -1) (Diff)