diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-01-04 19:35:07 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-01-04 19:58:55 +0300 |
commit | bd5394f6c0bec4eb969aa8bd24b072d7dd9ab04d (patch) | |
tree | de12a648b59fa06625a8206d1471c7f765aa2949 /source/blender/freestyle/intern/scene_graph | |
parent | 0d736d689671c4c28a8bda6ca1f8ab61726142b5 (diff) |
Fix T57890: freestyle rendering crash.
Depsgraph objects are deleted after conversion to Freestyle data structures,
so don't keep a pointer to their name strings.
Diffstat (limited to 'source/blender/freestyle/intern/scene_graph')
-rw-r--r-- | source/blender/freestyle/intern/scene_graph/Rep.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/source/blender/freestyle/intern/scene_graph/Rep.h b/source/blender/freestyle/intern/scene_graph/Rep.h index 4c8017e162d..222653b2433 100644 --- a/source/blender/freestyle/intern/scene_graph/Rep.h +++ b/source/blender/freestyle/intern/scene_graph/Rep.h @@ -28,6 +28,8 @@ * \date 25/01/2002 */ +#include <string> + #include "FrsMaterial.h" #include "SceneVisitor.h" @@ -38,6 +40,8 @@ #include "../system/Id.h" #include "../system/Precision.h" +using namespace std; + namespace Freestyle { using namespace Geometry; @@ -48,8 +52,6 @@ public: inline Rep() : BaseObject() { _Id = 0; - _Name = 0; - _LibraryPath = 0; _FrsMaterial = 0; } @@ -132,12 +134,12 @@ public: return _Id; } - inline const char *getName() const + inline const string& getName() const { return _Name; } - inline const char *getLibraryPath() const + inline const string& getLibraryPath() const { return _LibraryPath; } @@ -158,12 +160,12 @@ public: _Id = id; } - inline void setName(const char *name) + inline void setName(const string& name) { _Name = name; } - inline void setLibraryPath(const char *path) + inline void setLibraryPath(const string& path) { _LibraryPath = path; } @@ -176,8 +178,8 @@ public: private: BBox<Vec3f> _BBox; Id _Id; - const char *_Name; - const char *_LibraryPath; + string _Name; + string _LibraryPath; FrsMaterial *_FrsMaterial; }; |