[Bf-blender-cvs] [e3e5ae5da8f] soc-2020-io-performance: Fix build issues: namespace BKE > bke

[Ankit Meel]

Commit: e3e5ae5da8f3d736b50ab1f3156624998037ceae
Author: Ankit Meel
Date:   Tue Jun 30 02:36:45 2020 +0530
Branches: soc-2020-io-performance
https://developer.blender.org/rBe3e5ae5da8f3d736b50ab1f3156624998037ceae

Fix build issues: namespace BKE > bke

{b51d6e8012e5}

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

M       source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mtl.cc
M       source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mtl.hh

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

diff --git 
a/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mtl.cc 
b/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mtl.cc
index 997b7a1bc83..7aec770b2c3 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mtl.cc
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mtl.cc
@@ -33,7 +33,7 @@
 
 #include "wavefront_obj_exporter_mtl.hh"
 
-using namespace BKE;
+using namespace blender::bke;
 namespace blender {
 namespace io {
 namespace obj {
diff --git 
a/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mtl.hh 
b/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mtl.hh
index c1f66ec8291..4aad44fdd49 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mtl.hh
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mtl.hh
@@ -73,15 +73,15 @@ class MTLWriter {
   /**
    * Collect all the source sockets linked to the destination socket in a 
destination node.
    */
-  void linked_sockets_to_dest_id(Vector<const BKE::OutputSocketRef *> 
*r_linked_sockets,
+  void linked_sockets_to_dest_id(Vector<const bke::OutputSocketRef *> 
*r_linked_sockets,
                                  const bNode *dest_node,
-                                 BKE::NodeTreeRef &node_tree,
+                                 bke::NodeTreeRef &node_tree,
                                  const char *dest_socket_id);
 
   /**
    * From a list of sockets, get the parent node which is of the given node 
type.
    */
-  const bNode *linked_node_of_type(const Vector<const BKE::OutputSocketRef *> 
&sockets_list,
+  const bNode *linked_node_of_type(const Vector<const bke::OutputSocketRef *> 
&sockets_list,
                                    uint sh_node_type);
   /**
    * From a texture image shader node, get the image's filepath.

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs