diff options
| author | Anton Yabchinskiy <arn@bestmx.ru> | 2015-01-21 12:03:29 +0300 |
|---|---|---|
| committer | Anton Yabchinskiy <arn@bestmx.ru> | 2015-01-21 12:03:29 +0300 |
| commit | 6f93e6812edaf6c8c79c28dadbe5f1c4a8ced93e (patch) | |
| tree | 70e49e718d13300738c45b0de1aee5afab9ddf31 /scene/2d | |
| parent | fa38e9b838f32baedfca7a9250a76418b1872f5d (diff) | |
| parent | c6eabbbec5a9fec7a0d473fe67a544af3454c3d2 (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'scene/2d')
| -rw-r--r-- | scene/2d/canvas_item.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/2d/canvas_item.cpp b/scene/2d/canvas_item.cpp index ae857bbce9..6b892839bb 100644 --- a/scene/2d/canvas_item.cpp +++ b/scene/2d/canvas_item.cpp @@ -969,7 +969,7 @@ CanvasItem::CanvasItem() : xform_change(this) { block_transform_notify=false; // viewport=NULL; canvas_layer=NULL; - use_parent_shader; + use_parent_shader=false; global_invalid=true; C=NULL; |