diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-08-20 10:09:58 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-08-20 10:09:58 +0400 |
commit | 4f5f868a523430aa41de8bd63f888878aaf63002 (patch) | |
tree | 2646d7467382bc8d2e5addc361b91f6eec7246e1 /source/blender/editors | |
parent | 4afe81c7260905bcb2682d9cbac016a446310955 (diff) |
rna data path names which are more likely to break animations.
Added an operator "Update Animation Data",
access from the search menu to update drivers and fcurves.
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/mesh/editmesh_add.c | 4 | ||||
-rw-r--r-- | source/blender/editors/screen/screen_ops.c | 24 | ||||
-rw-r--r-- | source/blender/editors/space_image/image_buttons.c | 4 | ||||
-rw-r--r-- | source/blender/editors/space_nla/nla_buttons.c | 22 | ||||
-rw-r--r-- | source/blender/editors/space_node/drawnode.c | 66 |
5 files changed, 60 insertions, 60 deletions
diff --git a/source/blender/editors/mesh/editmesh_add.c b/source/blender/editors/mesh/editmesh_add.c index 8ad768f2658..ca1a80110f3 100644 --- a/source/blender/editors/mesh/editmesh_add.c +++ b/source/blender/editors/mesh/editmesh_add.c @@ -1587,7 +1587,7 @@ static int add_primitive_uvsphere_exec(bContext *C, wmOperator *op) return OPERATOR_CANCELLED; make_prim_ext(C, loc, rot, enter_editmode, layer, - PRIM_UVSPHERE, RNA_int_get(op->ptr, "rings"), + PRIM_UVSPHERE, RNA_int_get(op->ptr, "ring_count"), RNA_int_get(op->ptr, "segments"), 0, RNA_float_get(op->ptr,"size"), 0.0f, 0, 0); @@ -1611,7 +1611,7 @@ void MESH_OT_primitive_uv_sphere_add(wmOperatorType *ot) /* props */ RNA_def_int(ot->srna, "segments", 32, INT_MIN, INT_MAX, "Segments", "", 3, 500); - RNA_def_int(ot->srna, "rings", 16, INT_MIN, INT_MAX, "Rings", "", 3, 500); + RNA_def_int(ot->srna, "ring_count", 16, INT_MIN, INT_MAX, "Rings", "", 3, 500); RNA_def_float(ot->srna, "size", 1.0f, 0.0, FLT_MAX, "Size", "", 0.001, 100.00); ED_object_add_generic_props(ot, TRUE); diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index 3daacd8f68e..c96306dde14 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -1748,10 +1748,10 @@ static int area_join_init(bContext *C, wmOperator *op) int x2, y2; /* required properties, make negative to get return 0 if not set by caller */ - x1= RNA_int_get(op->ptr, "x1"); - y1= RNA_int_get(op->ptr, "y1"); - x2= RNA_int_get(op->ptr, "x2"); - y2= RNA_int_get(op->ptr, "y2"); + x1= RNA_int_get(op->ptr, "min_x"); + y1= RNA_int_get(op->ptr, "min_y"); + x2= RNA_int_get(op->ptr, "max_x"); + y2= RNA_int_get(op->ptr, "max_y"); sa1 = screen_areahascursor(CTX_wm_screen(C), x1, y1); sa2 = screen_areahascursor(CTX_wm_screen(C), x2, y2); @@ -1832,10 +1832,10 @@ static int area_join_invoke(bContext *C, wmOperator *op, wmEvent *event) return OPERATOR_PASS_THROUGH; /* prepare operator state vars */ - RNA_int_set(op->ptr, "x1", sad->x); - RNA_int_set(op->ptr, "y1", sad->y); - RNA_int_set(op->ptr, "x2", event->x); - RNA_int_set(op->ptr, "y2", event->y); + RNA_int_set(op->ptr, "min_x", sad->x); + RNA_int_set(op->ptr, "min_y", sad->y); + RNA_int_set(op->ptr, "max_x", event->x); + RNA_int_set(op->ptr, "max_y", event->y); if(!area_join_init(C, op)) return OPERATOR_PASS_THROUGH; @@ -1977,10 +1977,10 @@ static void SCREEN_OT_area_join(wmOperatorType *ot) ot->flag= OPTYPE_BLOCKING; /* rna */ - RNA_def_int(ot->srna, "x1", -100, INT_MIN, INT_MAX, "X 1", "", INT_MIN, INT_MAX); - RNA_def_int(ot->srna, "y1", -100, INT_MIN, INT_MAX, "Y 1", "", INT_MIN, INT_MAX); - RNA_def_int(ot->srna, "x2", -100, INT_MIN, INT_MAX, "X 2", "", INT_MIN, INT_MAX); - RNA_def_int(ot->srna, "y2", -100, INT_MIN, INT_MAX, "Y 2", "", INT_MIN, INT_MAX); + RNA_def_int(ot->srna, "min_x", -100, INT_MIN, INT_MAX, "X 1", "", INT_MIN, INT_MAX); + RNA_def_int(ot->srna, "min_y", -100, INT_MIN, INT_MAX, "Y 1", "", INT_MIN, INT_MAX); + RNA_def_int(ot->srna, "max_x", -100, INT_MIN, INT_MAX, "X 2", "", INT_MIN, INT_MAX); + RNA_def_int(ot->srna, "max_y", -100, INT_MIN, INT_MAX, "Y 2", "", INT_MIN, INT_MAX); } /* ************** repeat last operator ***************************** */ diff --git a/source/blender/editors/space_image/image_buttons.c b/source/blender/editors/space_image/image_buttons.c index 06ed4d61657..4f9163bc32c 100644 --- a/source/blender/editors/space_image/image_buttons.c +++ b/source/blender/editors/space_image/image_buttons.c @@ -884,7 +884,7 @@ void uiTemplateImage(uiLayout *layout, bContext *C, PointerRNA *ptr, char *propn uiLayoutSetActive(row, RNA_boolean_get(&imaptr, "use_fields")); col= uiLayoutColumn(split, 0); - uiItemR(col, &imaptr, "premultiply", 0, NULL, 0); + uiItemR(col, &imaptr, "use_premultiply", 0, NULL, 0); } } @@ -909,7 +909,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, "auto_refresh", 0, NULL, 0); + uiItemR(col, userptr, "use_auto_refresh", 0, NULL, 0); uiItemR(col, userptr, "cyclic", 0, NULL, 0); } else if(ima->source==IMA_SRC_GENERATED) { diff --git a/source/blender/editors/space_nla/nla_buttons.c b/source/blender/editors/space_nla/nla_buttons.c index 6ff9922c555..5ad21f7c9ca 100644 --- a/source/blender/editors/space_nla/nla_buttons.c +++ b/source/blender/editors/space_nla/nla_buttons.c @@ -293,23 +293,23 @@ static void nla_panel_properties(const bContext *C, Panel *pa) /* blending */ row= uiLayoutRow(layout, 1); - uiItemR(row, &strip_ptr, "blending", 0, NULL, 0); + uiItemR(row, &strip_ptr, "blend_type", 0, NULL, 0); /* blend in/out + autoblending * - blend in/out can only be set when autoblending is off */ column= uiLayoutColumn(layout, 1); - uiLayoutSetActive(column, RNA_boolean_get(&strip_ptr, "animated_influence")==0); - uiItemR(column, &strip_ptr, "auto_blending", 0, NULL, 0); // XXX as toggle? + uiLayoutSetActive(column, RNA_boolean_get(&strip_ptr, "use_animated_influence")==0); + uiItemR(column, &strip_ptr, "use_auto_blend", 0, NULL, 0); // XXX as toggle? subcol= uiLayoutColumn(column, 1); - uiLayoutSetActive(subcol, RNA_boolean_get(&strip_ptr, "auto_blending")==0); + uiLayoutSetActive(subcol, RNA_boolean_get(&strip_ptr, "use_auto_blend")==0); uiItemR(subcol, &strip_ptr, "blend_in", 0, NULL, 0); uiItemR(subcol, &strip_ptr, "blend_out", 0, NULL, 0); /* settings */ column= uiLayoutColumn(layout, 1); - uiLayoutSetActive(column, !(RNA_boolean_get(&strip_ptr, "animated_influence") || RNA_boolean_get(&strip_ptr, "animated_time"))); + 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); @@ -346,7 +346,7 @@ static void nla_panel_actclip(const bContext *C, Panel *pa) /* action usage */ column= uiLayoutColumn(layout, 1); - uiLayoutSetActive(column, RNA_boolean_get(&strip_ptr, "animated_time")==0); + uiLayoutSetActive(column, RNA_boolean_get(&strip_ptr, "use_animated_time")==0); uiItemL(column, "Playback Settings:", 0); uiItemR(column, &strip_ptr, "scale", 0, NULL, 0); uiItemR(column, &strip_ptr, "repeat", 0, NULL, 0); @@ -368,21 +368,21 @@ static void nla_panel_evaluation(const bContext *C, Panel *pa) uiBlockSetHandleFunc(block, do_nla_region_buttons, NULL); column= uiLayoutColumn(layout, 1); - uiItemR(column, &strip_ptr, "animated_influence", 0, NULL, 0); + uiItemR(column, &strip_ptr, "use_animated_influence", 0, NULL, 0); subcolumn= uiLayoutColumn(column, 1); - uiLayoutSetEnabled(subcolumn, RNA_boolean_get(&strip_ptr, "animated_influence")); + uiLayoutSetEnabled(subcolumn, RNA_boolean_get(&strip_ptr, "use_animated_influence")); uiItemR(subcolumn, &strip_ptr, "influence", 0, NULL, 0); column= uiLayoutColumn(layout, 1); subrow= uiLayoutRow(column, 0); - uiItemR(subrow, &strip_ptr, "animated_time", 0, NULL, 0); - uiItemR(subrow, &strip_ptr, "animated_time_cyclic", 0, NULL, 0); + uiItemR(subrow, &strip_ptr, "use_animated_time", 0, NULL, 0); + uiItemR(subrow, &strip_ptr, "use_animated_time_cyclic", 0, NULL, 0); subcolumn= uiLayoutColumn(column, 1); subrow= uiLayoutRow(subcolumn, 0); - uiLayoutSetEnabled(subrow, RNA_boolean_get(&strip_ptr, "animated_time")); + uiLayoutSetEnabled(subrow, RNA_boolean_get(&strip_ptr, "use_animated_time")); uiItemR(subcolumn, &strip_ptr, "strip_time", 0, NULL, 0); } diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c index f04cefc6d2b..e3013cc2507 100644 --- a/source/blender/editors/space_node/drawnode.c +++ b/source/blender/editors/space_node/drawnode.c @@ -329,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); } @@ -482,7 +482,7 @@ static void node_composit_buts_image(uiLayout *layout, bContext *C, PointerRNA * 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, "use_auto_refresh", UI_ITEM_R_ICON_ONLY, NULL, 0); } col= uiLayoutColumn(layout, 0); @@ -543,8 +543,8 @@ static void node_composit_buts_blur(uiLayout *layout, bContext *C, PointerRNA *p 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); } } @@ -591,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); @@ -637,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); @@ -668,10 +668,10 @@ 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); + uiLayoutSetActive(col, RNA_boolean_get(ptr, "use_projector")==0); uiItemR(col, ptr, "jitter", 0, NULL, 0); uiItemR(col, ptr, "fit", 0, NULL, 0); } @@ -686,8 +686,8 @@ 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); } @@ -706,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) @@ -751,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); } @@ -797,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); @@ -819,7 +819,7 @@ 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, "tolerance", 0, NULL, 0); uiItemR(col, ptr, "cutoff", 0, NULL, 0); col= uiLayoutColumn(layout, 1); @@ -853,8 +853,8 @@ static void node_composit_buts_channel_matte(uiLayout *layout, bContext *C, Poin 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); @@ -893,7 +893,7 @@ 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) { @@ -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); |