archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: make format

Browse Source
This commit is contained in:
Jacques Lucke
2022-09-01 19:59:55 +02:00
parent 9a86255da8
commit 16adfff1c6
6 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/compositor/nodes/COM_ConvertColorSpaceNode.cc
View File

@@ -27,7 +27,7 @@ ConvertColorSpaceNode::ConvertColorSpaceNode(bNode *editorNode) : Node(editorNod
void ConvertColorSpaceNode::convert_to_operations(NodeConverter &converter, void ConvertColorSpaceNode::convert_to_operations(NodeConverter &converter,
const CompositorContext &UNUSED(context)) const const CompositorContext &UNUSED(context)) const
{ {
const bNode *b_node = get_bnode(); const bNode *b_node = get_bnode();
NodeInput *inputSocketImage = this->get_input_socket(0); NodeInput *inputSocketImage = this->get_input_socket(0);
NodeOutput *outputSocketImage = this->get_output_socket(0); NodeOutput *outputSocketImage = this->get_output_socket(0);
@@ -50,7 +50,7 @@ void ConvertColorSpaceNode::convert_to_operations(NodeConverter &converter,
bool ConvertColorSpaceNode::performs_conversion(NodeConvertColorSpace &settings) const bool ConvertColorSpaceNode::performs_conversion(NodeConvertColorSpace &settings) const
{ {
const bNode *b_node = get_bnode(); const bNode *b_node = get_bnode();
if (IMB_colormanagement_space_name_is_data(settings.from_color_space)) { if (IMB_colormanagement_space_name_is_data(settings.from_color_space)) {
CLOG_INFO(&LOG, CLOG_INFO(&LOG,

2
source/blender/compositor/nodes/COM_GlareNode.cc
View File

@@ -21,7 +21,7 @@ void GlareNode::convert_to_operations(NodeConverter &converter,
const CompositorContext & /*context*/) const const CompositorContext & /*context*/) const
{ {
const bNode *node = this->get_bnode(); const bNode *node = this->get_bnode();
const NodeGlare *glare = (const NodeGlare *)node->storage; const NodeGlare *glare = (const NodeGlare *)node->storage;
GlareBaseOperation *glareoperation = nullptr; GlareBaseOperation *glareoperation = nullptr;
switch (glare->type) { switch (glare->type) {

2
source/blender/compositor/nodes/COM_SunBeamsNode.cc
View File

@@ -16,7 +16,7 @@ void SunBeamsNode::convert_to_operations(NodeConverter &converter,
{ {
NodeInput *input_socket = this->get_input_socket(0); NodeInput *input_socket = this->get_input_socket(0);
NodeOutput *output_socket = this->get_output_socket(0); NodeOutput *output_socket = this->get_output_socket(0);
const NodeSunBeams *data = (const NodeSunBeams *)get_bnode()->storage; const NodeSunBeams *data = (const NodeSunBeams *)get_bnode()->storage;
SunBeamsOperation *operation = new SunBeamsOperation(); SunBeamsOperation *operation = new SunBeamsOperation();
operation->set_data(*data); operation->set_data(*data);

8
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
View File

@@ -1218,8 +1218,12 @@ void DepsgraphNodeBuilder::build_driver_id_property(ID *id, const char *rna_path
/* Custom properties of bones are placed in their components to improve granularity. */ /* Custom properties of bones are placed in their components to improve granularity. */
if (RNA_struct_is_a(ptr.type, &RNA_PoseBone)) { if (RNA_struct_is_a(ptr.type, &RNA_PoseBone)) {
const bPoseChannel *pchan = static_cast<const bPoseChannel *>(ptr.data); const bPoseChannel *pchan = static_cast<const bPoseChannel *>(ptr.data);
ensure_operation_node( ensure_operation_node(ptr.owner_id,
ptr.owner_id, NodeType::BONE, pchan->name, OperationCode::ID_PROPERTY, nullptr, prop_identifier); NodeType::BONE,
pchan->name,
OperationCode::ID_PROPERTY,
nullptr,
prop_identifier);
} }
else { else {
ensure_operation_node( ensure_operation_node(

2
source/blender/gpu/intern/gpu_vertex_format.cc
View File

@@ -402,7 +402,7 @@ void GPU_vertformat_from_shader(GPUVertFormat *format, const struct GPUShader *g
GPU_vertformat_clear(format); GPU_vertformat_clear(format);
uint attr_len = GPU_shader_get_attribute_len(gpushader); uint attr_len = GPU_shader_get_attribute_len(gpushader);
int location_test = 0, attrs_added = 0;; int location_test = 0, attrs_added = 0;
while (attrs_added < attr_len) { while (attrs_added < attr_len) {
char name[256]; char name[256];
Type gpu_type; Type gpu_type;

2
source/blender/python/gpu/gpu_py_shader.h
View File

@@ -7,7 +7,7 @@
#pragma once #pragma once
#ifndef __cplusplus #ifndef __cplusplus
#include "../generic/py_capi_utils.h" # include "../generic/py_capi_utils.h"
#endif #endif
/* Make sure that there is always a reference count for PyObjects of type String as the strings are /* Make sure that there is always a reference count for PyObjects of type String as the strings are