← Back to branch summary

~ubuntu-branches/ubuntu/lucid/blender/lucid

« back to all changes in this revision

Viewing changes to source/gameengine/Expressions/StringValue.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Chris Coulson
  • Date: 2009-08-06 22:32:19 UTC
  • mfrom: (1.2.10 upstream)
  • Revision ID: james.westby@ubuntu.com-20090806223219-8z4eej1u8levu4pz
Tags: 2.49a+dfsg-0ubuntu1
https://launchpad.net/bugs/382153
* Merge from debian unstable, remaining changes:
  - debian/control: Build-depend on python-2.6 rather than python-2.5.
  - debian/misc/*.desktop: Add Spanish translation to .desktop 
    files.
  - debian/pyversions: 2.6.
  - debian/rules: Clean *.o of source/blender/python/api2_2x/
* New upstream release (LP: #382153).
* Refreshed patches:
  - 01_sanitize_sys.patch
  - 02_tmp_in_HOME
  - 10_use_systemwide_ftgl
  - 70_portability_platform_detection
* Removed patches merged upstream:
  - 30_fix_python_syntax_warning
  - 90_ubuntu_ffmpeg_52_changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/gameengine/Expressions/StringValue.cpp
34
34
        m_strString = "[Illegal String constructor call]";
35
35
}
36
36
 
37
 
CStringValue::CStringValue(STR_String txt,STR_String name,AllocationTYPE alloctype)
 
37
CStringValue::CStringValue(const char *txt,const char *name,AllocationTYPE alloctype)
38
38
/*
39
39
pre:
40
40
effect: constructs a new CStringValue containing text txt
113
113
 
114
114
 
115
115
 
116
 
float CStringValue::GetNumber()
 
116
double CStringValue::GetNumber()
117
117
{
118
118
        return -1;
119
119
}
133
133
CValue* CStringValue::GetReplica()
134
134
{ 
135
135
        CStringValue* replica = new CStringValue(*this);
136
 
        CValue::AddDataToReplica(replica);
 
136
        replica->ProcessReplica();
137
137
        return replica;
138
138
};
139
139