Skip to content

Commit 31fa74b

Browse files
authored
Merge pull request #10628 from skyace65/RemoveShaderMaterial
Remove shader materials page
2 parents b96b3a6 + 1a4ba56 commit 31fa74b

10 files changed

+16
-82
lines changed
-9.65 KB
Binary file not shown.
-11.7 KB
Binary file not shown.
-11.4 KB
Binary file not shown.
-5.17 KB
Binary file not shown.
-12.4 KB
Binary file not shown.
-8.73 KB
Binary file not shown.

tutorials/shaders/index.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ Shaders
1010
introduction_to_shaders
1111
shader_reference/index
1212
your_first_shader/index
13-
shader_materials
1413
visual_shaders
1514
compute_shaders
1615
screen-reading_shaders

tutorials/shaders/shader_materials.rst

Lines changed: 0 additions & 81 deletions
This file was deleted.

tutorials/shaders/your_first_shader/your_first_2d_shader.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,14 @@ you are writing a CanvasItem Shader or a Spatial Shader and it previews the
5353
output of spatial shaders. So what you are seeing is the output of the default
5454
Spatial Shader.
5555

56+
.. note::
57+
Materials that inherit from the :ref:`class_Material` resource, such as :ref:`class_StandardMaterial3D`
58+
and :ref:`class_ParticleProcessMaterial`, can be converted to a :ref:`class_ShaderMaterial`
59+
and their existing properties will be converted to an accompanying text shader.
60+
To do so, right-click on the material in the FileSystem dock and choose
61+
**Convert to ShaderMaterial**. You can also do so by right-clicking on any
62+
property holding a reference to the material in the inspector.
63+
5664
Click beside "Shader" and select "New Shader". Finally, click on the shader
5765
you just created and the shader editor will open. You are now ready to begin writing
5866
your first shader.

tutorials/shaders/your_first_shader/your_first_3d_shader.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,14 @@ surface, so instead of an array of materials there is only one. Set the
9292
**Material** to a new ShaderMaterial, then expand the material by clicking on
9393
the sphere that appears.
9494

95+
.. note::
96+
Materials that inherit from the :ref:`class_Material` resource, such as :ref:`class_StandardMaterial3D`
97+
and :ref:`class_ParticleProcessMaterial`, can be converted to a :ref:`class_ShaderMaterial`
98+
and their existing properties will be converted to an accompanying text shader.
99+
To do so, right-click on the material in the FileSystem dock and choose
100+
**Convert to ShaderMaterial**. You can also do so by right-clicking on any
101+
property holding a reference to the material in the inspector.
102+
95103
Now set the material's **Shader** to a new Shader by clicking ``<empty>`` and
96104
select **New Shader...**. Leave the default settings, give your shader a name,
97105
and click **Create**.

0 commit comments

Comments
 (0)