diff options
| -rw-r--r-- | release/scripts/startup/bl_ui/space_graph.py | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_graph/graph_ops.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/transform/transform.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/transform/transform_generics.c | 2 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 6 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_stereo.c | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/release/scripts/startup/bl_ui/space_graph.py b/release/scripts/startup/bl_ui/space_graph.py index 485bd271060..c00e0a1f9d9 100644 --- a/release/scripts/startup/bl_ui/space_graph.py +++ b/release/scripts/startup/bl_ui/space_graph.py @@ -49,7 +49,7 @@ class GRAPH_HT_header(Header): row = layout.row(align=True) - row.prop(toolsettings, "use_proportional_ipo", + row.prop(toolsettings, "use_proportional_fcurve", text="", icon_only=True) if toolsettings.use_proportional_ipo: row.prop(toolsettings, "proportional_edit_falloff", diff --git a/source/blender/editors/space_graph/graph_ops.c b/source/blender/editors/space_graph/graph_ops.c index 5ca7d156a1e..7032c98ada7 100644 --- a/source/blender/editors/space_graph/graph_ops.c +++ b/source/blender/editors/space_graph/graph_ops.c @@ -609,7 +609,7 @@ static void graphedit_keymap_keyframes(wmKeyConfig *keyconf, wmKeyMap *keymap) transform_keymap_for_space(keyconf, keymap, SPACE_IPO); kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle", OKEY, KM_PRESS, 0, 0); - RNA_string_set(kmi->ptr, "data_path", "tool_settings.use_proportional_ipo"); + RNA_string_set(kmi->ptr, "data_path", "tool_settings.use_proportional_fcurve"); /* pivot point settings */ kmi = WM_keymap_add_item(keymap, "WM_OT_context_set_enum", COMMAKEY, KM_PRESS, 0, 0); diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index ddd2df80d1a..be33dfd5e20 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -1939,7 +1939,7 @@ void saveTransform(bContext *C, TransInfo *t, wmOperator *op) !RNA_property_is_set(op->ptr, prop)) { if (t->spacetype == SPACE_IPO) - ts->proportional_ipo = proportional; + ts->proportional_fcurve = proportional; else if (t->spacetype == SPACE_ACTION) ts->proportional_action = proportional; else if (t->obedit) diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index b27f7c5ae12..243b54b04d5 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -1321,7 +1321,7 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve if (t->flag & T_MODAL) { if ((t->options & CTX_NO_PET) == 0) { if (t->spacetype == SPACE_IPO) { - t->flag |= initTransInfo_edit_pet_to_flag(ts->proportional_ipo); + t->flag |= initTransInfo_edit_pet_to_flag(ts->proportional_fcurve); } else if (t->spacetype == SPACE_ACTION) { t->flag |= initTransInfo_edit_pet_to_flag(ts->proportional_action); diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index ed63aefa4df..2f54dfa8116 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -1271,7 +1271,7 @@ typedef struct ToolSettings { char proportional_objects; /* proportional edit, object mode */ char proportional_mask; /* proportional edit, mask editing */ char proportional_action; /* proportional edit, action editor */ - char proportional_ipo; /* proportional edit, graph editor */ + char proportional_fcurve; /* proportional edit, graph editor */ char pad4[6]; char auto_normalize; /*auto normalizing mode in wpaint*/ diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 696f1b996d4..f93cdc5715d 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -2174,9 +2174,9 @@ static void rna_def_tool_settings(BlenderRNA *brna) RNA_def_property_ui_icon(prop, ICON_PROP_OFF, 1); RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, NULL); /* header redraw */ - prop = RNA_def_property(srna, "use_proportional_ipo", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_sdna(prop, NULL, "proportional_ipo", 0); - RNA_def_property_ui_text(prop, "Proportional Editing Ipo Curves", "Proportional editing in ipo editor"); + prop = RNA_def_property(srna, "use_proportional_fcurve", PROP_BOOLEAN, PROP_NONE); + RNA_def_property_boolean_sdna(prop, NULL, "proportional_fcurve", 0); + RNA_def_property_ui_text(prop, "Proportional Editing FCurves", "Proportional editing in FCurve editor"); RNA_def_property_ui_icon(prop, ICON_PROP_OFF, 1); RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, NULL); /* header redraw */ diff --git a/source/blender/windowmanager/intern/wm_stereo.c b/source/blender/windowmanager/intern/wm_stereo.c index 38f1cf68ac8..c619b2ed727 100644 --- a/source/blender/windowmanager/intern/wm_stereo.c +++ b/source/blender/windowmanager/intern/wm_stereo.c @@ -352,7 +352,7 @@ void wm_method_draw_stereo3d(const bContext *UNUSED(C), wmWindow *win) } } -static bool wm_stereo3d_quadbuffer_supported() +static bool wm_stereo3d_quadbuffer_supported(void) { int gl_stereo = 0; glGetBooleanv(GL_STEREO, (GLboolean *)&gl_stereo); |