← Back to branch summary

~ubuntu-branches/ubuntu/trusty/blender/trusty

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-03-06 12:08:47 UTC
  • mfrom: (1.5.1) (14.1.8 experimental)
  • Revision ID: package-import@ubuntu.com-20130306120847-frjfaryb2zrotwcg
Tags: 2.66a-1ubuntu1
https://launchpad.net/bugs/1076930
https://launchpad.net/bugs/1089256
https://launchpad.net/bugs/1052743
https://launchpad.net/bugs/999024
* Resynchronize with Debian (LP: #1076930, #1089256, #1052743, #999024,
  #1122888, #1147084)
* debian/control:
  - Lower build-depends on libavcodec-dev since we're not
    doing the libav9 transition in Ubuntu yet

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/gameengine/Expressions/EmptyValue.cpp
30
30
 
31
31
CEmptyValue::CEmptyValue()
32
32
/*
33
 
pre:
34
 
effect: constructs a new CEmptyValue
35
 
*/
 
33
 * pre:
 
34
 * effect: constructs a new CEmptyValue
 
35
 */
36
36
{
37
37
        SetModified(false);
38
38
}
41
41
 
42
42
CEmptyValue::~CEmptyValue()
43
43
/*
44
 
pre:
45
 
effect: deletes the object
46
 
*/
 
44
 * pre:
 
45
 * effect: deletes the object
 
46
 */
47
47
{
48
48
 
49
49
}
52
52
 
53
53
CValue * CEmptyValue::Calc(VALUE_OPERATOR op, CValue * val)
54
54
/*
55
 
pre:
56
 
ret: a new object containing the result of applying operator op to this
57
 
object and val
58
 
*/
 
55
 * pre:
 
56
 * ret: a new object containing the result of applying operator op to this
 
57
 * object and val
 
58
 */
59
59
{
60
60
        return val->CalcFinal(VALUE_EMPTY_TYPE, op, this);
61
61
        
65
65
 
66
66
CValue * CEmptyValue::CalcFinal(VALUE_DATA_TYPE dtype, VALUE_OPERATOR op, CValue * val)
67
67
/*
68
 
pre: the type of val is dtype
69
 
ret: a new object containing the result of applying operator op to val and
70
 
this object
71
 
*/
 
68
 * pre: the type of val is dtype
 
69
 * ret: a new object containing the result of applying operator op to val and
 
70
 * this object
 
71
 */
72
72
{
73
73
        return val->AddRef();
74
74
}