diff options
-rw-r--r-- | source/blender/gpu/GPU_texture.h | 9 | ||||
-rw-r--r-- | source/blender/nodes/geometry/nodes/node_geo_subdivision_surface.cc | 11 | ||||
-rw-r--r-- | source/blender/python/gpu/gpu_py_platform.c | 12 |
3 files changed, 23 insertions, 9 deletions
diff --git a/source/blender/gpu/GPU_texture.h b/source/blender/gpu/GPU_texture.h index ee4d08d4059..9a1885160b6 100644 --- a/source/blender/gpu/GPU_texture.h +++ b/source/blender/gpu/GPU_texture.h @@ -192,8 +192,13 @@ GPUTexture *GPU_texture_create_1d_array( const char *name, int w, int h, int mip_len, eGPUTextureFormat format, const float *data); GPUTexture *GPU_texture_create_2d( const char *name, int w, int h, int mip_len, eGPUTextureFormat format, const float *data); -GPUTexture *GPU_texture_create_2d_array( - const char *name, int w, int h, int d, int mip_len, eGPUTextureFormat format, const float *data); +GPUTexture *GPU_texture_create_2d_array(const char *name, + int w, + int h, + int d, + int mip_len, + eGPUTextureFormat format, + const float *data); GPUTexture *GPU_texture_create_3d(const char *name, int w, int h, diff --git a/source/blender/nodes/geometry/nodes/node_geo_subdivision_surface.cc b/source/blender/nodes/geometry/nodes/node_geo_subdivision_surface.cc index 7882cd04845..e8dd36e528c 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_subdivision_surface.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_subdivision_surface.cc @@ -18,9 +18,9 @@ #include "BKE_subdiv.h" #include "BKE_subdiv_mesh.h" +#include "DNA_modifier_types.h" #include "UI_interface.h" #include "UI_resources.h" -#include "DNA_modifier_types.h" #include "node_geometry_util.hh" static bNodeSocketTemplate geo_node_subdivision_surface_in[] = { @@ -74,7 +74,8 @@ static void geo_node_subdivision_surface_exec(GeoNodeExecParams params) params.error_message_add(NodeWarningType::Error, TIP_("Disabled, Blender was compiled without OpenSubdiv")); #else - const NodeGeometrySubdivisionSurface &storage = *(const NodeGeometrySubdivisionSurface *)params.node().storage; + const NodeGeometrySubdivisionSurface &storage = + *(const NodeGeometrySubdivisionSurface *)params.node().storage; const int uv_smooth = storage.uv_smooth; const int boundary_smooth = storage.boundary_smooth; const int subdiv_level = clamp_i(params.extract_input<int>("Level"), 0, 30); @@ -142,8 +143,10 @@ void register_node_type_geo_subdivision_surface() ntype.draw_buttons = geo_node_subdivision_surface_layout; node_type_init(&ntype, geo_node_subdivision_surface_init); node_type_size_preset(&ntype, NODE_SIZE_MIDDLE); - node_type_storage( - &ntype, "NodeGeometrySubdivisionSurface", node_free_standard_storage, node_copy_standard_storage); + node_type_storage(&ntype, + "NodeGeometrySubdivisionSurface", + node_free_standard_storage, + node_copy_standard_storage); node_type_socket_templates( &ntype, geo_node_subdivision_surface_in, geo_node_subdivision_surface_out); nodeRegisterType(&ntype); diff --git a/source/blender/python/gpu/gpu_py_platform.c b/source/blender/python/gpu/gpu_py_platform.c index 7d10f0e9b43..62310a83642 100644 --- a/source/blender/python/gpu/gpu_py_platform.c +++ b/source/blender/python/gpu/gpu_py_platform.c @@ -76,11 +76,17 @@ static PyObject *pygpu_platform_version_get(PyObject *UNUSED(self)) * \{ */ static struct PyMethodDef pygpu_platform__tp_methods[] = { - {"vendor_get", (PyCFunction)pygpu_platform_vendor_get, METH_NOARGS, + {"vendor_get", + (PyCFunction)pygpu_platform_vendor_get, + METH_NOARGS, pygpu_platform_vendor_get_doc}, - {"renderer_get", (PyCFunction)pygpu_platform_renderer_get, METH_NOARGS, + {"renderer_get", + (PyCFunction)pygpu_platform_renderer_get, + METH_NOARGS, pygpu_platform_renderer_get_doc}, - {"version_get", (PyCFunction)pygpu_platform_version_get, METH_NOARGS, + {"version_get", + (PyCFunction)pygpu_platform_version_get, + METH_NOARGS, pygpu_platform_version_get_doc}, {NULL, NULL, 0, NULL}, }; |