[Bf-blender-cvs] [66da2f537ae] blender2.8: New Grease Pencil object for 2D animation
Antonioya
noreply at git.blender.org
Tue Jul 31 10:51:59 CEST 2018
Commit: 66da2f537ae80ce2b31d1eaf34ad8c03d858938d
Author: Antonioya
Date: Tue Jul 31 10:22:19 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB66da2f537ae80ce2b31d1eaf34ad8c03d858938d
New Grease Pencil object for 2D animation
This commit merge the full development done in greasepencil-object branch and include mainly the following features.
- New grease pencil object.
- New drawing engine.
- New grease pencil modes Draw/Sculpt/Edit and Weight Paint.
- New brushes for grease pencil.
- New modifiers for grease pencil.
- New shaders FX.
- New material system (replace old palettes and colors).
- Split of annotations (old grease pencil) and new grease pencil object.
- UI adapted to blender 2.8.
You can get more info here:
https://code.blender.org/2017/12/drawing-2d-animation-in-blender-2-8/
https://code.blender.org/2018/07/grease-pencil-status-update/
This is the result of nearly two years of development and I want thanks firstly the other members of the grease pencil team: Daniel M. Lara, Matias Mendiola and Joshua Leung for their support, ideas and to keep working in the project all the time, without them this project had been impossible.
Also, I want thanks other Blender developers for their help, advices and to be there always to help me, and specially to Clément Foucault, Dalai Felinto, Pablo Vázquez and Campbell Barton.
===================================================================
M build_files/cmake/macros.cmake
M intern/cycles/blender/addon/ui.py
A release/datafiles/brushicons/gp_brush_block.png
A release/datafiles/brushicons/gp_brush_clone.png
A release/datafiles/brushicons/gp_brush_erase_hard.png
A release/datafiles/brushicons/gp_brush_erase_soft.png
A release/datafiles/brushicons/gp_brush_erase_stroke.png
A release/datafiles/brushicons/gp_brush_fill.png
A release/datafiles/brushicons/gp_brush_grab.png
A release/datafiles/brushicons/gp_brush_ink.png
A release/datafiles/brushicons/gp_brush_inknoise.png
A release/datafiles/brushicons/gp_brush_marker.png
A release/datafiles/brushicons/gp_brush_pen.png
A release/datafiles/brushicons/gp_brush_pencil.png
A release/datafiles/brushicons/gp_brush_pinch.png
A release/datafiles/brushicons/gp_brush_push.png
A release/datafiles/brushicons/gp_brush_randomize.png
A release/datafiles/brushicons/gp_brush_smooth.png
A release/datafiles/brushicons/gp_brush_strength.png
A release/datafiles/brushicons/gp_brush_thickness.png
A release/datafiles/brushicons/gp_brush_twist.png
A release/datafiles/brushicons/gp_brush_weight.png
A release/datafiles/icons/brush.gpencil.draw.eraser_hard.dat
A release/datafiles/icons/brush.gpencil.draw.eraser_soft.dat
A release/datafiles/icons/brush.gpencil.draw.eraser_stroke.dat
A release/datafiles/icons/brush.gpencil.draw_block.dat
A release/datafiles/icons/brush.gpencil.draw_fill.dat
A release/datafiles/icons/brush.gpencil.draw_ink.dat
A release/datafiles/icons/brush.gpencil.draw_marker.dat
A release/datafiles/icons/brush.gpencil.draw_noise.dat
A release/datafiles/icons/brush.gpencil.draw_pen.dat
A release/datafiles/icons/brush.gpencil.draw_pencil.dat
A release/datafiles/icons/ops.gpencil.draw.dat
A release/datafiles/icons/ops.gpencil.draw.eraser.dat
A release/datafiles/icons/ops.gpencil.draw.line.dat
A release/datafiles/icons/ops.gpencil.draw.poly.dat
A release/datafiles/icons/ops.gpencil.edit_bend.dat
A release/datafiles/icons/ops.gpencil.edit_mirror.dat
A release/datafiles/icons/ops.gpencil.edit_shear.dat
A release/datafiles/icons/ops.gpencil.edit_to_sphere.dat
A release/datafiles/icons/ops.gpencil.sculpt_clone.dat
A release/datafiles/icons/ops.gpencil.sculpt_grab.dat
A release/datafiles/icons/ops.gpencil.sculpt_pinch.dat
A release/datafiles/icons/ops.gpencil.sculpt_push.dat
A release/datafiles/icons/ops.gpencil.sculpt_randomize.dat
A release/datafiles/icons/ops.gpencil.sculpt_smooth.dat
A release/datafiles/icons/ops.gpencil.sculpt_strength.dat
A release/datafiles/icons/ops.gpencil.sculpt_thickness.dat
A release/datafiles/icons/ops.gpencil.sculpt_twist.dat
A release/datafiles/icons/ops.gpencil.sculpt_weight.dat
A release/datafiles/preview_grease_pencil.blend
M release/datafiles/userdef/userdef_default_theme.c
M release/scripts/addons
M release/scripts/addons_contrib
M release/scripts/modules/bpy_extras/keyconfig_utils.py
M release/scripts/startup/bl_operators/presets.py
M release/scripts/startup/bl_ui/__init__.py
A release/scripts/startup/bl_ui/properties_data_gpencil.py
M release/scripts/startup/bl_ui/properties_data_modifier.py
A release/scripts/startup/bl_ui/properties_data_shaderfx.py
M release/scripts/startup/bl_ui/properties_grease_pencil_common.py
M release/scripts/startup/bl_ui/properties_material.py
A release/scripts/startup/bl_ui/properties_material_gpencil.py
M release/scripts/startup/bl_ui/properties_scene.py
M release/scripts/startup/bl_ui/space_clip.py
M release/scripts/startup/bl_ui/space_image.py
M release/scripts/startup/bl_ui/space_node.py
M release/scripts/startup/bl_ui/space_sequencer.py
M release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
M release/scripts/startup/bl_ui/space_topbar.py
M release/scripts/startup/bl_ui/space_userpref.py
M release/scripts/startup/bl_ui/space_view3d.py
M release/scripts/startup/bl_ui/space_view3d_toolbar.py
M source/blender/CMakeLists.txt
M source/blender/blenkernel/BKE_brush.h
M source/blender/blenkernel/BKE_context.h
M source/blender/blenkernel/BKE_gpencil.h
A source/blender/blenkernel/BKE_gpencil_modifier.h
M source/blender/blenkernel/BKE_icons.h
M source/blender/blenkernel/BKE_lattice.h
M source/blender/blenkernel/BKE_material.h
M source/blender/blenkernel/BKE_object.h
M source/blender/blenkernel/BKE_paint.h
A source/blender/blenkernel/BKE_shader_fx.h
M source/blender/blenkernel/CMakeLists.txt
M source/blender/blenkernel/intern/anim_sys.c
M source/blender/blenkernel/intern/brush.c
M source/blender/blenkernel/intern/colortools.c
M source/blender/blenkernel/intern/context.c
M source/blender/blenkernel/intern/deform.c
M source/blender/blenkernel/intern/gpencil.c
A source/blender/blenkernel/intern/gpencil_modifier.c
M source/blender/blenkernel/intern/icons.c
M source/blender/blenkernel/intern/library.c
M source/blender/blenkernel/intern/library_query.c
M source/blender/blenkernel/intern/material.c
M source/blender/blenkernel/intern/object.c
M source/blender/blenkernel/intern/object_deform.c
M source/blender/blenkernel/intern/object_update.c
M source/blender/blenkernel/intern/paint.c
M source/blender/blenkernel/intern/scene.c
A source/blender/blenkernel/intern/shader_fx.c
M source/blender/blenlib/BLI_math_vector.h
M source/blender/blenlib/BLI_rand.h
M source/blender/blenlib/intern/listbase.c
M source/blender/blenlib/intern/math_vector_inline.c
M source/blender/blenlib/intern/rand.c
M source/blender/blenloader/intern/readfile.c
M source/blender/blenloader/intern/versioning_260.c
M source/blender/blenloader/intern/versioning_270.c
M source/blender/blenloader/intern/versioning_280.c
M source/blender/blenloader/intern/versioning_defaults.c
M source/blender/blenloader/intern/writefile.c
M source/blender/collada/SceneExporter.cpp
M source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
M source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc
M source/blender/depsgraph/intern/builder/deg_builder_relations.cc
M source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc
M source/blender/depsgraph/intern/depsgraph_tag.cc
M source/blender/draw/CMakeLists.txt
M source/blender/draw/DRW_engine.h
A source/blender/draw/engines/gpencil/gpencil_cache_utils.c
A source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
A source/blender/draw/engines/gpencil/gpencil_draw_utils.c
A source/blender/draw/engines/gpencil/gpencil_engine.c
A source/blender/draw/engines/gpencil/gpencil_engine.h
A source/blender/draw/engines/gpencil/gpencil_render.c
A source/blender/draw/engines/gpencil/gpencil_shader_fx.c
A source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_blur_frag.glsl
A source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_colorize_frag.glsl
A source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_flip_frag.glsl
A source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_light_frag.glsl
A source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_pixel_frag.glsl
A source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_rim_prepare_frag.glsl
A source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_rim_resolve_frag.glsl
A source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_swirl_frag.glsl
A source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_wave_frag.glsl
A source/blender/draw/engines/gpencil/shaders/gpencil_background_frag.glsl
A source/blender/draw/engines/gpencil/shaders/gpencil_edit_point_frag.glsl
A source/blender/draw/engines/gpencil/shaders/gpencil_edit_point_geom.glsl
A source/blender/draw/engines/gpencil/shaders/gpencil_edit_point_vert.glsl
A source/blender/draw/engines/gpencil/shaders/gpencil_fill_frag.glsl
A source/blender/draw/engines/gpencil/shaders/gpencil_fill_vert.glsl
A source/blender/draw/engines/gpencil/shaders/gpencil_paper_frag.glsl
A source/blender/draw/engines/gpencil/shaders/gpencil_point_frag.glsl
A source/blender/draw/engines/gpencil/shaders/gpencil_point_geom.glsl
A source/blender/draw/engines/gpencil/shaders/gpencil_point_vert.glsl
A source/blender/draw/engines/gpencil/shaders/gpencil_simple_mix_frag.glsl
A source/blender/draw/engines/gpencil/shaders/gpencil_stroke_frag.glsl
A source/blender/draw/engines/gpencil/shaders/gpencil_stroke_geom.glsl
A source/blender/draw/engines/gpencil/shaders/gpencil_stroke_vert.glsl
A source/blender/draw/engines/gpencil/shaders/gpencil_zdepth_mix_frag.glsl
M source/blender/draw/intern/DRW_render.h
M source/blender/draw/intern/draw_cache.c
M source/blender/draw/intern/draw_cache.h
M source/blender/draw/intern/draw_cache_impl.h
M source/blender/draw/intern/draw_manager.c
M source/blender/draw/modes/draw_mode_engines.h
M source/blender/draw/modes/object_mode.c
M source/blender/editors/animation/anim_channels_defines.c
M source/blender/editors/animation/anim_channels_edit.c
M source/blender/editors/animation/anim_deps.c
M source/blender/editors/animation/anim_draw.c
M source/blender/editors/animation/anim_filter.c
M source/blender/editors/animation/keyframes_draw.c
M source/blender/editors/datafiles/CMakeLists.txt
M source/blender/editors/gpencil/CMakeLists.txt
A source/blender/editors/gpencil/annotate_draw.c
A source/blender/editors/gpencil/annotate_paint.c
M source/blender/editors/gpencil/drawgpencil.c
M source/blender/editors/gpencil/editaction_gpencil.c
A source/blender/editors/gpencil/gpencil_add_monkey.c
M source/blender/editors/gpencil/gpencil_brush.c
M source/blender/editors/gpencil/gpencil_convert.c
M source/blender/editors/gpencil/gpencil_data.c
M source/blender/editors/gpencil/gpencil_edit.c
A source/blender/editors/gpencil/gpencil_fill.c
M source/blender/editors/gpencil/gpencil_intern.h
M source/blender/editors/gpencil/gpencil_interpolate.c
A source/blender/editors/gpencil/gpencil_old.c
M source/blender/editors/gpencil/gpencil_ops.c
M source/blender/editors/gpencil/gpencil_paint.c
A source/blender/editors/gpencil/gpencil_primitive.c
M source/blender/editors/gpencil/gpencil_select.c
M source/blender/editors/gpencil/gpencil_undo.c
M source/blender/editors/gpencil/gpencil_utils.c
M source/blender/editors/include/ED_anim_api.h
M source/blender/editors/include/ED_datafiles.h
M source/blender/editors/include/ED_gpencil.h
M source/blender/editors/include/ED_keyframes_draw.h
M source/blender/editors/include/ED_object.h
M source/blender/editors/include/UI_icons.h
M source/blender/editors/include/UI_interface.h
M source/blender/editors/interface/interface_icons.c
M source/blender/editors/interface/interface_layout.c
M source/blender/editors/interface/interface_templates.c
M source/blender/editors/interface/resources.c
M source/blender/editors/object/CMakeLists.txt
M source/blender/editors/object/object_add.c
M source/blender/editors/object/object_edit.c
A source/blender/editors/object/object_gpencil_modifier.c
M source/blender/editors/object/object_intern.h
M source/blender/editors/object/object_modes.c
M source/blender/editors/object/object_modifier.c
M source/blender/editors/object/object_ops.c
M source/blender/editors/object/object_relations.c
M source/blender/editors/object/object_select.c
A source/blender/editors/object/object_shader_fx.c
M source/blender/editors/object/object_transform.c
M source/blender/editors/render/render_opengl.c
M source/blender/editors/render/render_preview.c
M source/blender/editors/render/render_shading.c
M source/blender/editors/screen/area.c
M source/blender/editors/screen/screen_context.c
M source/blender/editors/screen/screen_ops.c
M source/blender/editors/sculpt_paint/paint_ops.c
M source/blender/editors/space_action/action_select.c
M source/blender/editors/space_buttons/buttons_context.c
M source/blender/editors/space_buttons/buttons_texture.c
M source/blender/editors/space_buttons/space_buttons.c
M source/blender/editors/space_clip/clip_buttons.c
M source/blender/editors/space_clip/space_clip.c
M source/blender/editors/space_image/image_buttons.c
M source/blender/editors/space_info/info_stats.c
M source/blender/editors/space_nla/nla_buttons.c
M source/blender/editors/space_nla/nla_channels.c
M source/blender/editors/space_node/drawnode.c
M source/blender/editors/space_outliner/outliner_draw.c
M source/blender/editors/space_outliner/outliner_select.c
M source/blender/editors/space_outliner/outliner_tree.c
M source/blender/editors/space_topbar/space_topbar.c
M source/blender/editors/space_view3d/drawobject.c
M source/blender/editors/space_view3d/space_view3d.c
M source/blender/editors/space_view3d/view3d_draw.c
M source/blender/editors/space_view3d/view3d_draw_legacy.c
M source/blender/editors/space_view3d/view3d_edit.c
M source/blender/editors/space_view3d/view3d_gizmo_ruler.c
M source/blender/editors/space_view3d/view3d_ruler.c
M source/blender/editors/space_view3d/view3d_select.c
M source/blender/editors/transform/transform.c
M source/blender/editors/transform/transform_conversions.c
M source/blender/editors/transform/transform_generics.c
M source/blender/editors/transform/transform_gizmo_3d.c
M source/blender/editors/transform/transform_snap_object.c
M source/blender/editors/undo/ed_undo.c
A source/blender/gpencil_modifiers/CMakeLists.txt
A source/blender/gpencil_modifiers/MOD_gpencil_modifiertypes.h
A source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c
A source/blender/gpencil_modifiers/intern/MOD_gpencil_util.h
A source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c
A source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c
A source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c
A source/blender/gpencil_modifiers/intern/MOD_gpencilinstance.c
A source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c
A source/blender/gpencil_modifiers/intern/MOD_gpencilmirror.c
A source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c
A source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c
A source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c
A source/blender/gpencil_modifiers/intern/MOD_gpencilsimplify.c
A source/blender/gpencil_modifiers/intern/MOD_gpencilsmooth.c
A source/blender/gpencil_modifiers/intern/MOD_gpencilsubdiv.c
A source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c
A source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c
M source/blender/gpu/CMakeLists.txt
M source/blender/gpu/GPU_shader.h
M source/blender/gpu/intern/gpu_shader.c
A source/blender/gpu/shaders/gpu_shader_gpencil_fill_frag.glsl
A source/blender/gpu/shaders/gpu_shader_gpencil_fill_vert.glsl
A source/blender/gpu/shaders/gpu_shader_gpencil_stroke_frag.glsl
A source/blender/gpu/shaders/gpu_shader_gpencil_stroke_geom.glsl
A source/blender/gpu/shaders/gpu_shader_gpencil_stroke_vert.glsl
M source/blender/makesdna/DNA_ID.h
M source/blender/makesdna/DNA_brush_types.h
M source/blender/makesdna/DNA_color_types.h
A source/blender/makesdna/DNA_gpencil_modifier_types.h
M source/blender/makesdna/DNA_gpencil_types.h
M source/blender/makesdna/DNA_material_types.h
M source/blender/makesdna/DNA_object_enums.h
M source/blender/makesdna/DNA_object_types.h
M source/blender/makesdna/DNA_scene_types.h
A source/blender/makesdna/DNA_shader_fx_types.h
M source/blender/makesdna/DNA_space_types.h
M source/blender/makesdna/DNA_userdef_types.h
M source/blender/makesdna/DNA_view3d_types.h
M source/blender/makesdna/intern/makesdna.c
M source/blender/makesrna/RNA_access.h
M source/blender/makesrna/RNA_enum_types.h
M source/blender/makesrna/intern/CMakeLists.txt
M source/blender/makesrna/intern/makesrna.c
M source/blender/makesrna/intern/rna_brush.c
M source/blender/makesrna/intern/rna_context.c
M source/blender/makesrna/intern/rna_gpencil.c
A source/blender/makesrna/intern/rna_gpencil_modifier.c
M source/blender/makesrna/intern/rna_internal.h
M source/blender/makesrna/intern/rna_main_api.c
M source/blender/makesrna/intern/rna_material.c
M source/blender/makesrna/intern/rna_movieclip.c
M source/blender/makesrna/intern/rna_nodetree.c
M source/blender/makesrna/intern/rna_object.c
M source/blender/makesrna/intern/rna_palette.c
M source/blender/makesrna/intern/rna_scene.c
M source/blender/makesrna/intern/rna_sculpt_paint.c
A source/blender/makesrna/intern/rna_shader_fx.c
M source/blender/makesrna/intern/rna_space.c
M source/blender/makesrna/intern/rna_tracking.c
M source/blender/makesrna/intern/rna_ui_api.c
M source/blender/makesrna/intern/rna_userdef.c
M source/blender/render/intern/source/external_engine.c
A source/blender/shader_fx/CMakeLists.txt
A source/blender/shader_fx/FX_shader_types.h
A source/blender/shader_fx/intern/FX_shader_blur.c
A source/blender/shader_fx/intern/FX_shader_colorize.c
A source/blender/shader_fx/intern/FX_shader_flip.c
A source/blender/shader_fx/intern/FX_shader_light.c
A source/blender/shader_fx/intern/FX_shader_pixel.c
A source/blender/shader_fx/intern/FX_shader_rim.c
A source/blender/shader_fx/intern/FX_shader_swirl.c
A source/blender/shader_fx/intern/FX_shader_util.c
A source/blender/shader_fx/intern/FX_shader_util.h
A source/blender/shader_fx/intern/FX_shader_wave.c
M source/blender/windowmanager/intern/wm_operators.c
M source/creator/creator.c
===================================================================
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index ae265654724..65f962d2dd9 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -598,12 +598,12 @@ function(SETUP_BLENDER_SORTED_LIBS)
bf_editor_util
bf_editor_uvedit
bf_editor_curve
- bf_editor_gpencil
bf_editor_interface
bf_editor_gizmo_library
bf_editor_mesh
bf_editor_metaball
bf_editor_object
+ bf_editor_gpencil
bf_editor_lattice
bf_editor_armature
bf_editor_physics
@@ -626,12 +626,15 @@ function(SETUP_BLENDER_SORTED_LIBS)
bf_freestyle
bf_ikplugin
bf_modifiers
+ bf_gpencil_modifiers
bf_alembic
bf_bmesh
bf_gpu
bf_draw
bf_blenloader
bf_blenkernel
+ bf_shader_fx
+ bf_gpencil_modifiers
bf_physics
bf_nodes
bf_rna
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index a1941ce6176..737f7416486 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -895,7 +895,10 @@ class CYCLES_PT_context_material(CyclesButtonsPanel, Panel):
@classmethod
def poll(cls, context):
- return (context.material or context.object) and CyclesButtonsPanel.poll(context)
+ if context.active_object and context.active_object.type == 'GPENCIL':
+ return False
+ else:
+ return (context.material or context.object) and CyclesButtonsPanel.poll(context)
def draw(self, context):
layout = self.layout
diff --git a/release/datafiles/brushicons/gp_brush_block.png b/release/datafiles/brushicons/gp_brush_block.png
new file mode 100644
index 00000000000..2db3964e573
Binary files /dev/null and b/release/datafiles/brushicons/gp_brush_block.png differ
diff --git a/release/datafiles/brushicons/gp_brush_clone.png b/release/datafiles/brushicons/gp_brush_clone.png
new file mode 100644
index 00000000000..8358ace23b3
Binary files /dev/null and b/release/datafiles/brushicons/gp_brush_clone.png differ
diff --git a/release/datafiles/brushicons/gp_brush_erase_hard.png b/release/datafiles/brushicons/gp_brush_erase_hard.png
new file mode 100644
index 00000000000..2ac52840678
Binary files /dev/null and b/release/datafiles/brushicons/gp_brush_erase_hard.png differ
diff --git a/release/datafiles/brushicons/gp_brush_erase_soft.png b/release/datafiles/brushicons/gp_brush_erase_soft.png
new file mode 100644
index 00000000000..416923004dd
Binary files /dev/null and b/release/datafiles/brushicons/gp_brush_erase_soft.png differ
diff --git a/release/datafiles/brushicons/gp_brush_erase_stroke.png b/release/datafiles/brushicons/gp_brush_erase_stroke.png
new file mode 100644
index 00000000000..cd6d21532cf
Binary files /dev/null and b/release/datafiles/brushicons/gp_brush_erase_stroke.png differ
diff --git a/release/datafiles/brushicons/gp_brush_fill.png b/release/datafiles/brushicons/gp_brush_fill.png
new file mode 100644
index 00000000000..9dac633139c
Binary files /dev/null and b/release/datafiles/brushicons/gp_brush_fill.png differ
diff --git a/release/datafiles/brushicons/gp_brush_grab.png b/release/datafiles/brushicons/gp_brush_grab.png
new file mode 100644
index 00000000000..2123ac69aef
Binary files /dev/null and b/release/datafiles/brushicons/gp_brush_grab.png differ
diff --git a/release/datafiles/brushicons/gp_brush_ink.png b/release/datafiles/brushicons/gp_brush_ink.png
new file mode 100644
index 00000000000..410a77f6117
Binary files /dev/null and b/release/datafiles/brushicons/gp_brush_ink.png differ
diff --git a/release/datafiles/brushicons/gp_brush_inknoise.png b/release/datafiles/brushicons/gp_brush_inknoise.png
new file mode 100644
index 00000000000..5356f697e01
Binary files /dev/null and b/release/datafiles/brushicons/gp_brush_inknoise.png differ
diff --git a/release/datafiles/brushicons/gp_brush_marker.png b/release/datafiles/brushicons/gp_brush_marker.png
new file mode 100644
index 00000000000..c7a62b78ca7
Binary files /dev/null and b/release/datafiles/brushicons/gp_brush_marker.png differ
diff --git a/release/datafiles/brushicons/gp_brush_pen.png b/release/datafiles/brushicons/gp_brush_pen.png
new file mode 100644
index 00000000000..9aaaa861f49
Binary files /dev/null and b/release/datafiles/brushicons/gp_brush_pen.png differ
diff --git a/release/datafiles/brushicons/gp_brush_pencil.png b/release/datafiles/brushicons/gp_brush_pencil.png
new file mode 100644
index 00000000000..2d1fbdfd916
Binary files /dev/null and b/release/datafiles/brushicons/gp_brush_pencil.png differ
diff --git a/release/datafiles/brushicons/gp_brush_pinch.png b/release/datafiles/brushicons/gp_brush_pinch.png
new file mode 100644
index 00000000000..e38236d1be0
Binary files /dev/null and b/release/datafiles/brushicons/gp_brush_pinch.png differ
diff --git a/release/datafiles/brushicons/gp_brush_push.png b/release/datafiles/brushicons/gp_brush_push.png
new file mode 100644
index 00000000000..542764309cc
Binary files /dev/null and b/release/datafiles/brushicons/gp_brush_push.png differ
diff --git a/release/datafiles/brushicons/gp_brush_randomize.png b/release/datafiles/brushicons/gp_brush_randomize.png
new file mode 100644
index 00000000000..0dd1a131d86
Binary files /dev/null and b/release/datafiles/brushicons/gp_brush_randomize.png differ
diff --git a/release/datafiles/brushicons/gp_brush_smooth.png b/release/datafiles/brushicons/gp_brush_smooth.png
new file mode 100644
index 00000000000..7518a358219
Binary files /dev/null and b/release/datafiles/brushicons/gp_brush_smooth.png differ
diff --git a/release/datafiles/brushicons/gp_brush_strength.png b/release/datafiles/brushicons/gp_brush_strength.png
new file mode 100644
index 00000000000..a0513119f29
Binary files /dev/null and b/release/datafiles/brushicons/gp_brush_strength.png differ
diff --git a/release/datafiles/brushicons/gp_brush_thickness.png b/release/datafiles/brushicons/gp_brush_thickness.png
new file mode 100644
index 00000000000..6026716f026
Binary files /dev/null and b/release/datafiles/brushicons/gp_brush_thickness.png differ
diff --git a/release/datafiles/brushicons/gp_brush_twist.png b/release/datafiles/brushicons/gp_brush_twist.png
new file mode 100644
index 00000000000..84b9a90e9d6
Binary files /dev/null and b/release/datafiles/brushicons/gp_brush_twist.png differ
diff --git a/release/datafiles/brushicons/gp_brush_weight.png b/release/datafiles/brushicons/gp_brush_weight.png
new file mode 100644
index 00000000000..171e9221e92
Binary files /dev/null and b/release/datafiles/brushicons/gp_brush_weight.png differ
diff --git a/release/datafiles/icons/brush.gpencil.draw.eraser_hard.dat b/release/datafiles/icons/brush.gpencil.draw.eraser_hard.dat
new file mode 100644
index 00000000000..1e909ca8ac9
Binary files /dev/null and b/release/datafiles/icons/brush.gpencil.draw.eraser_hard.dat differ
diff --git a/release/datafiles/icons/brush.gpencil.draw.eraser_soft.dat b/release/datafiles/icons/brush.gpencil.draw.eraser_soft.dat
new file mode 100644
index 00000000000..7242f76a0f9
Binary files /dev/null and b/release/datafiles/icons/brush.gpencil.draw.eraser_soft.dat differ
diff --git a/release/datafiles/icons/brush.gpencil.draw.eraser_stroke.dat b/release/datafiles/icons/brush.gpencil.draw.eraser_stroke.dat
new file mode 100644
index 00000000000..6bf620bf3c2
Binary files /dev/null and b/release/datafiles/icons/brush.gpencil.draw.eraser_stroke.dat differ
diff --git a/release/datafiles/icons/brush.gpencil.draw_block.dat b/release/datafiles/icons/brush.gpencil.draw_block.dat
new file mode 100644
index 00000000000..7a7402ef673
Binary files /dev/null and b/release/datafiles/icons/brush.gpencil.draw_block.dat differ
diff --git a/release/datafiles/icons/brush.gpencil.draw_fill.dat b/release/datafiles/icons/brush.gpencil.draw_fill.dat
new file mode 100644
index 00000000000..809aed7f3cf
Binary files /dev/null and b/release/datafiles/icons/brush.gpencil.draw_fill.dat differ
diff --git a/release/datafiles/icons/brush.gpencil.draw_ink.dat b/release/datafiles/icons/brush.gpencil.draw_ink.dat
new file mode 100644
index 00000000000..3c654712783
Binary files /dev/null and b/release/datafiles/icons/brush.gpencil.draw_ink.dat differ
diff --git a/release/datafiles/icons/brush.gpencil.draw_marker.dat b/release/datafiles/icons/brush.gpencil.draw_marker.dat
new file mode 100644
index 00000000000..77a52dd83d4
Binary files /dev/null and b/release/datafiles/icons/brush.gpencil.draw_marker.dat differ
diff --git a/release/datafiles/icons/brush.gpencil.draw_noise.dat b/release/datafiles/icons/brush.gpencil.draw_noise.dat
new file mode 100644
index 00000000000..127f469b9fb
Binary files /dev/null and b/release/datafiles/icons/brush.gpencil.draw_noise.dat differ
diff --git a/release/datafiles/icons/brush.gpencil.draw_pen.dat b/release/datafiles/icons/brush.gpencil.draw_pen.dat
new file mode 100644
index 00000000000..cb6fb77924a
Binary files /dev/null and b/release/datafiles/icons/brush.gpencil.draw_pen.dat differ
diff --git a/release/datafiles/icons/brush.gpencil.draw_pencil.dat b/release/datafiles/icons/brush.gpencil.draw_pencil.dat
new file mode 100644
index 00000000000..a8898a94917
Binary files /dev/null and b/release/datafiles/icons/brush.gpencil.draw_pencil.dat differ
diff --git a/release/datafiles/icons/ops.gpencil.draw.dat b/release/datafiles/icons/ops.gpencil.draw.dat
new file mode 100644
index 00000000000..3adc50ab17d
Binary files /dev/null and b/release/datafiles/icons/ops.gpencil.draw.dat differ
diff --git a/release/datafiles/icons/ops.gpencil.draw.eraser.dat b/release/datafiles/icons/ops.gpencil.draw.eraser.dat
new file mode 100644
index 00000000000..323d8c23245
Binary files /dev/null and b/release/datafiles/icons/ops.gpencil.draw.eraser.dat differ
diff --git a/release/datafiles/icons/ops.gpencil.draw.line.dat b/release/datafiles/icons/ops.gpencil.draw.line.dat
new file mode 100644
index 00000000000..238db63807a
Binary files /dev/null and b/release/datafiles/icons/ops.gpencil.draw.line.dat differ
diff --git a/release/datafiles/icons/ops.gpencil.draw.poly.dat b/release/datafiles/icons/ops.gpencil.draw.poly.dat
new file mode 100644
index 00000000000..8351e48fec1
Binary files /dev/null and b/release/datafiles/icons/ops.gpencil.draw.poly.dat differ
diff --git a/release/datafiles/icons/o
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list