Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/editors/include')
-rw-r--r--source/blender/editors/include/ED_keyframing.h2
-rw-r--r--source/blender/editors/include/UI_icons.h20
-rw-r--r--source/blender/editors/include/UI_interface.h2
3 files changed, 12 insertions, 12 deletions
diff --git a/source/blender/editors/include/ED_keyframing.h b/source/blender/editors/include/ED_keyframing.h
index 97a08845020..45a62ee7bcb 100644
--- a/source/blender/editors/include/ED_keyframing.h
+++ b/source/blender/editors/include/ED_keyframing.h
@@ -149,7 +149,7 @@ short ANIM_driver_can_paste(void);
/* Main Driver Management API calls:
* Add a new driver for the specified property on the given ID block
*/
-short ANIM_add_driver (struct ID *id, const char rna_path[], int array_index, short flag, int type);
+short ANIM_add_driver(struct ID *id, const char rna_path[], int array_index, short flag, int type);
/* Main Driver Management API calls:
* Remove the driver for the specified property on the given ID block (if available)
diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h
index f6de5138214..01c15a7d303 100644
--- a/source/blender/editors/include/UI_icons.h
+++ b/source/blender/editors/include/UI_icons.h
@@ -871,14 +871,14 @@ DEF_ICON(ICON_BLANK346b)
/* vector icons */
-DEF_ICON(VICON_VIEW3D)
-DEF_ICON(VICON_EDIT)
-DEF_ICON(VICON_EDITMODE_DEHLT)
-DEF_ICON(VICON_EDITMODE_HLT)
-DEF_ICON(VICON_DISCLOSURE_TRI_RIGHT)
-DEF_ICON(VICON_DISCLOSURE_TRI_DOWN)
-DEF_ICON(VICON_MOVE_UP)
-DEF_ICON(VICON_MOVE_DOWN)
-DEF_ICON(VICON_X)
-DEF_ICON(VICON_SMALL_TRI_RIGHT)
+DEF_ICON(VICO_VIEW3D_VEC)
+DEF_ICON(VICO_EDIT_VEC)
+DEF_ICON(VICO_EDITMODE_DEHLT)
+DEF_ICON(VICO_EDITMODE_HLT)
+DEF_ICON(VICO_DISCLOSURE_TRI_RIGHT_VEC)
+DEF_ICON(VICO_DISCLOSURE_TRI_DOWN_VEC)
+DEF_ICON(VICO_MOVE_UP_VEC)
+DEF_ICON(VICO_MOVE_DOWN_VEC)
+DEF_ICON(VICO_X_VEC)
+DEF_ICON(VICO_SMALL_TRI_RIGHT_VEC)
diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h
index aed1e5d5f0d..5febaa3e5a1 100644
--- a/source/blender/editors/include/UI_interface.h
+++ b/source/blender/editors/include/UI_interface.h
@@ -629,7 +629,7 @@ uiLayout *uiLayoutBox(uiLayout *layout);
uiLayout *uiLayoutListBox(uiLayout *layout, struct PointerRNA *ptr, struct PropertyRNA *prop,
struct PointerRNA *actptr, struct PropertyRNA *actprop);
uiLayout *uiLayoutAbsolute(uiLayout *layout, int align);
-uiLayout *uiLayoutSplit(uiLayout *layout, float percentage);
+uiLayout *uiLayoutSplit(uiLayout *layout, float percentage, int align);
uiLayout *uiLayoutOverlap(uiLayout *layout);
uiBlock *uiLayoutAbsoluteBlock(uiLayout *layout);