Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source/blender/makesrna/intern/rna_depsgraph.c9
-rw-r--r--source/blender/makesrna/intern/rna_object.c11
-rw-r--r--source/blender/nodes/shader/nodes/node_shader_vector_math.cc4
3 files changed, 11 insertions, 13 deletions
diff --git a/source/blender/makesrna/intern/rna_depsgraph.c b/source/blender/makesrna/intern/rna_depsgraph.c
index d226e2aa832..85071e8cd19 100644
--- a/source/blender/makesrna/intern/rna_depsgraph.c
+++ b/source/blender/makesrna/intern/rna_depsgraph.c
@@ -505,11 +505,10 @@ static void rna_def_depsgraph_instance(BlenderRNA *brna)
PropertyRNA *prop;
srna = RNA_def_struct(brna, "DepsgraphObjectInstance", NULL);
- RNA_def_struct_ui_text(
- srna,
- "Dependency Graph Object Instance",
- "Extended information about dependency graph object iterator "
- "(Warning: All data here is 'evaluated' one, not original .blend IDs)");
+ RNA_def_struct_ui_text(srna,
+ "Dependency Graph Object Instance",
+ "Extended information about dependency graph object iterator "
+ "(Warning: All data here is 'evaluated' one, not original .blend IDs)");
prop = RNA_def_property(srna, "object", PROP_POINTER, PROP_NONE);
RNA_def_property_struct_type(prop, "Object");
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c
index f85acf07955..21e9328d043 100644
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@ -2969,12 +2969,11 @@ static void rna_def_object(BlenderRNA *brna)
RNA_def_property_float_funcs(
prop, "rna_Object_dimensions_get", "rna_Object_dimensions_set", NULL);
RNA_def_property_ui_range(prop, 0.0f, FLT_MAX, 1, RNA_TRANSLATION_PREC_DEFAULT);
- RNA_def_property_ui_text(
- prop,
- "Dimensions",
- "Absolute bounding box dimensions of the object.\n"
- "Warning: Assigning to it or its members multiple consecutive times "
- "will not work correctly, as this needs up-to-date evaluated data");
+ RNA_def_property_ui_text(prop,
+ "Dimensions",
+ "Absolute bounding box dimensions of the object.\n"
+ "Warning: Assigning to it or its members multiple consecutive times "
+ "will not work correctly, as this needs up-to-date evaluated data");
RNA_def_property_update(prop, NC_OBJECT | ND_TRANSFORM, "rna_Object_internal_update");
/* delta transforms */
diff --git a/source/blender/nodes/shader/nodes/node_shader_vector_math.cc b/source/blender/nodes/shader/nodes/node_shader_vector_math.cc
index c4edf69930b..472f903e1a5 100644
--- a/source/blender/nodes/shader/nodes/node_shader_vector_math.cc
+++ b/source/blender/nodes/shader/nodes/node_shader_vector_math.cc
@@ -202,7 +202,7 @@ static const blender::fn::MultiFunction &get_multi_function(
if (multi_fn != nullptr) {
return *multi_fn;
}
-
+
blender::nodes::try_dispatch_float_math_fl3_fl3_fl_to_fl3(
operation, [&](auto function, const blender::nodes::FloatMathOperationInfo &info) {
static blender::fn::CustomMF_SI_SI_SI_SO<float3, float3, float, float3> fn{
@@ -212,7 +212,7 @@ static const blender::fn::MultiFunction &get_multi_function(
if (multi_fn != nullptr) {
return *multi_fn;
}
-
+
blender::nodes::try_dispatch_float_math_fl3_fl3_to_fl(
operation, [&](auto function, const blender::nodes::FloatMathOperationInfo &info) {
static blender::fn::CustomMF_SI_SI_SO<float3, float3, float> fn{info.title_case_name,