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:
authorSergey Sharybin <sergey.vfx@gmail.com>2016-10-24 13:31:11 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-10-24 13:31:11 +0300
commit80a6e5beb5be532916513025303025f961028c8d (patch)
treef1073b88efe02c1f7d6f89f25e75517f8f542972 /intern/cycles/blender/blender_python.cpp
parent48997d2e40a74a83fb9edfb9de0999139392f634 (diff)
Cycles: Remove explicit std:: from types where possible
We have our own abstraction level on top of the STL's implementation. This commit will guarantee our tweaks are used for all cases.
Diffstat (limited to 'intern/cycles/blender/blender_python.cpp')
-rw-r--r--intern/cycles/blender/blender_python.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/intern/cycles/blender/blender_python.cpp b/intern/cycles/blender/blender_python.cpp
index 0161b5b192c..a50f5edb1df 100644
--- a/intern/cycles/blender/blender_python.cpp
+++ b/intern/cycles/blender/blender_python.cpp
@@ -26,6 +26,7 @@
#include "util_md5.h"
#include "util_opengl.h"
#include "util_path.h"
+#include "util_string.h"
#include "util_types.h"
#ifdef WITH_OSL
@@ -437,13 +438,13 @@ static PyObject *osl_update_node_func(PyObject * /*self*/, PyObject *args)
continue;
/* determine socket type */
- std::string socket_type;
+ string socket_type;
BL::NodeSocket::type_enum data_type = BL::NodeSocket::type_VALUE;
float4 default_float4 = make_float4(0.0f, 0.0f, 0.0f, 1.0f);
float default_float = 0.0f;
int default_int = 0;
- std::string default_string = "";
-
+ string default_string = "";
+
if(param->isclosure) {
socket_type = "NodeSocketShader";
data_type = BL::NodeSocket::type_SHADER;