From 93ffe7d7f1cfcb639aca165d310ffed653385b8e Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 21 Aug 2010 04:51:00 +0000 Subject: rna renaming (manual edits) --- source/blender/editors/space_image/image_buttons.c | 2 +- source/blender/editors/space_nla/nla_buttons.c | 2 +- source/blender/editors/space_node/drawnode.c | 58 +++++++++++----------- 3 files changed, 31 insertions(+), 31 deletions(-) (limited to 'source/blender/editors') diff --git a/source/blender/editors/space_image/image_buttons.c b/source/blender/editors/space_image/image_buttons.c index 4f9163bc32c..054cd69443a 100644 --- a/source/blender/editors/space_image/image_buttons.c +++ b/source/blender/editors/space_image/image_buttons.c @@ -910,7 +910,7 @@ void uiTemplateImage(uiLayout *layout, bContext *C, PointerRNA *ptr, char *propn col= uiLayoutColumn(split, 0); uiItemR(col, userptr, "fields_per_frame", 0, "Fields", 0); uiItemR(col, userptr, "use_auto_refresh", 0, NULL, 0); - uiItemR(col, userptr, "cyclic", 0, NULL, 0); + uiItemR(col, userptr, "use_cyclic", 0, NULL, 0); } else if(ima->source==IMA_SRC_GENERATED) { split= uiLayoutSplit(layout, 0, 0); diff --git a/source/blender/editors/space_nla/nla_buttons.c b/source/blender/editors/space_nla/nla_buttons.c index 5ad21f7c9ca..fc869c4b46f 100644 --- a/source/blender/editors/space_nla/nla_buttons.c +++ b/source/blender/editors/space_nla/nla_buttons.c @@ -312,7 +312,7 @@ static void nla_panel_properties(const bContext *C, Panel *pa) uiLayoutSetActive(column, !(RNA_boolean_get(&strip_ptr, "animated_influence") || RNA_boolean_get(&strip_ptr, "use_animated_time"))); uiItemL(column, "Playback Settings:", 0); uiItemR(column, &strip_ptr, "mute", 0, NULL, 0); - uiItemR(column, &strip_ptr, "reversed", 0, NULL, 0); + uiItemR(column, &strip_ptr, "use_reverse", 0, NULL, 0); } diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c index e3013cc2507..c1b888fcf83 100644 --- a/source/blender/editors/space_node/drawnode.c +++ b/source/blender/editors/space_node/drawnode.c @@ -113,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) @@ -134,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) @@ -307,8 +307,8 @@ static void node_shader_buts_material(uiLayout *layout, bContext *C, PointerRNA 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); } @@ -478,10 +478,10 @@ 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, "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); } @@ -532,13 +532,13 @@ 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); } @@ -672,8 +672,8 @@ static void node_composit_buts_lensdist(uiLayout *layout, bContext *C, PointerRN col = uiLayoutColumn(col, 0); uiLayoutSetActive(col, RNA_boolean_get(ptr, "use_projector")==0); - uiItemR(col, ptr, "jitter", 0, NULL, 0); - uiItemR(col, ptr, "fit", 0, NULL, 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,7 +689,7 @@ static void node_composit_buts_vecblur(uiLayout *layout, bContext *C, PointerRNA 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) @@ -820,7 +820,7 @@ static void node_composit_buts_chroma_matte(uiLayout *layout, bContext *C, Point col= uiLayoutColumn(layout, 0); uiItemR(col, ptr, "tolerance", 0, NULL, 0); - uiItemR(col, ptr, "cutoff", 0, NULL, 0); + uiItemR(col, ptr, "threshold", 0, NULL, 0); col= uiLayoutColumn(layout, 1); /*uiItemR(col, ptr, "lift", UI_ITEM_R_SLIDER, NULL, 0); Removed for now */ @@ -833,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) @@ -849,7 +849,7 @@ 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); @@ -860,8 +860,8 @@ static void node_composit_buts_channel_matte(uiLayout *layout, bContext *C, Poin 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) @@ -869,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) @@ -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) @@ -1209,7 +1209,7 @@ static void node_texture_buts_image(uiLayout *layout, bContext *C, PointerRNA *p 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 */ -- cgit v1.2.3