diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-01-14 09:05:33 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-01-14 09:05:33 -0300 |
| commit | 04af74596d070f062bd917b0364d87c57544f8d5 (patch) | |
| tree | 5f8d1ea86bb0f4d55107f18a445c31e685cd2fcc /scene | |
| parent | 250188e1aaf533eef6c088bf2bd58a3a230d6c9c (diff) | |
-fix shader param names broken issue on code completion
-fix z order issue in new 2D engine
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/resources/material.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/resources/material.cpp b/scene/resources/material.cpp index 355cc8884c..08c752cff9 100644 --- a/scene/resources/material.cpp +++ b/scene/resources/material.cpp @@ -582,7 +582,7 @@ void ShaderMaterial::get_argument_options(const StringName& p_function,int p_idx List<PropertyInfo> pl; shader->get_param_list(&pl); for (List<PropertyInfo>::Element *E=pl.front();E;E=E->next()) { - r_options->push_back(E->get().name); + r_options->push_back("\""+E->get().name.replace("shader_param/","")+"\""); } } } |