archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

rename _ipo -> _fcurve

Browse Source
This commit is contained in:
Campbell Barton
2015-04-10 13:41:57 +10:00
parent f2452bc9ab
commit 31d354dfa3
7 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/startup/bl_ui/space_graph.py
View File

@@ -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",

2
source/blender/editors/space_graph/graph_ops.c
View File

@@ -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);

2
source/blender/editors/transform/transform.c
View File

@@ -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)

2
source/blender/editors/transform/transform_generics.c
View File

@@ -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);

2
source/blender/makesdna/DNA_scene_types.h
View File

@@ -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*/

6
source/blender/makesrna/intern/rna_scene.c
View File

@@ -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 */

2
source/blender/windowmanager/intern/wm_stereo.c
View File

@@ -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);