[Bf-blender-cvs] [63b60be] master: Fix T47427: Crash caused by OSL
Sergey Sharybin
noreply at git.blender.org
Tue Feb 16 13:38:56 CET 2016
Commit: 63b60be6d77420a5176050629e06d7888c311875
Author: Sergey Sharybin
Date: Tue Feb 16 13:37:05 2016 +0100
Branches: master
https://developer.blender.org/rB63b60be6d77420a5176050629e06d7888c311875
Fix T47427: Crash caused by OSL
===================================================================
M intern/cycles/util/util_vector.h
===================================================================
diff --git a/intern/cycles/util/util_vector.h b/intern/cycles/util/util_vector.h
index 830aa15..9f9e69c 100644
--- a/intern/cycles/util/util_vector.h
+++ b/intern/cycles/util/util_vector.h
@@ -75,7 +75,7 @@ public:
/* Some external API might demand working with std::vector. */
operator std::vector<value_type>()
{
- return std::vector<value_type>(*this);
+ return std::vector<value_type>(this->begin(), this->end());
}
};
More information about the Bf-blender-cvs
mailing list