blender
/
blender
136
406
Fork 590
Code Issues 6.2k Pull Requests 764 Projects 19 Wiki Activity

Cleanup: clang-format

This commit is contained in:
Campbell Barton 2021-03-27 14:49:59 +11:00
parent ee367084a7
commit 414017ac86
3 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/makesrna/intern/rna_depsgraph.c
View File

@ -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");

11
source/blender/makesrna/intern/rna_object.c
View File

@ -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 */

4
source/blender/nodes/shader/nodes/node_shader_vector_math.cc
View File

@ -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,