Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'release/datafiles')
-rw-r--r--release/datafiles/brushicons/gp_brush_block.pngbin0 -> 6088 bytes
-rw-r--r--release/datafiles/brushicons/gp_brush_clone.pngbin0 -> 2586 bytes
-rw-r--r--release/datafiles/brushicons/gp_brush_erase_hard.pngbin0 -> 6107 bytes
-rw-r--r--release/datafiles/brushicons/gp_brush_erase_soft.pngbin0 -> 6252 bytes
-rw-r--r--release/datafiles/brushicons/gp_brush_erase_stroke.pngbin0 -> 5955 bytes
-rw-r--r--release/datafiles/brushicons/gp_brush_fill.pngbin0 -> 5707 bytes
-rw-r--r--release/datafiles/brushicons/gp_brush_grab.pngbin0 -> 2741 bytes
-rw-r--r--release/datafiles/brushicons/gp_brush_ink.pngbin0 -> 4034 bytes
-rw-r--r--release/datafiles/brushicons/gp_brush_inknoise.pngbin0 -> 5591 bytes
-rw-r--r--release/datafiles/brushicons/gp_brush_marker.pngbin0 -> 5996 bytes
-rw-r--r--release/datafiles/brushicons/gp_brush_pen.pngbin0 -> 4920 bytes
-rw-r--r--release/datafiles/brushicons/gp_brush_pencil.pngbin0 -> 3965 bytes
-rw-r--r--release/datafiles/brushicons/gp_brush_pinch.pngbin0 -> 5432 bytes
-rw-r--r--release/datafiles/brushicons/gp_brush_push.pngbin0 -> 2914 bytes
-rw-r--r--release/datafiles/brushicons/gp_brush_randomize.pngbin0 -> 5726 bytes
-rw-r--r--release/datafiles/brushicons/gp_brush_smooth.pngbin0 -> 3105 bytes
-rw-r--r--release/datafiles/brushicons/gp_brush_strength.pngbin0 -> 3229 bytes
-rw-r--r--release/datafiles/brushicons/gp_brush_thickness.pngbin0 -> 5066 bytes
-rw-r--r--release/datafiles/brushicons/gp_brush_twist.pngbin0 -> 4776 bytes
-rw-r--r--release/datafiles/brushicons/gp_brush_weight.pngbin0 -> 2460 bytes
-rw-r--r--release/datafiles/colormanagement/config.ocio2
-rw-r--r--release/datafiles/icons/brush.gpencil.draw.eraser_hard.datbin0 -> 1736 bytes
-rw-r--r--release/datafiles/icons/brush.gpencil.draw.eraser_soft.datbin0 -> 1880 bytes
-rw-r--r--release/datafiles/icons/brush.gpencil.draw.eraser_stroke.datbin0 -> 2456 bytes
-rw-r--r--release/datafiles/icons/brush.gpencil.draw_block.datbin0 -> 2006 bytes
-rw-r--r--release/datafiles/icons/brush.gpencil.draw_fill.datbin0 -> 6326 bytes
-rw-r--r--release/datafiles/icons/brush.gpencil.draw_ink.datbin0 -> 2240 bytes
-rw-r--r--release/datafiles/icons/brush.gpencil.draw_marker.datbin0 -> 2690 bytes
-rw-r--r--release/datafiles/icons/brush.gpencil.draw_noise.datbin0 -> 3086 bytes
-rw-r--r--release/datafiles/icons/brush.gpencil.draw_pen.datbin0 -> 3158 bytes
-rw-r--r--release/datafiles/icons/brush.gpencil.draw_pencil.datbin0 -> 2780 bytes
-rw-r--r--release/datafiles/icons/brush.particle.add.datbin0 -> 2060 bytes
-rw-r--r--release/datafiles/icons/brush.particle.comb.datbin0 -> 3590 bytes
-rw-r--r--release/datafiles/icons/brush.particle.cut.datbin0 -> 6578 bytes
-rw-r--r--release/datafiles/icons/brush.particle.length.datbin0 -> 3824 bytes
-rw-r--r--release/datafiles/icons/brush.particle.puff.datbin0 -> 3644 bytes
-rw-r--r--release/datafiles/icons/brush.particle.smooth.datbin0 -> 2870 bytes
-rw-r--r--release/datafiles/icons/brush.particle.weight.datbin0 -> 3878 bytes
-rw-r--r--release/datafiles/icons/ops.gpencil.draw.datbin0 -> 2492 bytes
-rw-r--r--release/datafiles/icons/ops.gpencil.draw.eraser.datbin0 -> 2384 bytes
-rw-r--r--release/datafiles/icons/ops.gpencil.draw.line.datbin0 -> 1664 bytes
-rw-r--r--release/datafiles/icons/ops.gpencil.draw.poly.datbin0 -> 1736 bytes
-rw-r--r--release/datafiles/icons/ops.gpencil.edit_bend.datbin0 -> 2330 bytes
-rw-r--r--release/datafiles/icons/ops.gpencil.edit_mirror.datbin0 -> 620 bytes
-rw-r--r--release/datafiles/icons/ops.gpencil.edit_shear.datbin0 -> 332 bytes
-rw-r--r--release/datafiles/icons/ops.gpencil.edit_to_sphere.datbin0 -> 1790 bytes
-rw-r--r--release/datafiles/icons/ops.gpencil.sculpt_clone.datbin0 -> 4328 bytes
-rw-r--r--release/datafiles/icons/ops.gpencil.sculpt_grab.datbin0 -> 1664 bytes
-rw-r--r--release/datafiles/icons/ops.gpencil.sculpt_pinch.datbin0 -> 3482 bytes
-rw-r--r--release/datafiles/icons/ops.gpencil.sculpt_push.datbin0 -> 1664 bytes
-rw-r--r--release/datafiles/icons/ops.gpencil.sculpt_randomize.datbin0 -> 6254 bytes
-rw-r--r--release/datafiles/icons/ops.gpencil.sculpt_smooth.datbin0 -> 3788 bytes
-rw-r--r--release/datafiles/icons/ops.gpencil.sculpt_strength.datbin0 -> 5228 bytes
-rw-r--r--release/datafiles/icons/ops.gpencil.sculpt_thickness.datbin0 -> 1700 bytes
-rw-r--r--release/datafiles/icons/ops.gpencil.sculpt_twist.datbin0 -> 2942 bytes
-rw-r--r--release/datafiles/icons/ops.gpencil.sculpt_weight.datbin0 -> 1736 bytes
m---------release/datafiles/locale0
-rw-r--r--release/datafiles/preview_grease_pencil.blendbin0 -> 947876 bytes
-rw-r--r--release/datafiles/studiolights/matcap/basic_1.exrbin0 -> 44539 bytes
-rw-r--r--release/datafiles/studiolights/matcap/basic_2.exrbin0 -> 61142 bytes
-rw-r--r--release/datafiles/studiolights/matcap/basic_dark.exrbin0 -> 38734 bytes
-rw-r--r--release/datafiles/studiolights/matcap/basic_side.exrbin0 -> 41554 bytes
-rw-r--r--release/datafiles/studiolights/matcap/ceramic_dark.exrbin0 -> 63518 bytes
-rw-r--r--release/datafiles/studiolights/matcap/ceramic_lightbulb.exrbin0 -> 102212 bytes
-rw-r--r--release/datafiles/studiolights/matcap/check_normal+y.exrbin0 -> 87477 bytes
-rw-r--r--release/datafiles/studiolights/matcap/check_reflection.exrbin0 -> 151596 bytes
-rw-r--r--release/datafiles/studiolights/matcap/check_rim_dark.exrbin0 -> 50807 bytes
-rw-r--r--release/datafiles/studiolights/matcap/check_rim_light.exrbin0 -> 56757 bytes
-rw-r--r--release/datafiles/studiolights/matcap/clay_brown.exrbin0 -> 65156 bytes
-rw-r--r--release/datafiles/studiolights/matcap/clay_muddy.exrbin0 -> 53778 bytes
-rw-r--r--release/datafiles/studiolights/matcap/clay_studio.exrbin0 -> 51624 bytes
-rw-r--r--release/datafiles/studiolights/matcap/jade.exrbin0 -> 63103 bytes
-rw-r--r--release/datafiles/studiolights/matcap/license.txt4
-rw-r--r--release/datafiles/studiolights/matcap/mc01.jpgbin20830 -> 0 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc02.jpgbin23428 -> 0 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc03.jpgbin17550 -> 0 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc04.jpgbin29197 -> 0 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc05.jpgbin25454 -> 0 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc06.jpgbin19864 -> 0 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc07.jpgbin59262 -> 0 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc08.jpgbin24133 -> 0 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc09.jpgbin31101 -> 0 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc10.jpgbin28973 -> 0 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc11.jpgbin21395 -> 0 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc12.jpgbin23797 -> 0 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc13.jpgbin45661 -> 0 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc14.jpgbin44762 -> 0 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc15.jpgbin27456 -> 0 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc16.jpgbin33401 -> 0 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc17.jpgbin49292 -> 0 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc18.jpgbin40254 -> 0 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc19.jpgbin46330 -> 0 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc20.jpgbin52893 -> 0 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc21.jpgbin28717 -> 0 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc22.jpgbin33801 -> 0 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc23.jpgbin26688 -> 0 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc24.jpgbin14149 -> 0 bytes
-rw-r--r--release/datafiles/studiolights/matcap/metal_anisotropic.exrbin0 -> 118909 bytes
-rw-r--r--release/datafiles/studiolights/matcap/metal_carpaint.exrbin0 -> 91775 bytes
-rw-r--r--release/datafiles/studiolights/matcap/metal_lead.exrbin0 -> 41455 bytes
-rw-r--r--release/datafiles/studiolights/matcap/metal_shiny.exrbin0 -> 126238 bytes
-rw-r--r--release/datafiles/studiolights/matcap/pearl.exrbin0 -> 70218 bytes
-rw-r--r--release/datafiles/studiolights/matcap/resin.exrbin0 -> 91009 bytes
-rw-r--r--release/datafiles/studiolights/matcap/skin.exrbin0 -> 55351 bytes
-rw-r--r--release/datafiles/studiolights/matcap/toon.exrbin0 -> 55733 bytes
-rw-r--r--release/datafiles/userdef/userdef_default_theme.c10
106 files changed, 8 insertions, 8 deletions
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
--- /dev/null
+++ b/release/datafiles/brushicons/gp_brush_block.png
Binary files 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
--- /dev/null
+++ b/release/datafiles/brushicons/gp_brush_clone.png
Binary files 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
--- /dev/null
+++ b/release/datafiles/brushicons/gp_brush_erase_hard.png
Binary files 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
--- /dev/null
+++ b/release/datafiles/brushicons/gp_brush_erase_soft.png
Binary files 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
--- /dev/null
+++ b/release/datafiles/brushicons/gp_brush_erase_stroke.png
Binary files 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
--- /dev/null
+++ b/release/datafiles/brushicons/gp_brush_fill.png
Binary files 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
--- /dev/null
+++ b/release/datafiles/brushicons/gp_brush_grab.png
Binary files 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
--- /dev/null
+++ b/release/datafiles/brushicons/gp_brush_ink.png
Binary files 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
--- /dev/null
+++ b/release/datafiles/brushicons/gp_brush_inknoise.png
Binary files 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
--- /dev/null
+++ b/release/datafiles/brushicons/gp_brush_marker.png
Binary files 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
--- /dev/null
+++ b/release/datafiles/brushicons/gp_brush_pen.png
Binary files 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
--- /dev/null
+++ b/release/datafiles/brushicons/gp_brush_pencil.png
Binary files 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
--- /dev/null
+++ b/release/datafiles/brushicons/gp_brush_pinch.png
Binary files 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
--- /dev/null
+++ b/release/datafiles/brushicons/gp_brush_push.png
Binary files 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
--- /dev/null
+++ b/release/datafiles/brushicons/gp_brush_randomize.png
Binary files 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
--- /dev/null
+++ b/release/datafiles/brushicons/gp_brush_smooth.png
Binary files 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
--- /dev/null
+++ b/release/datafiles/brushicons/gp_brush_strength.png
Binary files 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
--- /dev/null
+++ b/release/datafiles/brushicons/gp_brush_thickness.png
Binary files 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
--- /dev/null
+++ b/release/datafiles/brushicons/gp_brush_twist.png
Binary files 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
--- /dev/null
+++ b/release/datafiles/brushicons/gp_brush_weight.png
Binary files differ
diff --git a/release/datafiles/colormanagement/config.ocio b/release/datafiles/colormanagement/config.ocio
index ce79dfeb540..c8466ab99fc 100644
--- a/release/datafiles/colormanagement/config.ocio
+++ b/release/datafiles/colormanagement/config.ocio
@@ -70,7 +70,7 @@ displays:
- !<View> {name: Default, colorspace: Raw}
active_displays: [sRGB, DCIP3, Rec709, XYZ, None]
-active_views: [Default, RRT, Raw, Log]
+active_views: [Filmic, Default, RRT, Raw, Log]
colorspaces:
- !<ColorSpace>
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
--- /dev/null
+++ b/release/datafiles/icons/brush.gpencil.draw.eraser_hard.dat
Binary files 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
--- /dev/null
+++ b/release/datafiles/icons/brush.gpencil.draw.eraser_soft.dat
Binary files 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
--- /dev/null
+++ b/release/datafiles/icons/brush.gpencil.draw.eraser_stroke.dat
Binary files 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
--- /dev/null
+++ b/release/datafiles/icons/brush.gpencil.draw_block.dat
Binary files 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
--- /dev/null
+++ b/release/datafiles/icons/brush.gpencil.draw_fill.dat
Binary files 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
--- /dev/null
+++ b/release/datafiles/icons/brush.gpencil.draw_ink.dat
Binary files 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
--- /dev/null
+++ b/release/datafiles/icons/brush.gpencil.draw_marker.dat
Binary files 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
--- /dev/null
+++ b/release/datafiles/icons/brush.gpencil.draw_noise.dat
Binary files 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
--- /dev/null
+++ b/release/datafiles/icons/brush.gpencil.draw_pen.dat
Binary files 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
--- /dev/null
+++ b/release/datafiles/icons/brush.gpencil.draw_pencil.dat
Binary files differ
diff --git a/release/datafiles/icons/brush.particle.add.dat b/release/datafiles/icons/brush.particle.add.dat
new file mode 100644
index 00000000000..e78bf251371
--- /dev/null
+++ b/release/datafiles/icons/brush.particle.add.dat
Binary files differ
diff --git a/release/datafiles/icons/brush.particle.comb.dat b/release/datafiles/icons/brush.particle.comb.dat
new file mode 100644
index 00000000000..5ece6bf754d
--- /dev/null
+++ b/release/datafiles/icons/brush.particle.comb.dat
Binary files differ
diff --git a/release/datafiles/icons/brush.particle.cut.dat b/release/datafiles/icons/brush.particle.cut.dat
new file mode 100644
index 00000000000..79306d5d7e9
--- /dev/null
+++ b/release/datafiles/icons/brush.particle.cut.dat
Binary files differ
diff --git a/release/datafiles/icons/brush.particle.length.dat b/release/datafiles/icons/brush.particle.length.dat
new file mode 100644
index 00000000000..4c9da271316
--- /dev/null
+++ b/release/datafiles/icons/brush.particle.length.dat
Binary files differ
diff --git a/release/datafiles/icons/brush.particle.puff.dat b/release/datafiles/icons/brush.particle.puff.dat
new file mode 100644
index 00000000000..b0e797853c3
--- /dev/null
+++ b/release/datafiles/icons/brush.particle.puff.dat
Binary files differ
diff --git a/release/datafiles/icons/brush.particle.smooth.dat b/release/datafiles/icons/brush.particle.smooth.dat
new file mode 100644
index 00000000000..a3cbe3cf657
--- /dev/null
+++ b/release/datafiles/icons/brush.particle.smooth.dat
Binary files differ
diff --git a/release/datafiles/icons/brush.particle.weight.dat b/release/datafiles/icons/brush.particle.weight.dat
new file mode 100644
index 00000000000..309ee157a19
--- /dev/null
+++ b/release/datafiles/icons/brush.particle.weight.dat
Binary files 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
--- /dev/null
+++ b/release/datafiles/icons/ops.gpencil.draw.dat
Binary files 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
--- /dev/null
+++ b/release/datafiles/icons/ops.gpencil.draw.eraser.dat
Binary files 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
--- /dev/null
+++ b/release/datafiles/icons/ops.gpencil.draw.line.dat
Binary files 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
--- /dev/null
+++ b/release/datafiles/icons/ops.gpencil.draw.poly.dat
Binary files differ
diff --git a/release/datafiles/icons/ops.gpencil.edit_bend.dat b/release/datafiles/icons/ops.gpencil.edit_bend.dat
new file mode 100644
index 00000000000..32f7b2e9631
--- /dev/null
+++ b/release/datafiles/icons/ops.gpencil.edit_bend.dat
Binary files differ
diff --git a/release/datafiles/icons/ops.gpencil.edit_mirror.dat b/release/datafiles/icons/ops.gpencil.edit_mirror.dat
new file mode 100644
index 00000000000..ee073664f78
--- /dev/null
+++ b/release/datafiles/icons/ops.gpencil.edit_mirror.dat
Binary files differ
diff --git a/release/datafiles/icons/ops.gpencil.edit_shear.dat b/release/datafiles/icons/ops.gpencil.edit_shear.dat
new file mode 100644
index 00000000000..e6b51f988f8
--- /dev/null
+++ b/release/datafiles/icons/ops.gpencil.edit_shear.dat
Binary files differ
diff --git a/release/datafiles/icons/ops.gpencil.edit_to_sphere.dat b/release/datafiles/icons/ops.gpencil.edit_to_sphere.dat
new file mode 100644
index 00000000000..bf1181cd500
--- /dev/null
+++ b/release/datafiles/icons/ops.gpencil.edit_to_sphere.dat
Binary files differ
diff --git a/release/datafiles/icons/ops.gpencil.sculpt_clone.dat b/release/datafiles/icons/ops.gpencil.sculpt_clone.dat
new file mode 100644
index 00000000000..dbae6a68159
--- /dev/null
+++ b/release/datafiles/icons/ops.gpencil.sculpt_clone.dat
Binary files differ
diff --git a/release/datafiles/icons/ops.gpencil.sculpt_grab.dat b/release/datafiles/icons/ops.gpencil.sculpt_grab.dat
new file mode 100644
index 00000000000..291b4fd12dc
--- /dev/null
+++ b/release/datafiles/icons/ops.gpencil.sculpt_grab.dat
Binary files differ
diff --git a/release/datafiles/icons/ops.gpencil.sculpt_pinch.dat b/release/datafiles/icons/ops.gpencil.sculpt_pinch.dat
new file mode 100644
index 00000000000..cb2b43f5597
--- /dev/null
+++ b/release/datafiles/icons/ops.gpencil.sculpt_pinch.dat
Binary files differ
diff --git a/release/datafiles/icons/ops.gpencil.sculpt_push.dat b/release/datafiles/icons/ops.gpencil.sculpt_push.dat
new file mode 100644
index 00000000000..e1c4961ff86
--- /dev/null
+++ b/release/datafiles/icons/ops.gpencil.sculpt_push.dat
Binary files differ
diff --git a/release/datafiles/icons/ops.gpencil.sculpt_randomize.dat b/release/datafiles/icons/ops.gpencil.sculpt_randomize.dat
new file mode 100644
index 00000000000..35042936757
--- /dev/null
+++ b/release/datafiles/icons/ops.gpencil.sculpt_randomize.dat
Binary files differ
diff --git a/release/datafiles/icons/ops.gpencil.sculpt_smooth.dat b/release/datafiles/icons/ops.gpencil.sculpt_smooth.dat
new file mode 100644
index 00000000000..3a132ed4049
--- /dev/null
+++ b/release/datafiles/icons/ops.gpencil.sculpt_smooth.dat
Binary files differ
diff --git a/release/datafiles/icons/ops.gpencil.sculpt_strength.dat b/release/datafiles/icons/ops.gpencil.sculpt_strength.dat
new file mode 100644
index 00000000000..7e52b0d7648
--- /dev/null
+++ b/release/datafiles/icons/ops.gpencil.sculpt_strength.dat
Binary files differ
diff --git a/release/datafiles/icons/ops.gpencil.sculpt_thickness.dat b/release/datafiles/icons/ops.gpencil.sculpt_thickness.dat
new file mode 100644
index 00000000000..1e558806888
--- /dev/null
+++ b/release/datafiles/icons/ops.gpencil.sculpt_thickness.dat
Binary files differ
diff --git a/release/datafiles/icons/ops.gpencil.sculpt_twist.dat b/release/datafiles/icons/ops.gpencil.sculpt_twist.dat
new file mode 100644
index 00000000000..4ce958cb7ec
--- /dev/null
+++ b/release/datafiles/icons/ops.gpencil.sculpt_twist.dat
Binary files differ
diff --git a/release/datafiles/icons/ops.gpencil.sculpt_weight.dat b/release/datafiles/icons/ops.gpencil.sculpt_weight.dat
new file mode 100644
index 00000000000..41b58abfda7
--- /dev/null
+++ b/release/datafiles/icons/ops.gpencil.sculpt_weight.dat
Binary files differ
diff --git a/release/datafiles/locale b/release/datafiles/locale
-Subproject d3349b42856d00c278f72f2a5909a6c96b9cdb5
+Subproject 59495b4b59077aa1cc68fffbdae1463af980f08
diff --git a/release/datafiles/preview_grease_pencil.blend b/release/datafiles/preview_grease_pencil.blend
new file mode 100644
index 00000000000..82661d80029
--- /dev/null
+++ b/release/datafiles/preview_grease_pencil.blend
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/basic_1.exr b/release/datafiles/studiolights/matcap/basic_1.exr
new file mode 100644
index 00000000000..bb2e09abbd2
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/basic_1.exr
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/basic_2.exr b/release/datafiles/studiolights/matcap/basic_2.exr
new file mode 100644
index 00000000000..d97f7630d63
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/basic_2.exr
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/basic_dark.exr b/release/datafiles/studiolights/matcap/basic_dark.exr
new file mode 100644
index 00000000000..b623c8030f8
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/basic_dark.exr
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/basic_side.exr b/release/datafiles/studiolights/matcap/basic_side.exr
new file mode 100644
index 00000000000..6e4452e7511
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/basic_side.exr
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/ceramic_dark.exr b/release/datafiles/studiolights/matcap/ceramic_dark.exr
new file mode 100644
index 00000000000..837b020c96d
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/ceramic_dark.exr
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/ceramic_lightbulb.exr b/release/datafiles/studiolights/matcap/ceramic_lightbulb.exr
new file mode 100644
index 00000000000..e05b6612e46
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/ceramic_lightbulb.exr
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/check_normal+y.exr b/release/datafiles/studiolights/matcap/check_normal+y.exr
new file mode 100644
index 00000000000..4e2a97ac3b9
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/check_normal+y.exr
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/check_reflection.exr b/release/datafiles/studiolights/matcap/check_reflection.exr
new file mode 100644
index 00000000000..245d6059241
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/check_reflection.exr
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/check_rim_dark.exr b/release/datafiles/studiolights/matcap/check_rim_dark.exr
new file mode 100644
index 00000000000..e6a32004ea1
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/check_rim_dark.exr
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/check_rim_light.exr b/release/datafiles/studiolights/matcap/check_rim_light.exr
new file mode 100644
index 00000000000..6318c0f9346
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/check_rim_light.exr
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/clay_brown.exr b/release/datafiles/studiolights/matcap/clay_brown.exr
new file mode 100644
index 00000000000..fe1e0305383
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/clay_brown.exr
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/clay_muddy.exr b/release/datafiles/studiolights/matcap/clay_muddy.exr
new file mode 100644
index 00000000000..d219578c62b
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/clay_muddy.exr
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/clay_studio.exr b/release/datafiles/studiolights/matcap/clay_studio.exr
new file mode 100644
index 00000000000..7746e6d0e35
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/clay_studio.exr
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/jade.exr b/release/datafiles/studiolights/matcap/jade.exr
new file mode 100644
index 00000000000..fe1211f1b65
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/jade.exr
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/license.txt b/release/datafiles/studiolights/matcap/license.txt
index 358c8dcd832..09a0f7a439e 100644
--- a/release/datafiles/studiolights/matcap/license.txt
+++ b/release/datafiles/studiolights/matcap/license.txt
@@ -1,3 +1,3 @@
-These matcap images are licensed as GNU GPL 2 or later, like the rest of Blender's code.
+These matcap images are licensed as CC0 or public domain.
-Thanks to Kent Trammell, Aidy Burrows, John Herreno , Terry Wallwork and David Silverman for making the pictures.
+Thanks to the Blender community for contributing these matcaps.
diff --git a/release/datafiles/studiolights/matcap/mc01.jpg b/release/datafiles/studiolights/matcap/mc01.jpg
deleted file mode 100644
index 8c7aef287ee..00000000000
--- a/release/datafiles/studiolights/matcap/mc01.jpg
+++ /dev/null
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc02.jpg b/release/datafiles/studiolights/matcap/mc02.jpg
deleted file mode 100644
index 11deddfeaed..00000000000
--- a/release/datafiles/studiolights/matcap/mc02.jpg
+++ /dev/null
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc03.jpg b/release/datafiles/studiolights/matcap/mc03.jpg
deleted file mode 100644
index 64d992fb61a..00000000000
--- a/release/datafiles/studiolights/matcap/mc03.jpg
+++ /dev/null
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc04.jpg b/release/datafiles/studiolights/matcap/mc04.jpg
deleted file mode 100644
index 42be580ee93..00000000000
--- a/release/datafiles/studiolights/matcap/mc04.jpg
+++ /dev/null
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc05.jpg b/release/datafiles/studiolights/matcap/mc05.jpg
deleted file mode 100644
index 586d233ef31..00000000000
--- a/release/datafiles/studiolights/matcap/mc05.jpg
+++ /dev/null
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc06.jpg b/release/datafiles/studiolights/matcap/mc06.jpg
deleted file mode 100644
index 657883d0866..00000000000
--- a/release/datafiles/studiolights/matcap/mc06.jpg
+++ /dev/null
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc07.jpg b/release/datafiles/studiolights/matcap/mc07.jpg
deleted file mode 100644
index 372caf7e87c..00000000000
--- a/release/datafiles/studiolights/matcap/mc07.jpg
+++ /dev/null
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc08.jpg b/release/datafiles/studiolights/matcap/mc08.jpg
deleted file mode 100644
index 50eec402812..00000000000
--- a/release/datafiles/studiolights/matcap/mc08.jpg
+++ /dev/null
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc09.jpg b/release/datafiles/studiolights/matcap/mc09.jpg
deleted file mode 100644
index e05d441aaf9..00000000000
--- a/release/datafiles/studiolights/matcap/mc09.jpg
+++ /dev/null
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc10.jpg b/release/datafiles/studiolights/matcap/mc10.jpg
deleted file mode 100644
index ab82f17bb93..00000000000
--- a/release/datafiles/studiolights/matcap/mc10.jpg
+++ /dev/null
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc11.jpg b/release/datafiles/studiolights/matcap/mc11.jpg
deleted file mode 100644
index 053550f082c..00000000000
--- a/release/datafiles/studiolights/matcap/mc11.jpg
+++ /dev/null
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc12.jpg b/release/datafiles/studiolights/matcap/mc12.jpg
deleted file mode 100644
index beb16f3742e..00000000000
--- a/release/datafiles/studiolights/matcap/mc12.jpg
+++ /dev/null
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc13.jpg b/release/datafiles/studiolights/matcap/mc13.jpg
deleted file mode 100644
index 7fb8fa58e8f..00000000000
--- a/release/datafiles/studiolights/matcap/mc13.jpg
+++ /dev/null
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc14.jpg b/release/datafiles/studiolights/matcap/mc14.jpg
deleted file mode 100644
index ba868d2f95a..00000000000
--- a/release/datafiles/studiolights/matcap/mc14.jpg
+++ /dev/null
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc15.jpg b/release/datafiles/studiolights/matcap/mc15.jpg
deleted file mode 100644
index b10ea326a42..00000000000
--- a/release/datafiles/studiolights/matcap/mc15.jpg
+++ /dev/null
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc16.jpg b/release/datafiles/studiolights/matcap/mc16.jpg
deleted file mode 100644
index c6ce02d59df..00000000000
--- a/release/datafiles/studiolights/matcap/mc16.jpg
+++ /dev/null
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc17.jpg b/release/datafiles/studiolights/matcap/mc17.jpg
deleted file mode 100644
index 14f15f70460..00000000000
--- a/release/datafiles/studiolights/matcap/mc17.jpg
+++ /dev/null
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc18.jpg b/release/datafiles/studiolights/matcap/mc18.jpg
deleted file mode 100644
index db572856b07..00000000000
--- a/release/datafiles/studiolights/matcap/mc18.jpg
+++ /dev/null
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc19.jpg b/release/datafiles/studiolights/matcap/mc19.jpg
deleted file mode 100644
index 56d2efb1734..00000000000
--- a/release/datafiles/studiolights/matcap/mc19.jpg
+++ /dev/null
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc20.jpg b/release/datafiles/studiolights/matcap/mc20.jpg
deleted file mode 100644
index 002a0910dd9..00000000000
--- a/release/datafiles/studiolights/matcap/mc20.jpg
+++ /dev/null
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc21.jpg b/release/datafiles/studiolights/matcap/mc21.jpg
deleted file mode 100644
index cb2fea573b8..00000000000
--- a/release/datafiles/studiolights/matcap/mc21.jpg
+++ /dev/null
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc22.jpg b/release/datafiles/studiolights/matcap/mc22.jpg
deleted file mode 100644
index 2fc71b98c5a..00000000000
--- a/release/datafiles/studiolights/matcap/mc22.jpg
+++ /dev/null
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc23.jpg b/release/datafiles/studiolights/matcap/mc23.jpg
deleted file mode 100644
index 3793c0fcaa5..00000000000
--- a/release/datafiles/studiolights/matcap/mc23.jpg
+++ /dev/null
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc24.jpg b/release/datafiles/studiolights/matcap/mc24.jpg
deleted file mode 100644
index 2a9618d8fe1..00000000000
--- a/release/datafiles/studiolights/matcap/mc24.jpg
+++ /dev/null
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/metal_anisotropic.exr b/release/datafiles/studiolights/matcap/metal_anisotropic.exr
new file mode 100644
index 00000000000..38ea94ac676
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/metal_anisotropic.exr
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/metal_carpaint.exr b/release/datafiles/studiolights/matcap/metal_carpaint.exr
new file mode 100644
index 00000000000..c5bcdf67abf
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/metal_carpaint.exr
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/metal_lead.exr b/release/datafiles/studiolights/matcap/metal_lead.exr
new file mode 100644
index 00000000000..4d6b2954ccd
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/metal_lead.exr
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/metal_shiny.exr b/release/datafiles/studiolights/matcap/metal_shiny.exr
new file mode 100644
index 00000000000..3b5d20ffda2
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/metal_shiny.exr
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/pearl.exr b/release/datafiles/studiolights/matcap/pearl.exr
new file mode 100644
index 00000000000..e657c67936e
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/pearl.exr
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/resin.exr b/release/datafiles/studiolights/matcap/resin.exr
new file mode 100644
index 00000000000..80e405aaa67
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/resin.exr
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/skin.exr b/release/datafiles/studiolights/matcap/skin.exr
new file mode 100644
index 00000000000..ffc3213dad9
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/skin.exr
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/toon.exr b/release/datafiles/studiolights/matcap/toon.exr
new file mode 100644
index 00000000000..242f5055e2b
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/toon.exr
Binary files differ
diff --git a/release/datafiles/userdef/userdef_default_theme.c b/release/datafiles/userdef/userdef_default_theme.c
index 11a9fbaca00..69ad58ea1c5 100644
--- a/release/datafiles/userdef/userdef_default_theme.c
+++ b/release/datafiles/userdef/userdef_default_theme.c
@@ -1,8 +1,8 @@
/*
- * Generated by 'source/tools/utils/blender_theme_as_c.py'
- *
- * Do not hand edit this file!
- */
+* Generated by 'source/tools/utils/blender_theme_as_c.py'
+*
+* Do not hand edit this file!
+*/
#include "DNA_userdef_types.h"
@@ -1040,5 +1040,5 @@ const bTheme U_theme_default = {
.select = RGBA(0x000000ff),
.active = RGBA(0x000000ff),
},
- },
+},
};