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/winged_edge/WEdge.h | |
| 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/winged_edge/WEdge.h')
| -rw-r--r-- | source/blender/freestyle/intern/winged_edge/WEdge.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/source/blender/freestyle/intern/winged_edge/WEdge.h b/source/blender/freestyle/intern/winged_edge/WEdge.h index 30f55ff7e73..7efed908d73 100644 --- a/source/blender/freestyle/intern/winged_edge/WEdge.h +++ b/source/blender/freestyle/intern/winged_edge/WEdge.h @@ -1024,8 +1024,8 @@ protected: vector<WEdge *> _EdgeList; vector<WFace *> _FaceList; int _Id; - const char *_Name; - const char *_LibraryPath; + string _Name; + string _LibraryPath; static unsigned _SceneCurrentId; #if 0 Vec3f _min; @@ -1044,8 +1044,6 @@ public: #endif _Id = _SceneCurrentId; _SceneCurrentId++; - _Name = 0; - _LibraryPath = 0; } /*! copy constructor */ @@ -1125,12 +1123,12 @@ public: } #endif - inline const char *getName() const + inline const string& getName() const { return _Name; } - inline const char *getLibraryPath() const + inline const string& getLibraryPath() const { return _LibraryPath; } @@ -1179,12 +1177,12 @@ public: _FrsMaterials = iMaterials; } - 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; } |