Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenoit Bolsee <benoit.bolsee@online.be>2016-06-08 00:30:03 +0300
committerBenoit Bolsee <benoit.bolsee@online.be>2016-06-08 00:30:03 +0300
commit324bee2c3fc06b8d1a64cd49601adfb11227d4de (patch)
treeb948cd004aad3b40d42121a76157d126c249d0c5 /source/blender/collada/ExtraTags.h
parentd48c71b3b1f1fc686c2887c3d594a57711a20664 (diff)
parenta506f4c74eb60a5b9fc9c6dadaab34d40a806191 (diff)
Merge remote-tracking branch 'origin/master' into decklink
Diffstat (limited to 'source/blender/collada/ExtraTags.h')
-rw-r--r--source/blender/collada/ExtraTags.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/source/blender/collada/ExtraTags.h b/source/blender/collada/ExtraTags.h
index 03a311a7e86..ad272dcba65 100644
--- a/source/blender/collada/ExtraTags.h
+++ b/source/blender/collada/ExtraTags.h
@@ -43,17 +43,18 @@ public:
bool addTag(std::string tag, std::string data);
/** Set given short pointer to value of tag, if it exists. */
- void setData(std::string tag, short *data);
+ bool setData(std::string tag, short *data);
/** Set given int pointer to value of tag, if it exists. */
- void setData(std::string tag, int *data);
+ bool setData(std::string tag, int *data);
/** Set given float pointer to value of tag, if it exists. */
- void setData(std::string tag, float *data);
+ bool setData(std::string tag, float *data);
/** Set given char pointer to value of tag, if it exists. */
- void setData(std::string tag, char *data);
-
+ bool setData(std::string tag, char *data);
+ std::string setData(std::string tag, std::string &data);
+
/** Return true if the extra tags is for specified profile. */
bool isProfile(std::string profile);