diff options
| author | Lukas Stockner <lukas.stockner@freenet.de> | 2018-05-27 18:26:59 +0300 |
|---|---|---|
| committer | Lukas Stockner <lukas.stockner@freenet.de> | 2018-05-27 18:26:59 +0300 |
| commit | 1863883a248faa1fcae4b99332c8d5e6d3957845 (patch) | |
| tree | adb53f3624e5e90b70e48e32c3b0a89c749fe94e /intern/cycles/blender/blender_util.h | |
| parent | 47f2b3b80d748ccfe1192dbd7c3176be88814da1 (diff) | |
| parent | edce44d6931586fad3cee019db762d54e73a886a (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/blender/blender_util.h')
| -rw-r--r-- | intern/cycles/blender/blender_util.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/blender/blender_util.h b/intern/cycles/blender/blender_util.h index 983988f4e36..8a874b7063e 100644 --- a/intern/cycles/blender/blender_util.h +++ b/intern/cycles/blender/blender_util.h @@ -468,7 +468,7 @@ static inline string blender_absolute_path(BL::BlendData& b_data, return path; } -static inline string get_text_datablock_content(const PointerRNA&& ptr) +static inline string get_text_datablock_content(const PointerRNA& ptr) { if(ptr.data == NULL) { return ""; |