griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.3-release'

Browse Source
This commit is contained in:
Campbell Barton
2024-10-09 15:48:36 +11:00
parent 6c4d699268 933fb1978f
commit 434bc9213a
15 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/python/bmesh/bmesh_py_types.cc
View File

@@ -2918,7 +2918,7 @@ PyDoc_STRVAR(
" :arg key: The key that sets the ordering of the elements.\n"
" :type key: :function: returning a number\n"
" :arg reverse: Reverse the order of the elements\n"
" :type reverse: :boolean:\n"
" :type reverse: bool\n"
"\n"
" .. note::\n"
"\n"

2
source/blender/python/bmesh/bmesh_py_utils.cc
View File

@@ -546,7 +546,7 @@ PyDoc_STRVAR(
" :arg edgenet: Sequence of edges.\n"
" :type edgenet: :class:`bmesh.types.BMEdge`\n"
" :return: The newly created faces.\n"
" :rtype: tuple of (:class:`bmesh.types.BMFace`)\n"
" :rtype: tuple of :class:`bmesh.types.BMFace`\n"
"\n"
" .. note::\n"
"\n"

2
source/blender/python/gpu/gpu_py_compute.cc
View File

@@ -39,7 +39,7 @@ PyDoc_STRVAR(
" :arg groups_z_len: Int for group z length:\n"
" :type groups_z_len: int\n"
" :return: Shader object.\n"
" :rtype: :class:`bpy.types.GPUShader`\n");
" :rtype: :class:`gpu.types.GPUShader`\n");
static PyObject *pygpu_compute_dispatch(PyObject * /*self*/, PyObject *args, PyObject *kwds)
{
BPYGPU_IS_INIT_OR_ERROR_OBJ;

8
source/blender/python/gpu/gpu_py_shader.cc
View File

@@ -406,7 +406,7 @@ PyDoc_STRVAR(
" :arg name: Name of the uniform variable whose value is to be changed.\n"
" :type name: str\n"
" :arg value: Value that will be used to update the specified uniform variable.\n"
" :type value: single number or sequence of numbers\n");
" :type value: single number or sequence of floats\n");
static PyObject *pygpu_shader_uniform_float(BPyGPUShader *self, PyObject *args)
{
const char *error_prefix = "GPUShader.uniform_float";
@@ -478,7 +478,7 @@ PyDoc_STRVAR(
" :arg name: name of the uniform variable whose value is to be changed.\n"
" :type name: str\n"
" :arg seq: Value that will be used to update the specified uniform variable.\n"
" :type seq: sequence of numbers\n");
" :type seq: sequence of ints\n");
static PyObject *pygpu_shader_uniform_int(BPyGPUShader *self, PyObject *args)
{
const char *error_prefix = "GPUShader.uniform_int";
@@ -947,7 +947,7 @@ PyDoc_STRVAR(
" - ``CLIPPED``\n"
" :type config: str\n"
" :return: Shader object corresponding to the given name.\n"
" :rtype: :class:`bpy.types.GPUShader`\n");
" :rtype: :class:`gpu.types.GPUShader`\n");
static PyObject *pygpu_shader_from_builtin(PyObject * /*self*/, PyObject *args, PyObject *kwds)
{
BPYGPU_IS_INIT_OR_ERROR_OBJ;
@@ -993,7 +993,7 @@ PyDoc_STRVAR(
" :arg shader_info: GPUShaderCreateInfo\n"
" :type shader_info: :class:`bpy.types.GPUShaderCreateInfo`\n"
" :return: Shader object corresponding to the given name.\n"
" :rtype: :class:`bpy.types.GPUShader`\n");
" :rtype: :class:`gpu.types.GPUShader`\n");
static PyObject *pygpu_shader_create_from_info(BPyGPUShader * /*self*/, BPyGPUShaderCreateInfo *o)
{
BPYGPU_IS_INIT_OR_ERROR_OBJ;

8
source/blender/python/intern/bpy_rna.cc
View File

@@ -3565,7 +3565,7 @@ PyDoc_STRVAR(
" dictionary function of the same name).\n"
"\n"
" :return: custom property keys.\n"
" :rtype: :class:`idprop.type.IDPropertyGroupViewKeys`\n"
" :rtype: :class:`idprop.types.IDPropertyGroupViewKeys`\n"
"\n" BPY_DOC_ID_PROP_TYPE_NOTE);
static PyObject *pyrna_struct_keys(BPy_StructRNA *self)
{
@@ -3590,7 +3590,7 @@ PyDoc_STRVAR(
" dictionary function of the same name).\n"
"\n"
" :return: custom property key, value pairs.\n"
" :rtype: :class:`idprop.type.IDPropertyGroupViewItems`\n"
" :rtype: :class:`idprop.types.IDPropertyGroupViewItems`\n"
"\n" BPY_DOC_ID_PROP_TYPE_NOTE);
static PyObject *pyrna_struct_items(BPy_StructRNA *self)
{
@@ -3615,7 +3615,7 @@ PyDoc_STRVAR(
" dictionary function of the same name).\n"
"\n"
" :return: custom property values.\n"
" :rtype: :class:`idprop.type.IDPropertyGroupViewValues`\n"
" :rtype: :class:`idprop.types.IDPropertyGroupViewValues`\n"
"\n" BPY_DOC_ID_PROP_TYPE_NOTE);
static PyObject *pyrna_struct_values(BPy_StructRNA *self)
{
@@ -4299,7 +4299,7 @@ PyDoc_STRVAR(
".. method:: id_properties_ensure()\n"
"\n"
" :return: the parent group for an RNA struct's custom IDProperties.\n"
" :rtype: :class:`bpy.types.IDPropertyGroup`\n");
" :rtype: :class:`idprop.types.IDPropertyGroup`\n");
static PyObject *pyrna_struct_id_properties_ensure(BPy_StructRNA *self)
{
PYRNA_STRUCT_CHECK_OBJ(self);

2
source/blender/python/mathutils/mathutils_Vector.cc
View File

@@ -3406,7 +3406,7 @@ PyDoc_STRVAR(
" This object gives access to Vectors in Blender.\n"
"\n"
" :arg seq: Components of the vector, must be a sequence of at least two\n"
" :type seq: sequence of numbers\n");
" :type seq: sequence of floats\n");
PyTypeObject vector_Type = {
/*ob_base*/ PyVarObject_HEAD_INIT(nullptr, 0)
/*tp_name*/ "Vector",

4
source/blender/python/mathutils/mathutils_geometry.cc
View File

@@ -640,7 +640,7 @@ PyDoc_STRVAR(
" :arg sphere_co: The center of the sphere\n"
" :type sphere_co: :class:`mathutils.Vector`\n"
" :arg sphere_radius: Radius of the sphere\n"
" :type sphere_radius: sphere_radius\n"
" :type sphere_radius: float\n"
" :return: The intersection points as a pair of vectors or None when there is no "
"intersection\n"
" :rtype: A tuple pair containing :class:`mathutils.Vector` or None\n");
@@ -731,7 +731,7 @@ PyDoc_STRVAR(
" :arg sphere_co: The center of the sphere\n"
" :type sphere_co: :class:`mathutils.Vector`\n"
" :arg sphere_radius: Radius of the sphere\n"
" :type sphere_radius: sphere_radius\n"
" :type sphere_radius: float\n"
" :return: The intersection points as a pair of vectors or None when there is no "
"intersection\n"
" :rtype: A tuple pair containing :class:`mathutils.Vector` or None\n");