diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-04-22 23:31:09 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-04-22 23:31:09 -0300 |
| commit | 5e03874571d72b41d27803a4338f98bc150c2600 (patch) | |
| tree | 0ab8ae7e590b9ac47b66cb8d02f0293cced46e0f | |
| parent | c43dfddb655d7ad8b8b4b1cd874e533719dc4463 (diff) | |
| parent | 1721ef17d688e0bdb77d56f923c990d95ee79242 (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
| -rw-r--r-- | scene/gui/rich_text_label.cpp | 2 | ||||
| -rw-r--r-- | tools/export/blender25/io_scene_dae/__init__.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scene/gui/rich_text_label.cpp b/scene/gui/rich_text_label.cpp index 64f8d51b17..4be53839be 100644 --- a/scene/gui/rich_text_label.cpp +++ b/scene/gui/rich_text_label.cpp @@ -114,7 +114,7 @@ void RichTextLabel::_process_line(int &y, int p_width, int p_line, ProcessMode p line++;\ if (line < l.offset_caches.size())\ line_ofs=l.offset_caches[line];\ - wofs=margin;\ + wofs=margin;\ if (align!=ALIGN_FILL)\ wofs+=line_ofs;\ } else {\ diff --git a/tools/export/blender25/io_scene_dae/__init__.py b/tools/export/blender25/io_scene_dae/__init__.py index b3e3f70cf0..5b561673c5 100644 --- a/tools/export/blender25/io_scene_dae/__init__.py +++ b/tools/export/blender25/io_scene_dae/__init__.py @@ -81,7 +81,7 @@ class ExportDAE(bpy.types.Operator, ExportHelper): use_mesh_modifiers = BoolProperty( name="Apply Modifiers", description="Apply modifiers to mesh objects (on a copy!).", - default=True, + default=False, ) use_tangent_arrays = BoolProperty( name="Tangent Arrays", |