[Bf-blender-cvs] [72ee3397100] soc-2021-uv-editor-improvements: Merge branch 'master' into soc-2021-uv-editor-improvements

[Siddhartha Jejurkar]

Commit: 72ee3397100d7f90139d5bafc7cac2b5ef453659
Author: Siddhartha Jejurkar
Date:   Mon Aug 9 06:31:32 2021 +0530
Branches: soc-2021-uv-editor-improvements
https://developer.blender.org/rB72ee3397100d7f90139d5bafc7cac2b5ef453659

Merge branch 'master' into soc-2021-uv-editor-improvements

===================================================================



===================================================================

diff --cc source/blender/makesrna/intern/rna_texture_api.c
index c46b9acf986,83c1efd55bc..4edeed86ca8
--- a/source/blender/makesrna/intern/rna_texture_api.c
+++ b/source/blender/makesrna/intern/rna_texture_api.c
@@@ -59,19 -59,23 +59,22 @@@ void RNA_api_texture(StructRNA *srna
    PropertyRNA *parm;
  
    func = RNA_def_function(srna, "evaluate", "texture_evaluate");
-   RNA_def_function_ui_description(func, "Evaluate the texture at the coordinates given");
+   RNA_def_function_ui_description(
+       func, "Evaluate the texture at the a given coordinate and returns the result");
  
-   parm = RNA_def_float_vector(func,
-                               "value",
-                               3,
-                               NULL,
-                               -FLT_MAX,
-                               FLT_MAX,
-                               "The object coordinates (x,y,z) used to generate/map the texture",
-                               "",
-                               -1e4,
-                               1e4);
+   parm = RNA_def_float_vector(
+       func,
+       "value",
+       3,
+       NULL,
+       -FLT_MAX,
+       FLT_MAX,
+       "The coordinates (x,y,z) of the texture, in case of a 3D texture, the z value is the slice "
+       "of the texture that is evaluated. For 2D textures such as images, the z value is ignored",
+       "",
+       -1e4,
+       1e4);
    RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
 -
    /* return location and normal */
    parm = RNA_def_float_vector(
        func,