diff options
Diffstat (limited to 'source/blender/editors/space_node/drawnode.c')
-rw-r--r-- | source/blender/editors/space_node/drawnode.c | 162 |
1 files changed, 81 insertions, 81 deletions
diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c index 082f3f97dfd..c1b888fcf83 100644 --- a/source/blender/editors/space_node/drawnode.c +++ b/source/blender/editors/space_node/drawnode.c @@ -43,16 +43,9 @@ #include "BKE_context.h" #include "BKE_curve.h" -#include "BKE_global.h" #include "BKE_image.h" #include "BKE_library.h" #include "BKE_main.h" -#include "BKE_material.h" -#include "BKE_node.h" -#include "BKE_object.h" -#include "BKE_texture.h" -#include "BKE_text.h" -#include "BKE_utildefines.h" #include "CMP_node.h" #include "SHD_node.h" @@ -81,7 +74,7 @@ void node_buts_group(uiLayout *layout, bContext *C, PointerRNA *ptr) { - uiTemplateIDBrowse(layout, C, ptr, "nodetree", NULL, NULL, "", NULL); + uiTemplateIDBrowse(layout, C, ptr, "nodetree", NULL, NULL, ""); } static void node_buts_value(uiLayout *layout, bContext *C, PointerRNA *ptr) @@ -120,7 +113,7 @@ static void node_buts_mix_rgb(uiLayout *layout, bContext *C, PointerRNA *ptr) row= uiLayoutRow(layout, 1); uiItemR(row, ptr, "blend_type", 0, "", 0); if(ntree->type == NTREE_COMPOSIT) - uiItemR(row, ptr, "alpha", 0, "", ICON_IMAGE_RGB_ALPHA); + uiItemR(row, ptr, "use_alpha", 0, "", ICON_IMAGE_RGB_ALPHA); } static void node_buts_time(uiLayout *layout, bContext *C, PointerRNA *ptr) @@ -141,8 +134,8 @@ static void node_buts_time(uiLayout *layout, bContext *C, PointerRNA *ptr) uiTemplateCurveMapping(layout, ptr, "curve", 's', 0, 0); row= uiLayoutRow(layout, 1); - uiItemR(row, ptr, "start", 0, "Sta", 0); - uiItemR(row, ptr, "end", 0, "End", 0); + uiItemR(row, ptr, "frame_start", 0, "Sta", 0); + uiItemR(row, ptr, "frame_end", 0, "End", 0); } static void node_buts_colorramp(uiLayout *layout, bContext *C, PointerRNA *ptr) @@ -190,6 +183,7 @@ static void node_buts_normal(uiLayout *layout, bContext *C, PointerRNA *ptr) #if 0 // not used in 2.5x yet static void node_browse_tex_cb(bContext *C, void *ntree_v, void *node_v) { + Main *bmain= CTX_data_main(C); bNodeTree *ntree= ntree_v; bNode *node= node_v; Tex *tex; @@ -200,7 +194,7 @@ static void node_browse_tex_cb(bContext *C, void *ntree_v, void *node_v) node->id->us--; node->id= NULL; } - tex= BLI_findlink(&G.main->tex, node->menunr-1); + tex= BLI_findlink(&bmain->tex, node->menunr-1); node->id= &tex->id; id_us_plus(node->id); @@ -220,6 +214,7 @@ static void node_browse_tex_cb(bContext *C, void *ntree_v, void *node_v) #endif static void node_dynamic_update_cb(bContext *C, void *ntree_v, void *node_v) { + Main *bmain= CTX_data_main(C); Material *ma; bNode *node= (bNode *)node_v; ID *id= node->id; @@ -229,7 +224,7 @@ static void node_dynamic_update_cb(bContext *C, void *ntree_v, void *node_v) /* Users only have to press the "update" button in one pynode * and we also update all others sharing the same script */ - for (ma= G.main->mat.first; ma; ma= ma->id.next) { + for (ma= bmain->mat.first; ma; ma= ma->id.next) { if (ma->nodetree) { bNode *nd; for (nd= ma->nodetree->nodes.first; nd; nd= nd->next) { @@ -277,6 +272,7 @@ static void node_buts_math(uiLayout *layout, bContext *C, PointerRNA *ptr) static void node_browse_text_cb(bContext *C, void *ntree_v, void *node_v) { + Main *bmain= CTX_data_main(C); bNodeTree *ntree= ntree_v; bNode *node= node_v; ID *oldid; @@ -287,7 +283,7 @@ static void node_browse_text_cb(bContext *C, void *ntree_v, void *node_v) node->id->us--; } oldid= node->id; - node->id= BLI_findlink(&G.main->text, node->menunr-1); + node->id= BLI_findlink(&bmain->text, node->menunr-1); id_us_plus(node->id); BLI_strncpy(node->name, node->id->name+2, 21); /* huh? why 21? */ @@ -306,13 +302,13 @@ static void node_shader_buts_material(uiLayout *layout, bContext *C, PointerRNA bNode *node= ptr->data; uiLayout *col; - uiTemplateID(layout, C, ptr, "material", "MATERIAL_OT_new", NULL, NULL, NULL); + uiTemplateID(layout, C, ptr, "material", "MATERIAL_OT_new", NULL, NULL); if(!node->id) return; col= uiLayoutColumn(layout, 0); - uiItemR(col, ptr, "diffuse", 0, NULL, 0); - uiItemR(col, ptr, "specular", 0, NULL, 0); + uiItemR(col, ptr, "use_diffuse", 0, NULL, 0); + uiItemR(col, ptr, "use_specular", 0, NULL, 0); uiItemR(col, ptr, "invert_normal", 0, NULL, 0); } @@ -333,12 +329,12 @@ static void node_shader_buts_mapping(uiLayout *layout, bContext *C, PointerRNA * uiItemR(row, ptr, "scale", 0, "", 0); row= uiLayoutRow(layout, 1); - uiItemR(row, ptr, "clamp_minimum", 0, "Min", 0); - uiItemR(row, ptr, "minimum", 0, "", 0); + uiItemR(row, ptr, "use_min", 0, "Min", 0); + uiItemR(row, ptr, "min", 0, "", 0); row= uiLayoutRow(layout, 1); - uiItemR(row, ptr, "clamp_maximum", 0, "Max", 0); - uiItemR(row, ptr, "maximum", 0, "", 0); + uiItemR(row, ptr, "use_max", 0, "Max", 0); + uiItemR(row, ptr, "max", 0, "", 0); } @@ -368,6 +364,7 @@ static void node_shader_buts_geometry(uiLayout *layout, bContext *C, PointerRNA static void node_shader_buts_dynamic(uiLayout *layout, bContext *C, PointerRNA *ptr) { + Main *bmain= CTX_data_main(C); uiBlock *block= uiLayoutAbsoluteBlock(layout); bNode *node= ptr->data; bNodeTree *ntree= ptr->id.data; @@ -380,7 +377,7 @@ static void node_shader_buts_dynamic(uiLayout *layout, bContext *C, PointerRNA * /* B_NODE_EXEC is handled in butspace.c do_node_buts */ if(!node->id) { char *strp; - IDnames_to_pupstring(&strp, NULL, "", &(G.main->text), NULL, NULL); + IDnames_to_pupstring(&strp, NULL, "", &(bmain->text), NULL, NULL); node->menunr= 0; bt= uiDefButS(block, MENU, B_NODE_EXEC/*+node->nr*/, strp, butr->xmin, dy, 19, 19, @@ -467,7 +464,7 @@ static void node_composit_buts_image(uiLayout *layout, bContext *C, PointerRNA * PointerRNA imaptr; PropertyRNA *prop; - uiTemplateID(layout, C, ptr, "image", NULL, "IMAGE_OT_open", NULL, NULL); + uiTemplateID(layout, C, ptr, "image", NULL, "IMAGE_OT_open", NULL); if(!node->id) return; @@ -481,11 +478,11 @@ static void node_composit_buts_image(uiLayout *layout, bContext *C, PointerRNA * if (ELEM(RNA_enum_get(&imaptr, "source"), IMA_SRC_SEQUENCE, IMA_SRC_MOVIE)) { col= uiLayoutColumn(layout, 1); - uiItemR(col, ptr, "frames", 0, NULL, 0); - uiItemR(col, ptr, "start", 0, NULL, 0); - uiItemR(col, ptr, "offset", 0, NULL, 0); - uiItemR(col, ptr, "cyclic", 0, NULL, 0); - uiItemR(col, ptr, "auto_refresh", UI_ITEM_R_ICON_ONLY, NULL, 0); + uiItemR(col, ptr, "frame_duration", 0, NULL, 0); + uiItemR(col, ptr, "frame_start", 0, NULL, 0); + uiItemR(col, ptr, "frame_offset", 0, NULL, 0); + uiItemR(col, ptr, "use_cyclic", 0, NULL, 0); + uiItemR(col, ptr, "use_auto_refresh", UI_ITEM_R_ICON_ONLY, NULL, 0); } col= uiLayoutColumn(layout, 0); @@ -504,7 +501,7 @@ static void node_composit_buts_renderlayers(uiLayout *layout, bContext *C, Point const char *layer_name; char scene_name[19]; - uiTemplateID(layout, C, ptr, "scene", NULL, NULL, NULL, NULL); + uiTemplateID(layout, C, ptr, "scene", NULL, NULL, NULL); if(!node->id) return; @@ -535,19 +532,19 @@ static void node_composit_buts_blur(uiLayout *layout, bContext *C, PointerRNA *p uiItemR(col, ptr, "filter_type", 0, "", 0); if (RNA_enum_get(ptr, "filter_type")!= R_FILTER_FAST_GAUSS) { - uiItemR(col, ptr, "bokeh", 0, NULL, 0); - uiItemR(col, ptr, "gamma", 0, NULL, 0); + uiItemR(col, ptr, "use_bokeh", 0, NULL, 0); + uiItemR(col, ptr, "use_gamma_correction", 0, NULL, 0); } - uiItemR(col, ptr, "relative", 0, NULL, 0); + uiItemR(col, ptr, "use_relative", 0, NULL, 0); col= uiLayoutColumn(layout, 1); - if (RNA_boolean_get(ptr, "relative")) { + if (RNA_boolean_get(ptr, "use_relative")) { uiItemR(col, ptr, "factor_x", 0, "X", 0); uiItemR(col, ptr, "factor_y", 0, "Y", 0); } else { - uiItemR(col, ptr, "sizex", 0, "X", 0); - uiItemR(col, ptr, "sizey", 0, "Y", 0); + uiItemR(col, ptr, "size_x", 0, "X", 0); + uiItemR(col, ptr, "size_y", 0, "Y", 0); } } @@ -594,13 +591,13 @@ static void node_composit_buts_defocus(uiLayout *layout, bContext *C, PointerRNA uiItemR(col, ptr, "bokeh", 0, "", 0); uiItemR(col, ptr, "angle", 0, NULL, 0); - uiItemR(layout, ptr, "gamma_correction", 0, NULL, 0); + uiItemR(layout, ptr, "use_gamma_correction", 0, NULL, 0); col = uiLayoutColumn(layout, 0); uiLayoutSetActive(col, RNA_boolean_get(ptr, "use_zbuffer")==1); uiItemR(col, ptr, "f_stop", 0, NULL, 0); - uiItemR(layout, ptr, "max_blur", 0, NULL, 0); + uiItemR(layout, ptr, "blur_max", 0, NULL, 0); uiItemR(layout, ptr, "threshold", 0, NULL, 0); col = uiLayoutColumn(layout, 0); @@ -640,7 +637,7 @@ static void node_composit_buts_glare(uiLayout *layout, bContext *C, PointerRNA * uiItemR(layout, ptr, "fade", UI_ITEM_R_SLIDER, NULL, 0); if (RNA_enum_get(ptr, "glare_type")== 0) - uiItemR(layout, ptr, "rotate_45", 0, NULL, 0); + uiItemR(layout, ptr, "use_rotate_45", 0, NULL, 0); } if (RNA_enum_get(ptr, "glare_type")== 1) { uiItemR(layout, ptr, "size", 0, NULL, 0); @@ -671,12 +668,12 @@ static void node_composit_buts_lensdist(uiLayout *layout, bContext *C, PointerRN uiLayout *col; col= uiLayoutColumn(layout, 0); - uiItemR(col, ptr, "projector", 0, NULL, 0); + uiItemR(col, ptr, "use_projector", 0, NULL, 0); col = uiLayoutColumn(col, 0); - uiLayoutSetActive(col, RNA_boolean_get(ptr, "projector")==0); - uiItemR(col, ptr, "jitter", 0, NULL, 0); - uiItemR(col, ptr, "fit", 0, NULL, 0); + uiLayoutSetActive(col, RNA_boolean_get(ptr, "use_projector")==0); + uiItemR(col, ptr, "use_jitter", 0, NULL, 0); + uiItemR(col, ptr, "use_fit", 0, NULL, 0); } static void node_composit_buts_vecblur(uiLayout *layout, bContext *C, PointerRNA *ptr) @@ -689,10 +686,10 @@ static void node_composit_buts_vecblur(uiLayout *layout, bContext *C, PointerRNA col= uiLayoutColumn(layout, 1); uiItemL(col, "Speed:", 0); - uiItemR(col, ptr, "min_speed", 0, "Min", 0); - uiItemR(col, ptr, "max_speed", 0, "Max", 0); + uiItemR(col, ptr, "speed_min", 0, "Min", 0); + uiItemR(col, ptr, "speed_max", 0, "Max", 0); - uiItemR(layout, ptr, "curved", 0, NULL, 0); + uiItemR(layout, ptr, "use_curved", 0, NULL, 0); } static void node_composit_buts_filter(uiLayout *layout, bContext *C, PointerRNA *ptr) @@ -709,13 +706,13 @@ static void node_composit_buts_crop(uiLayout *layout, bContext *C, PointerRNA *p { uiLayout *col; - uiItemR(layout, ptr, "crop_size", 0, NULL, 0); + uiItemR(layout, ptr, "use_crop_size", 0, NULL, 0); col= uiLayoutColumn(layout, 1); - uiItemR(col, ptr, "x1", 0, "Left", 0); - uiItemR(col, ptr, "x2", 0, "Right", 0); - uiItemR(col, ptr, "y1", 0, "Up", 0); - uiItemR(col, ptr, "y2", 0, "Down", 0); + uiItemR(col, ptr, "min_x", 0, "Left", 0); + uiItemR(col, ptr, "max_x", 0, "Right", 0); + uiItemR(col, ptr, "min_y", 0, "Up", 0); + uiItemR(col, ptr, "max_y", 0, "Down", 0); } static void node_composit_buts_splitviewer(uiLayout *layout, bContext *C, PointerRNA *ptr) @@ -754,7 +751,7 @@ static void node_composit_buts_alphaover(uiLayout *layout, bContext *C, PointerR uiLayout *col; col =uiLayoutColumn(layout, 1); - uiItemR(col, ptr, "convert_premul", 0, NULL, 0); + uiItemR(col, ptr, "use_premultiply", 0, NULL, 0); uiItemR(col, ptr, "premul", 0, NULL, 0); } @@ -800,17 +797,17 @@ static void node_composit_buts_color_spill(uiLayout *layout, bContext *C, Pointe uiItemR(row, ptr, "channel", UI_ITEM_R_EXPAND, NULL, 0); col= uiLayoutColumn(layout, 0); - uiItemR(col, ptr, "algorithm", 0, NULL, 0); + uiItemR(col, ptr, "limit_method", 0, NULL, 0); - if(RNA_enum_get(ptr, "algorithm")==0) { + if(RNA_enum_get(ptr, "limit_method")==0) { uiItemL(col, "Limiting Channel:", 0); row=uiLayoutRow(col,0); uiItemR(row, ptr, "limit_channel", UI_ITEM_R_EXPAND, NULL, 0); } uiItemR(col, ptr, "ratio", UI_ITEM_R_SLIDER, NULL, 0); - uiItemR(col, ptr, "unspill", 0, NULL, 0); - if (RNA_enum_get(ptr, "unspill")== 1) { + uiItemR(col, ptr, "use_unspill", 0, NULL, 0); + if (RNA_enum_get(ptr, "use_unspill")== 1) { uiItemR(col, ptr, "unspill_red", UI_ITEM_R_SLIDER, NULL, 0); uiItemR(col, ptr, "unspill_green", UI_ITEM_R_SLIDER, NULL, 0); uiItemR(col, ptr, "unspill_blue", UI_ITEM_R_SLIDER, NULL, 0); @@ -822,13 +819,13 @@ static void node_composit_buts_chroma_matte(uiLayout *layout, bContext *C, Point uiLayout *col; col= uiLayoutColumn(layout, 0); - uiItemR(col, ptr, "acceptance", 0, NULL, 0); - uiItemR(col, ptr, "cutoff", 0, NULL, 0); + uiItemR(col, ptr, "tolerance", 0, NULL, 0); + uiItemR(col, ptr, "threshold", 0, NULL, 0); col= uiLayoutColumn(layout, 1); - uiItemR(col, ptr, "lift", UI_ITEM_R_SLIDER, NULL, 0); + /*uiItemR(col, ptr, "lift", UI_ITEM_R_SLIDER, NULL, 0); Removed for now */ uiItemR(col, ptr, "gain", UI_ITEM_R_SLIDER, NULL, 0); - uiItemR(col, ptr, "shadow_adjust", UI_ITEM_R_SLIDER, NULL, 0); + /*uiItemR(col, ptr, "shadow_adjust", UI_ITEM_R_SLIDER, NULL, 0); Removed for now*/ } static void node_composit_buts_color_matte(uiLayout *layout, bContext *C, PointerRNA *ptr) @@ -836,9 +833,9 @@ static void node_composit_buts_color_matte(uiLayout *layout, bContext *C, Pointe uiLayout *col; col= uiLayoutColumn(layout, 1); - uiItemR(col, ptr, "h", UI_ITEM_R_SLIDER, NULL, 0); - uiItemR(col, ptr, "s", UI_ITEM_R_SLIDER, NULL, 0); - uiItemR(col, ptr, "v", UI_ITEM_R_SLIDER, NULL, 0); + uiItemR(col, ptr, "color_hue", UI_ITEM_R_SLIDER, NULL, 0); + uiItemR(col, ptr, "color_saturation", UI_ITEM_R_SLIDER, NULL, 0); + uiItemR(col, ptr, "color_value", UI_ITEM_R_SLIDER, NULL, 0); } static void node_composit_buts_channel_matte(uiLayout *layout, bContext *C, PointerRNA *ptr) @@ -852,19 +849,19 @@ static void node_composit_buts_channel_matte(uiLayout *layout, bContext *C, Poin col=uiLayoutColumn(layout, 0); uiItemL(col, "Key Channel:", 0); row= uiLayoutRow(col, 0); - uiItemR(row, ptr, "channel", UI_ITEM_R_EXPAND, NULL, 0); + uiItemR(row, ptr, "matte_channel", UI_ITEM_R_EXPAND, NULL, 0); col =uiLayoutColumn(layout, 0); - uiItemR(col, ptr, "algorithm", 0, NULL, 0); - if(RNA_enum_get(ptr, "algorithm")==0) { + uiItemR(col, ptr, "limit_method", 0, NULL, 0); + if(RNA_enum_get(ptr, "limit_method")==0) { uiItemL(col, "Limiting Channel:", 0); row=uiLayoutRow(col,0); uiItemR(row, ptr, "limit_channel", UI_ITEM_R_EXPAND, NULL, 0); } - uiItemR(col, ptr, "high", UI_ITEM_R_SLIDER, NULL, 0); - uiItemR(col, ptr, "low", UI_ITEM_R_SLIDER, NULL, 0); + uiItemR(col, ptr, "limit_max", UI_ITEM_R_SLIDER, NULL, 0); + uiItemR(col, ptr, "limit_min", UI_ITEM_R_SLIDER, NULL, 0); } static void node_composit_buts_luma_matte(uiLayout *layout, bContext *C, PointerRNA *ptr) @@ -872,8 +869,8 @@ static void node_composit_buts_luma_matte(uiLayout *layout, bContext *C, Pointer uiLayout *col; col= uiLayoutColumn(layout, 1); - uiItemR(col, ptr, "high", UI_ITEM_R_SLIDER, NULL, 0); - uiItemR(col, ptr, "low", UI_ITEM_R_SLIDER, NULL, 0); + uiItemR(col, ptr, "limit_max", UI_ITEM_R_SLIDER, NULL, 0); + uiItemR(col, ptr, "limit_min", UI_ITEM_R_SLIDER, NULL, 0); } static void node_composit_buts_map_uv(uiLayout *layout, bContext *C, PointerRNA *ptr) @@ -896,11 +893,14 @@ static void node_composit_buts_file_output(uiLayout *layout, bContext *C, Pointe row= uiLayoutRow(layout, 0); if (RNA_enum_get(ptr, "image_type")== R_OPENEXR) { - uiItemR(row, ptr, "exr_half", 0, NULL, 0); + uiItemR(row, ptr, "use_exr_half", 0, NULL, 0); uiItemR(row, ptr, "exr_codec", 0, "", 0); } else if (RNA_enum_get(ptr, "image_type")== R_JPEG90) { - uiItemR(row, ptr, "quality", UI_ITEM_R_SLIDER, NULL, 0); + uiItemR(row, ptr, "quality", UI_ITEM_R_SLIDER, "Quality", 0); + } + else if (RNA_enum_get(ptr, "image_type")== R_PNG) { + uiItemR(row, ptr, "quality", UI_ITEM_R_SLIDER, "Compression", 0); } row= uiLayoutRow(layout, 1); @@ -915,7 +915,7 @@ static void node_composit_buts_scale(uiLayout *layout, bContext *C, PointerRNA * static void node_composit_buts_rotate(uiLayout *layout, bContext *C, PointerRNA *ptr) { - uiItemR(layout, ptr, "filter", 0, "", 0); + uiItemR(layout, ptr, "filter_type", 0, "", 0); } static void node_composit_buts_invert(uiLayout *layout, bContext *C, PointerRNA *ptr) @@ -923,8 +923,8 @@ static void node_composit_buts_invert(uiLayout *layout, bContext *C, PointerRNA uiLayout *col; col= uiLayoutColumn(layout, 0); - uiItemR(col, ptr, "rgb", 0, NULL, 0); - uiItemR(col, ptr, "alpha", 0, NULL, 0); + uiItemR(col, ptr, "invert_rgb", 0, NULL, 0); + uiItemR(col, ptr, "invert_alpha", 0, NULL, 0); } static void node_composit_buts_premulkey(uiLayout *layout, bContext *C, PointerRNA *ptr) @@ -941,9 +941,9 @@ static void node_composit_buts_colorbalance(uiLayout *layout, bContext *C, Point { uiLayout *split, *col, *row; - uiItemR(layout, ptr, "correction_formula", 0, NULL, 0); + uiItemR(layout, ptr, "correction_method", 0, NULL, 0); - if (RNA_enum_get(ptr, "correction_formula")== 0) { + if (RNA_enum_get(ptr, "correction_method")== 0) { split = uiLayoutSplit(layout, 0, 0); col = uiLayoutColumn(split, 0); @@ -1164,7 +1164,7 @@ static void node_texture_buts_proc(uiLayout *layout, bContext *C, PointerRNA *pt case TEX_BLEND: uiItemR(col, &tex_ptr, "progression", 0, "", 0); row= uiLayoutRow(col, 0); - uiItemR(row, &tex_ptr, "flip_axis", UI_ITEM_R_EXPAND, NULL, 0); + uiItemR(row, &tex_ptr, "use_flip_axis", UI_ITEM_R_EXPAND, NULL, 0); break; case TEX_MARBLE: @@ -1173,14 +1173,14 @@ static void node_texture_buts_proc(uiLayout *layout, bContext *C, PointerRNA *pt row= uiLayoutRow(col, 0); uiItemR(row, &tex_ptr, "noise_type", UI_ITEM_R_EXPAND, NULL, 0); row= uiLayoutRow(col, 0); - uiItemR(row, &tex_ptr, "noisebasis2", UI_ITEM_R_EXPAND, NULL, 0); + uiItemR(row, &tex_ptr, "noisebasis_2", UI_ITEM_R_EXPAND, NULL, 0); break; case TEX_WOOD: uiItemR(col, &tex_ptr, "noise_basis", 0, "", 0); uiItemR(col, &tex_ptr, "stype", 0, "", 0); row= uiLayoutRow(col, 0); - uiItemR(row, &tex_ptr, "noisebasis2", UI_ITEM_R_EXPAND, NULL, 0); + uiItemR(row, &tex_ptr, "noisebasis_2", UI_ITEM_R_EXPAND, NULL, 0); row= uiLayoutRow(col, 0); uiLayoutSetActive(row, !(RNA_enum_get(&tex_ptr, "stype")==TEX_BAND || RNA_enum_get(&tex_ptr, "stype")==TEX_RING)); uiItemR(row, &tex_ptr, "noise_type", UI_ITEM_R_EXPAND, NULL, 0); @@ -1204,12 +1204,12 @@ static void node_texture_buts_proc(uiLayout *layout, bContext *C, PointerRNA *pt static void node_texture_buts_image(uiLayout *layout, bContext *C, PointerRNA *ptr) { - uiTemplateID(layout, C, ptr, "image", NULL, "IMAGE_OT_open", NULL, NULL); + uiTemplateID(layout, C, ptr, "image", NULL, "IMAGE_OT_open", NULL); } static void node_texture_buts_output(uiLayout *layout, bContext *C, PointerRNA *ptr) { - uiItemR(layout, ptr, "output_name", 0, "", 0); + uiItemR(layout, ptr, "filepath", 0, "", 0); } /* only once called */ |