godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-06 12:20:30 +00:00
Code Releases Wiki Activity

-fix shader param names broken issue on code completion

Browse Source 
-fix z order issue in new 2D engine
This commit is contained in:
Juan Linietsky
2015-01-14 09:05:33 -03:00
parent 250188e1aa
commit 04af74596d
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scene/resources/material.cpp
View File

@@ -582,7 +582,7 @@ void ShaderMaterial::get_argument_options(const StringName& p_function,int p_idx
List<PropertyInfo> pl; List<PropertyInfo> pl;
shader->get_param_list(&pl); shader->get_param_list(&pl);
for (List<PropertyInfo>::Element *E=pl.front();E;E=E->next()) { 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/","")+"\"");
} }
} }
} }

8
servers/visual/visual_server_raster.cpp
View File

@@ -6253,6 +6253,10 @@ void VisualServerRaster::_render_canvas_item(CanvasItem *p_canvas_item,const Mat
sorter.sort(child_items,child_item_count); sorter.sort(child_items,child_item_count);
} }
if (ci->z_relative)
p_z=CLAMP(p_z+ci->z,CANVAS_ITEM_Z_MIN,CANVAS_ITEM_Z_MAX);
else
p_z=ci->z;
for(int i=0;i<child_item_count;i++) { for(int i=0;i<child_item_count;i++) {
@@ -6267,10 +6271,6 @@ void VisualServerRaster::_render_canvas_item(CanvasItem *p_canvas_item,const Mat
ci->final_transform=xform; ci->final_transform=xform;
ci->final_opacity=opacity * ci->self_opacity; ci->final_opacity=opacity * ci->self_opacity;
if (ci->z_relative)
p_z=CLAMP(p_z+ci->z,CANVAS_ITEM_Z_MIN,CANVAS_ITEM_Z_MAX);
else
p_z=ci->z;
int zidx = p_z-CANVAS_ITEM_Z_MIN; int zidx = p_z-CANVAS_ITEM_Z_MIN;