[Bf-blender-cvs] [9e04dc90c7e] soc-2020-io-performance: Cleanup: clang format.

Ankit Meel noreply at git.blender.org
Mon Sep 21 13:35:42 CEST 2020


Commit: 9e04dc90c7e99be7aeb0d6baa43588f74040bd97
Author: Ankit Meel
Date:   Mon Sep 21 16:20:19 2020 +0530
Branches: soc-2020-io-performance
https://developer.blender.org/rB9e04dc90c7e99be7aeb0d6baa43588f74040bd97

Cleanup: clang format.

===================================================================

M	source/blender/io/wavefront_obj/intern/obj_import_file_reader.cc
M	source/blender/io/wavefront_obj/intern/obj_import_mtl.cc
M	source/blender/io/wavefront_obj/intern/parser_string_utils.cc

===================================================================

diff --git a/source/blender/io/wavefront_obj/intern/obj_import_file_reader.cc b/source/blender/io/wavefront_obj/intern/obj_import_file_reader.cc
index 585b276ce34..76786e6f3c9 100644
--- a/source/blender/io/wavefront_obj/intern/obj_import_file_reader.cc
+++ b/source/blender/io/wavefront_obj/intern/obj_import_file_reader.cc
@@ -36,7 +36,6 @@ namespace blender::io::obj {
 
 using std::string;
 
-
 /**
  * Based on the properties of the given Geometry instance, create a new Geometry instance
  * or return the previous one.
diff --git a/source/blender/io/wavefront_obj/intern/obj_import_mtl.cc b/source/blender/io/wavefront_obj/intern/obj_import_mtl.cc
index 1a7d90a9774..f8d7aa49926 100644
--- a/source/blender/io/wavefront_obj/intern/obj_import_mtl.cc
+++ b/source/blender/io/wavefront_obj/intern/obj_import_mtl.cc
@@ -73,7 +73,6 @@ static void set_property_of_socket(eNodeSocketDatatype property_type,
   }
 }
 
-
 /**
  * Load image for Image Texture node and set the node properties.
  * Return success if Image can be loaded successfully.
@@ -119,8 +118,7 @@ static bool load_texture_image(Main *bmain, const tex_map_XX &tex_map, bNode *r_
  * Initialises a nodetree with a p-BSDF node's BSDF socket connected to shader output node's
  * surface socket.
  */
-ShaderNodetreeWrap::ShaderNodetreeWrap(Main *bmain, const MTLMaterial &mtl_mat)
-    : mtl_mat_(mtl_mat)
+ShaderNodetreeWrap::ShaderNodetreeWrap(Main *bmain, const MTLMaterial &mtl_mat) : mtl_mat_(mtl_mat)
 {
   nodetree_.reset(ntreeAddTree(nullptr, "Shader Nodetree", ntreeType_Shader->idname));
   bsdf_.reset(add_node_to_tree(SH_NODE_BSDF_PRINCIPLED));
@@ -312,8 +310,8 @@ void ShaderNodetreeWrap::set_bsdf_socket_values()
     }
   }
   float3 base_color = {std::max(0.0f, mtl_mat_.Kd[0]),
-    std::max(0.0f, mtl_mat_.Kd[1]),
-    std::max(0.0f, mtl_mat_.Kd[2])};
+                       std::max(0.0f, mtl_mat_.Kd[1]),
+                       std::max(0.0f, mtl_mat_.Kd[2])};
   float3 emission_color = {std::max(0.0f, mtl_mat_.Ke[0]),
                            std::max(0.0f, mtl_mat_.Ke[1]),
                            std::max(0.0f, mtl_mat_.Ke[2])};
diff --git a/source/blender/io/wavefront_obj/intern/parser_string_utils.cc b/source/blender/io/wavefront_obj/intern/parser_string_utils.cc
index 3ada52e6dde..afaa272b1dc 100644
--- a/source/blender/io/wavefront_obj/intern/parser_string_utils.cc
+++ b/source/blender/io/wavefront_obj/intern/parser_string_utils.cc
@@ -17,8 +17,8 @@
  * All rights reserved.
  */
 
-#include <iostream>
 #include <fstream>
+#include <iostream>
 #include <sstream>
 
 #include "BLI_float3.hh"



More information about the Bf-blender-cvs mailing list