archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cycles: Remove explicit std:: from types where possible

Browse Source 
We have our own abstraction level on top of the STL's implementation.
This commit will guarantee our tweaks are used for all cases.
This commit is contained in:
Sergey Sharybin
2016-10-24 12:31:11 +02:00
parent 48997d2e40
commit 80a6e5beb5
6 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
intern/cycles/blender/blender_python.cpp
View File

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