diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-10-24 13:31:11 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-10-24 13:31:11 +0300 |
commit | 80a6e5beb5be532916513025303025f961028c8d (patch) | |
tree | f1073b88efe02c1f7d6f89f25e75517f8f542972 /intern/cycles/blender | |
parent | 48997d2e40a74a83fb9edfb9de0999139392f634 (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')
-rw-r--r-- | intern/cycles/blender/blender_python.cpp | 7 | ||||
-rw-r--r-- | intern/cycles/blender/blender_shader.cpp | 3 | ||||
-rw-r--r-- | intern/cycles/blender/blender_sync.h | 2 |
3 files changed, 7 insertions, 5 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; diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp index 534bc6cc897..f63f94ab37a 100644 --- a/intern/cycles/blender/blender_shader.cpp +++ b/intern/cycles/blender/blender_shader.cpp @@ -27,12 +27,13 @@ #include "blender_util.h" #include "util_debug.h" +#include "util_string.h" CCL_NAMESPACE_BEGIN typedef map<void*, ShaderInput*> PtrInputMap; typedef map<void*, ShaderOutput*> PtrOutputMap; -typedef map<std::string, ConvertNode*> ProxyMap; +typedef map<string, ConvertNode*> ProxyMap; /* Find */ diff --git a/intern/cycles/blender/blender_sync.h b/intern/cycles/blender/blender_sync.h index b8b9597914e..9a01b4f2b6e 100644 --- a/intern/cycles/blender/blender_sync.h +++ b/intern/cycles/blender/blender_sync.h @@ -165,7 +165,7 @@ private: id_map<ParticleSystemKey, ParticleSystem> particle_system_map; set<Mesh*> mesh_synced; set<Mesh*> mesh_motion_synced; - std::set<float> motion_times; + set<float> motion_times; void *world_map; bool world_recalc; |