diff options
Diffstat (limited to 'source/blender/makesrna/intern/rna_space.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_space.c | 280 |
1 files changed, 151 insertions, 129 deletions
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index d18ffd422e0..0592a524b76 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -1,6 +1,4 @@ /* - * ***** BEGIN GPL LICENSE BLOCK ***** - * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 @@ -14,14 +12,10 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * Contributor(s): Blender Foundation (2008) - * - * ***** END GPL LICENSE BLOCK ***** */ -/** \file blender/makesrna/intern/rna_space.c - * \ingroup RNA +/** \file + * \ingroup RNA */ #include <stdlib.h> @@ -81,7 +75,7 @@ const EnumPropertyItem rna_enum_space_type_items[] = { {0, "", ICON_NONE, "Animation", ""}, //{SPACE_ACTION, "TIMELINE", ICON_TIME, "Timeline", "Timeline and playback controls (NOTE: Switch to 'Timeline' mode)"}, /* XXX */ {SPACE_ACTION, "DOPESHEET_EDITOR", ICON_ACTION, "Dope Sheet", "Adjust timing of keyframes"}, - {SPACE_IPO, "GRAPH_EDITOR", ICON_GRAPH, "Graph Editor", "Edit drivers and keyframe interpolation"}, + {SPACE_GRAPH, "GRAPH_EDITOR", ICON_GRAPH, "Graph Editor", "Edit drivers and keyframe interpolation"}, {SPACE_NLA, "NLA_EDITOR", ICON_NLA, "Nonlinear Animation", "Combine and layer Actions"}, /* Scripting */ @@ -100,18 +94,18 @@ const EnumPropertyItem rna_enum_space_type_items[] = { /* Data */ {0, "", ICON_NONE, "Data", ""}, {SPACE_OUTLINER, "OUTLINER", ICON_OUTLINER, "Outliner", "Overview of scene graph and all available data-blocks"}, - {SPACE_BUTS, "PROPERTIES", ICON_PROPERTIES, "Properties", "Edit properties of active object and related data-blocks"}, + {SPACE_PROPERTIES, "PROPERTIES", ICON_PROPERTIES, "Properties", "Edit properties of active object and related data-blocks"}, {SPACE_FILE, "FILE_BROWSER", ICON_FILEBROWSER, "File Browser", "Browse for files and assets"}, {SPACE_USERPREF, "PREFERENCES", ICON_PREFERENCES, "Preferences", "Edit persistent configuration settings"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; const EnumPropertyItem rna_enum_space_graph_mode_items[] = { {SIPO_MODE_ANIMATION, "FCURVES", ICON_GRAPH, "Graph Editor", "Edit animation/keyframes displayed as 2D curves"}, {SIPO_MODE_DRIVERS, "DRIVERS", ICON_DRIVER, "Drivers", "Edit drivers"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #define SACT_ITEM_DOPESHEET \ @@ -139,7 +133,7 @@ static EnumPropertyItem rna_enum_space_action_mode_all_items[] = { SACT_ITEM_GPENCIL, SACT_ITEM_MASK, SACT_ITEM_CACHEFILE, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static EnumPropertyItem rna_enum_space_action_ui_mode_items[] = { SACT_ITEM_DOPESHEET, @@ -149,14 +143,14 @@ static EnumPropertyItem rna_enum_space_action_ui_mode_items[] = { SACT_ITEM_GPENCIL, SACT_ITEM_MASK, SACT_ITEM_CACHEFILE, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #endif /* expose as ui_mode */ const EnumPropertyItem rna_enum_space_action_mode_items[] = { SACT_ITEM_DOPESHEET, SACT_ITEM_TIMELINE, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #undef SACT_ITEM_DOPESHEET @@ -182,20 +176,20 @@ const EnumPropertyItem rna_enum_space_image_mode_all_items[] = { SI_ITEM_UV, SI_ITEM_PAINT, SI_ITEM_MASK, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem rna_enum_space_image_mode_ui_items[] = { SI_ITEM_VIEW("View", ICON_FILE_IMAGE), SI_ITEM_PAINT, SI_ITEM_MASK, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; const EnumPropertyItem rna_enum_space_image_mode_items[] = { SI_ITEM_VIEW("Image Editor", ICON_IMAGE), SI_ITEM_UV, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #undef SI_ITEM_VIEW @@ -214,14 +208,14 @@ static const EnumPropertyItem stereo3d_camera_items[] = { V3D_S3D_CAMERA_LEFT V3D_S3D_CAMERA_RIGHT V3D_S3D_CAMERA_S3D - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #ifdef RNA_RUNTIME static const EnumPropertyItem multiview_camera_items[] = { V3D_S3D_CAMERA_VIEWS V3D_S3D_CAMERA_S3D - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #endif @@ -234,7 +228,7 @@ static const EnumPropertyItem multiview_camera_items[] = { static const EnumPropertyItem stereo3d_eye_items[] = { {STEREO_LEFT_ID, "LEFT_EYE", ICON_NONE, "Left Eye"}, {STEREO_RIGHT_ID, "RIGHT_EYE", ICON_NONE, "Right Eye"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #endif @@ -248,7 +242,7 @@ static const EnumPropertyItem display_channels_items[] = { {SI_SHOW_R, "RED", ICON_COLOR_RED, "Red", ""}, {SI_SHOW_G, "GREEN", ICON_COLOR_GREEN, "Green", ""}, {SI_SHOW_B, "BLUE", ICON_COLOR_BLUE, "Blue", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #ifndef RNA_RUNTIME @@ -262,7 +256,7 @@ static const EnumPropertyItem autosnap_items[] = { {SACTSNAP_SECOND, "SECOND", 0, "Nearest Second", "Snap to actual seconds (nla-action time)"}, /* {-1, "", 0, "", ""}, */ {SACTSNAP_MARKER, "MARKER", 0, "Nearest Marker", "Snap to nearest marker"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #endif @@ -271,14 +265,14 @@ const EnumPropertyItem rna_enum_shading_type_items[] = { {OB_SOLID, "SOLID", ICON_SHADING_SOLID, "Solid", "Display in solid mode"}, {OB_MATERIAL, "MATERIAL", ICON_SHADING_TEXTURE, "LookDev", "Display in LookDev mode"}, {OB_RENDER, "RENDERED", ICON_SHADING_RENDERED, "Rendered", "Display render preview"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem rna_enum_viewport_lighting_items[] = { {V3D_LIGHTING_FLAT, "FLAT", 0, "Flat", "Display using flat lighting"}, {V3D_LIGHTING_STUDIO, "STUDIO", 0, "Studio", "Display using studio lighting"}, {V3D_LIGHTING_MATCAP, "MATCAP", 0, "MatCap", "Display using matcap material and lighting"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem rna_enum_shading_color_type_items[] = { @@ -287,19 +281,19 @@ static const EnumPropertyItem rna_enum_shading_color_type_items[] = { {V3D_SHADING_OBJECT_COLOR, "OBJECT", 0, "Object", "Show object color"}, {V3D_SHADING_RANDOM_COLOR, "RANDOM", 0, "Random", "Show random object color"}, {V3D_SHADING_TEXTURE_COLOR, "TEXTURE", 0, "Texture", "Show texture"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem rna_enum_studio_light_items[] = { {0, "DEFAULT", 0, "Default", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; const EnumPropertyItem rna_enum_clip_editor_mode_items[] = { {SC_MODE_TRACKING, "TRACKING", ICON_ANIM_DATA, "Tracking", "Show tracking and solving tools"}, {SC_MODE_MASKEDIT, "MASK", ICON_MOD_MASK, "Mask", "Show mask editing tools"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; /* Actually populated dynamically trough a function, but helps for context-less access (e.g. doc, i18n...). */ @@ -321,7 +315,7 @@ static const EnumPropertyItem buttons_context_items[] = { {BCONTEXT_PARTICLE, "PARTICLES", ICON_PARTICLES, "Particles", "Particles"}, {BCONTEXT_PHYSICS, "PHYSICS", ICON_PHYSICS, "Physics", "Physics"}, {BCONTEXT_SHADERFX, "SHADERFX", ICON_SHADERFX, "Effects", "Object visual effects" }, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem fileselectparams_recursion_level_items[] = { @@ -330,7 +324,7 @@ static const EnumPropertyItem fileselectparams_recursion_level_items[] = { {2, "ALL_1", 0, "One Level", "List all sub-directories' content, one level of recursion"}, {3, "ALL_2", 0, "Two Levels", "List all sub-directories' content, two levels of recursion"}, {4, "ALL_3", 0, "Three Levels", "List all sub-directories' content, three levels of recursion"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; const EnumPropertyItem rna_enum_file_sort_items[] = { @@ -338,7 +332,7 @@ const EnumPropertyItem rna_enum_file_sort_items[] = { {FILE_SORT_EXTENSION, "FILE_SORT_EXTENSION", ICON_SORTBYEXT, "Sort by extension", "Sort the file list by extension/type"}, {FILE_SORT_TIME, "FILE_SORT_TIME", ICON_SORTTIME, "Sort by time", "Sort files by modification time"}, {FILE_SORT_SIZE, "FILE_SORT_SIZE", ICON_SORTSIZE, "Sort by size", "Sort files by size"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #ifdef RNA_RUNTIME @@ -392,11 +386,11 @@ static StructRNA *rna_Space_refine(struct PointerRNA *ptr) switch (space->spacetype) { case SPACE_VIEW3D: return &RNA_SpaceView3D; - case SPACE_IPO: + case SPACE_GRAPH: return &RNA_SpaceGraphEditor; case SPACE_OUTLINER: return &RNA_SpaceOutliner; - case SPACE_BUTS: + case SPACE_PROPERTIES: return &RNA_SpaceProperties; case SPACE_FILE: return &RNA_SpaceFileBrowser; @@ -511,7 +505,7 @@ static void rna_Space_view2d_sync_update(Main *UNUSED(bmain), Scene *UNUSED(scen static void rna_GPencil_update(Main *bmain, Scene *UNUSED(scene), PointerRNA *UNUSED(ptr)) { /* need set all caches as dirty to recalculate onion skinning */ - for (Object *ob = bmain->object.first; ob; ob = ob->id.next) { + for (Object *ob = bmain->objects.first; ob; ob = ob->id.next) { if (ob->type == OB_GPENCIL) { DEG_id_tag_update(&ob->id, ID_RECALC_GEOMETRY); } @@ -531,31 +525,15 @@ static void rna_SpaceView3D_camera_update(Main *bmain, Scene *scene, PointerRNA } } -static void rna_SpaceView3D_lock_camera_and_layers_set(PointerRNA *ptr, bool value) +static void rna_SpaceView3D_use_local_camera_set(PointerRNA *ptr, bool value) { View3D *v3d = (View3D *)(ptr->data); bScreen *sc = (bScreen *)ptr->id.data; - v3d->scenelock = value; + v3d->scenelock = !value; - if (value) { + if (!value) { Scene *scene = ED_screen_scene_find(sc, G_MAIN->wm.first); - - /* TODO: restore local view. */ -#if 0 - int bit; - v3d->lay = scene->lay; - - /* seek for layact */ - bit = 0; - while (bit < 32) { - if (v3d->lay & (1u << bit)) { - v3d->layact = (1u << bit); - break; - } - bit++; - } -#endif v3d->camera = scene->camera; } } @@ -672,7 +650,7 @@ static void rna_3DViewShading_type_update(Main *bmain, Scene *UNUSED(scene), Poi return; } - for (Material *ma = bmain->mat.first; ma; ma = ma->id.next) { + for (Material *ma = bmain->materials.first; ma; ma = ma->id.next) { /* XXX Dependency graph does not support CD mask tracking, * so we trigger materials shading for until it's properly supported. * This is to ensure material batches are all recreated when switching @@ -826,6 +804,11 @@ static const EnumPropertyItem *rna_View3DShading_color_type_itemf( RNA_enum_items_add_value(&item, &totitem, rna_enum_shading_color_type_items, V3D_SHADING_TEXTURE_COLOR); } } + else if (shading->type == OB_WIRE) { + RNA_enum_items_add_value(&item, &totitem, rna_enum_shading_color_type_items, V3D_SHADING_SINGLE_COLOR); + RNA_enum_items_add_value(&item, &totitem, rna_enum_shading_color_type_items, V3D_SHADING_OBJECT_COLOR); + RNA_enum_items_add_value(&item, &totitem, rna_enum_shading_color_type_items, V3D_SHADING_RANDOM_COLOR); + } RNA_enum_item_end(&item, &totitem); *r_free = true; @@ -1048,13 +1031,12 @@ static void rna_SpaceImageEditor_image_set(PointerRNA *ptr, PointerRNA value) { SpaceImage *sima = (SpaceImage *)(ptr->data); bScreen *sc = (bScreen *)ptr->id.data; - wmWindow *win; - Scene *scene = ED_screen_scene_find_with_window(sc, G_MAIN->wm.first, &win); + wmWindow *win = ED_screen_window_find(sc, G_MAIN->wm.first); ViewLayer *view_layer = WM_window_get_active_view_layer(win); Object *obedit = OBEDIT_FROM_VIEW_LAYER(view_layer); BLI_assert(BKE_id_is_in_global_main(value.data)); - ED_space_image_set(G_MAIN, sima, scene, obedit, (Image *)value.data); + ED_space_image_set(G_MAIN, sima, obedit, (Image *)value.data); } static void rna_SpaceImageEditor_mask_set(PointerRNA *ptr, PointerRNA value) @@ -1197,7 +1179,7 @@ static const EnumPropertyItem *rna_SpaceImageEditor_pivot_itemf( {V3D_AROUND_CURSOR, "CURSOR", ICON_PIVOT_CURSOR, "2D Cursor", ""}, {V3D_AROUND_LOCAL_ORIGINS, "INDIVIDUAL_ORIGINS", ICON_PIVOT_INDIVIDUAL, "Individual Origins", "Pivot around each selected island's own median point"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; SpaceImage *sima = (SpaceImage *)ptr->data; @@ -1240,13 +1222,13 @@ static void rna_SpaceTextEditor_updateEdited(Main *UNUSED(bmain), Scene *UNUSED( /* note: this function exists only to avoid id refcounting */ static void rna_SpaceProperties_pin_id_set(PointerRNA *ptr, PointerRNA value) { - SpaceButs *sbuts = (SpaceButs *)(ptr->data); + SpaceProperties *sbuts = (SpaceProperties *)(ptr->data); sbuts->pinid = value.data; } static StructRNA *rna_SpaceProperties_pin_id_typef(PointerRNA *ptr) { - SpaceButs *sbuts = (SpaceButs *)(ptr->data); + SpaceProperties *sbuts = (SpaceProperties *)(ptr->data); if (sbuts->pinid) return ID_code_to_RNA_type(GS(sbuts->pinid->name)); @@ -1256,7 +1238,7 @@ static StructRNA *rna_SpaceProperties_pin_id_typef(PointerRNA *ptr) static void rna_SpaceProperties_pin_id_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr) { - SpaceButs *sbuts = (SpaceButs *)(ptr->data); + SpaceProperties *sbuts = (SpaceProperties *)(ptr->data); ID *id = sbuts->pinid; if (id == NULL) { @@ -1285,7 +1267,7 @@ static void rna_SpaceProperties_pin_id_update(Main *UNUSED(bmain), Scene *UNUSED static void rna_SpaceProperties_context_set(PointerRNA *ptr, int value) { - SpaceButs *sbuts = (SpaceButs *)(ptr->data); + SpaceProperties *sbuts = (SpaceProperties *)(ptr->data); sbuts->mainb = value; sbuts->mainbuser = value; @@ -1295,7 +1277,7 @@ static const EnumPropertyItem *rna_SpaceProperties_context_itemf( bContext *UNUSED(C), PointerRNA *ptr, PropertyRNA *UNUSED(prop), bool *r_free) { - SpaceButs *sbuts = (SpaceButs *)(ptr->data); + SpaceProperties *sbuts = (SpaceProperties *)(ptr->data); EnumPropertyItem *item = NULL; int totitem = 0; @@ -1384,7 +1366,7 @@ static const EnumPropertyItem *rna_SpaceProperties_context_itemf( static void rna_SpaceProperties_context_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr) { - SpaceButs *sbuts = (SpaceButs *)(ptr->data); + SpaceProperties *sbuts = (SpaceProperties *)(ptr->data); /* XXX BCONTEXT_DATA is ugly, but required for lights... See T51318. */ if (ELEM(sbuts->mainb, BCONTEXT_WORLD, BCONTEXT_MATERIAL, BCONTEXT_TEXTURE, BCONTEXT_DATA)) { sbuts->preview = 1; @@ -1532,7 +1514,7 @@ static void rna_SpaceDopeSheetEditor_action_update(bContext *C, PointerRNA *ptr) } /* Force update of animdata */ - adt->recalc |= ADT_RECALC_ANIM; + DEG_id_tag_update(&obact->id, ID_RECALC_ANIMATION); } /* force depsgraph flush too */ @@ -1608,7 +1590,7 @@ static void rna_SpaceDopeSheetEditor_mode_update(bContext *C, PointerRNA *ptr) static void rna_SpaceGraphEditor_display_mode_update(bContext *C, PointerRNA *ptr) { ScrArea *sa = rna_area_from_space(ptr); - SpaceIpo *sipo = (SpaceIpo *)ptr->data; + SpaceGraph *sipo = (SpaceGraph *)ptr->data; /* for "Drivers" mode, enable all the necessary bits and pieces */ if (sipo->mode == SIPO_MODE_DRIVERS) { @@ -1624,7 +1606,7 @@ static void rna_SpaceGraphEditor_display_mode_update(bContext *C, PointerRNA *pt static bool rna_SpaceGraphEditor_has_ghost_curves_get(PointerRNA *ptr) { - SpaceIpo *sipo = (SpaceIpo *)(ptr->data); + SpaceGraph *sipo = (SpaceGraph *)(ptr->data); return (BLI_listbase_is_empty(&sipo->runtime.ghost_curves) == false); } @@ -2105,7 +2087,7 @@ static const EnumPropertyItem dt_uv_items[] = { {SI_UVDT_DASH, "DASH", 0, "Dash", "Display dashed black-white edges"}, {SI_UVDT_BLACK, "BLACK", 0, "Black", "Display black edges"}, {SI_UVDT_WHITE, "WHITE", 0, "White", "Display white edges"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static void rna_def_space(BlenderRNA *brna) @@ -2140,7 +2122,7 @@ static void rna_def_space_mask_info(StructRNA *srna, int noteflag, const char *m static const EnumPropertyItem overlay_mode_items[] = { {MASK_OVERLAY_ALPHACHANNEL, "ALPHACHANNEL", ICON_NONE, "Alpha Channel", "Show alpha channel of the mask"}, {MASK_OVERLAY_COMBINED, "COMBINED", ICON_NONE, "Combined", "Combine space background image with the mask"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; prop = RNA_def_property(srna, "mask", PROP_POINTER, PROP_NONE); @@ -2185,13 +2167,20 @@ static void rna_def_space_image_uv(BlenderRNA *brna) "Select UVs that are at the same location and share a mesh vertex"}, {SI_STICKY_VERTEX, "SHARED_VERTEX", ICON_STICKY_UVS_VERT, "Shared Vertex", "Select UVs that share mesh vertex, irrespective if they are in the same location"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem dt_uvstretch_items[] = { {SI_UVDT_STRETCH_ANGLE, "ANGLE", 0, "Angle", "Angular distortion between UV and 3D angles"}, {SI_UVDT_STRETCH_AREA, "AREA", 0, "Area", "Area distortion between UV and 3D faces"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, + }; + + static const EnumPropertyItem pixel_snap_mode_items[] = { + {SI_PIXEL_SNAP_DISABLED, "DISABLED", 0, "Disabled", "Don't snap to pixels"}, + {SI_PIXEL_SNAP_CORNER, "CORNER", 0, "Corner", "Snap to pixel corners"}, + {SI_PIXEL_SNAP_CENTER, "CENTER", 0, "Center", "Snap to pixel centers"}, + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "SpaceUVEditor", NULL); @@ -2265,9 +2254,9 @@ static void rna_def_space_image_uv(BlenderRNA *brna) /* todo: move edge and face drawing options here from G.f */ - prop = RNA_def_property(srna, "use_snap_to_pixels", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_sdna(prop, NULL, "flag", SI_PIXELSNAP); - RNA_def_property_ui_text(prop, "Snap to Pixels", "Snap UVs to pixel locations while editing"); + prop = RNA_def_property(srna, "pixel_snap_mode", PROP_ENUM, PROP_NONE); + RNA_def_property_enum_items(prop, pixel_snap_mode_items); + RNA_def_property_ui_text(prop, "Snap to Pixels", "Snap UVs to pixels while editing"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_IMAGE, NULL); prop = RNA_def_property(srna, "lock_bounds", PROP_BOOLEAN, PROP_NONE); @@ -2296,7 +2285,7 @@ static void rna_def_space_outliner(BlenderRNA *brna) {SO_DATA_API, "DATA_API", ICON_RNA, "Data API", "Display low level Blender data and its properties"}, {SO_ID_ORPHANS, "ORPHAN_DATA", ICON_ORPHAN_DATA, "Orphan Data", "Display data-blocks which are unused and/or will be lost when the file is reloaded"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem filter_state_items[] = { @@ -2304,11 +2293,11 @@ static void rna_def_space_outliner(BlenderRNA *brna) {SO_FILTER_OB_VISIBLE, "VISIBLE", 0, "Visible", "Show visible objects"}, {SO_FILTER_OB_SELECTED, "SELECTED", 0, "Selected", "Show selected objects"}, {SO_FILTER_OB_ACTIVE, "ACTIVE", 0, "Active", "Show only the active object"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "SpaceOutliner", "Space"); - RNA_def_struct_sdna(srna, "SpaceOops"); + RNA_def_struct_sdna(srna, "SpaceOutliner"); RNA_def_struct_ui_text(srna, "Space Outliner", "Outliner space data"); prop = RNA_def_property(srna, "display_mode", PROP_ENUM, PROP_NONE); @@ -2415,6 +2404,7 @@ static void rna_def_space_outliner(BlenderRNA *brna) RNA_def_property_enum_sdna(prop, NULL, "filter_id_type"); RNA_def_property_enum_items(prop, rna_enum_id_type_items); RNA_def_property_ui_text(prop, "Filter ID Type", "Data-block type to show"); + RNA_def_property_translation_context(prop, BLT_I18NCONTEXT_ID_ID); } static void rna_def_space_view3d_shading(BlenderRNA *brna) @@ -2426,7 +2416,7 @@ static void rna_def_space_view3d_shading(BlenderRNA *brna) {V3D_SHADING_BACKGROUND_THEME, "THEME", 0, "Theme", "Use the theme for background color"}, {V3D_SHADING_BACKGROUND_WORLD, "WORLD", 0, "World", "Use the world for background color"}, {V3D_SHADING_BACKGROUND_VIEWPORT, "VIEWPORT", 0, "Viewport", "Use a custom color limited to this viewport only"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const float default_background_color[] = {0.05f, 0.05f, 0.05f}; @@ -2434,7 +2424,7 @@ static void rna_def_space_view3d_shading(BlenderRNA *brna) {V3D_SHADING_CAVITY_SSAO, "WORLD", 0, "World", "Cavity shading computed in world space, useful for larger-scale occlusion"}, {V3D_SHADING_CAVITY_CURVATURE, "SCREEN", 0, "Screen", "Curvature-based shading, useful for making fine details more visible"}, {V3D_SHADING_CAVITY_BOTH, "BOTH", 0, "Both", "Use both effects simultaneously"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; @@ -2550,6 +2540,13 @@ static void rna_def_space_view3d_shading(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Color", "Color Type"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL); + prop = RNA_def_property(srna, "wireframe_color_type", PROP_ENUM, PROP_NONE); + RNA_def_property_enum_sdna(prop, NULL, "wire_color_type"); + RNA_def_property_enum_items(prop, rna_enum_shading_color_type_items); + RNA_def_property_enum_funcs(prop, NULL, NULL, "rna_View3DShading_color_type_itemf"); + RNA_def_property_ui_text(prop, "Color", "Color Type"); + RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL); + prop = RNA_def_property(srna, "single_color", PROP_FLOAT, PROP_COLOR); RNA_def_property_float_sdna(prop, NULL, "single_color"); RNA_def_property_array(prop, 3); @@ -2603,6 +2600,12 @@ static void rna_def_space_view3d_shading(BlenderRNA *brna) RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL); + prop = RNA_def_property(srna, "use_dof", PROP_BOOLEAN, PROP_NONE); + RNA_def_property_boolean_sdna(prop, NULL, "flag", V3D_SHADING_DEPTH_OF_FIELD); + RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); + RNA_def_property_ui_text(prop, "Depth Of Field", "Use depth of field on viewport using the values from the active camera"); + RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL); + prop = RNA_def_property(srna, "use_scene_lights", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", V3D_SHADING_SCENE_LIGHTS); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); @@ -2659,7 +2662,7 @@ static void rna_def_space_view3d_overlay(BlenderRNA *brna) RNA_def_struct_ui_text(srna, "3D View Overlay Settings", "Settings for display of overlays in the 3D viewport"); prop = RNA_def_property(srna, "show_overlays", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_negative_sdna(prop, NULL, "flag2", V3D_RENDER_OVERRIDE); + RNA_def_property_boolean_negative_sdna(prop, NULL, "flag2", V3D_HIDE_OVERLAYS); RNA_def_property_ui_text(prop, "Show Overlays", "Display overlays like gizmos and outlines"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, "rna_GPencil_update"); @@ -2853,7 +2856,8 @@ static void rna_def_space_view3d_overlay(BlenderRNA *brna) prop = RNA_def_property(srna, "show_face_center", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "overlay.edit_flag", V3D_OVERLAY_EDIT_FACE_DOT); - RNA_def_property_ui_text(prop, "Draw Face Center", "Display face center"); + RNA_def_property_ui_text(prop, "Draw Face Center", "Display face center " + "(when disabled, edges display wider in edge mode)"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL); prop = RNA_def_property(srna, "show_edge_crease", PROP_BOOLEAN, PROP_NONE); @@ -2946,11 +2950,6 @@ static void rna_def_space_view3d_overlay(BlenderRNA *brna) RNA_def_property_range(prop, 0.0f, 1.0f); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL); - prop = RNA_def_property(srna, "show_transparent_bones", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_sdna(prop, NULL, "overlay.arm_flag", V3D_OVERLAY_ARM_TRANSP_BONES); - RNA_def_property_ui_text(prop, "Transparent Bones", "Display bones as transparent"); - RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL); - prop = RNA_def_property(srna, "texture_paint_mode_opacity", PROP_FLOAT, PROP_FACTOR); RNA_def_property_float_sdna(prop, NULL, "overlay.texture_paint_mode_opacity"); RNA_def_property_float_default(prop, 1.0f); @@ -3057,7 +3056,7 @@ static void rna_def_space_view3d(BlenderRNA *brna) {RV3D_PERSP, "PERSP", 0, "Perspective", ""}, {RV3D_ORTHO, "ORTHO", 0, "Orthographic", ""}, {RV3D_CAMOB, "CAMERA", 0, "Camera", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem bundle_drawtype_items[] = { @@ -3068,7 +3067,7 @@ static void rna_def_space_view3d(BlenderRNA *brna) {OB_CUBE, "CUBE", 0, "Cube", ""}, {OB_EMPTY_SPHERE, "SPHERE", 0, "Sphere", ""}, {OB_EMPTY_CONE, "CONE", 0, "Cone", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "SpaceView3D", "Space"); @@ -3086,32 +3085,32 @@ static void rna_def_space_view3d(BlenderRNA *brna) prop = RNA_def_property(srna, "use_render_border", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag2", V3D_RENDER_BORDER); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); - RNA_def_property_ui_text(prop, "Render Border", "Use a region within the frame size for rendered viewport " + RNA_def_property_ui_text(prop, "Render Region", "Use a region within the frame size for rendered viewport" "(when not viewing through the camera)"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL); prop = RNA_def_property(srna, "render_border_min_x", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "render_border.xmin"); RNA_def_property_range(prop, 0.0f, 1.0f); - RNA_def_property_ui_text(prop, "Border Minimum X", "Minimum X value for the render border"); + RNA_def_property_ui_text(prop, "Region Minimum X", "Minimum X value for the render region"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL); prop = RNA_def_property(srna, "render_border_min_y", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "render_border.ymin"); RNA_def_property_range(prop, 0.0f, 1.0f); - RNA_def_property_ui_text(prop, "Border Minimum Y", "Minimum Y value for the render border"); + RNA_def_property_ui_text(prop, "Region Minimum Y", "Minimum Y value for the render region"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL); prop = RNA_def_property(srna, "render_border_max_x", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "render_border.xmax"); RNA_def_property_range(prop, 0.0f, 1.0f); - RNA_def_property_ui_text(prop, "Border Maximum X", "Maximum X value for the render border"); + RNA_def_property_ui_text(prop, "Region Maximum X", "Maximum X value for the render region"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL); prop = RNA_def_property(srna, "render_border_max_y", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "render_border.ymax"); RNA_def_property_range(prop, 0.0f, 1.0f); - RNA_def_property_ui_text(prop, "Border Maximum Y", "Maximum Y value for the render border"); + RNA_def_property_ui_text(prop, "Region Maximum Y", "Maximum Y value for the render region"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL); prop = RNA_def_property(srna, "lock_object", PROP_POINTER, PROP_NONE); @@ -3142,7 +3141,6 @@ static void rna_def_space_view3d(BlenderRNA *brna) RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL); prop = RNA_def_property(srna, "clip_start", PROP_FLOAT, PROP_DISTANCE); - RNA_def_property_float_sdna(prop, NULL, "near"); RNA_def_property_range(prop, 1e-6f, FLT_MAX); RNA_def_property_ui_range(prop, 0.001f, FLT_MAX, 10, 3); RNA_def_property_float_default(prop, 0.1f); @@ -3150,7 +3148,6 @@ static void rna_def_space_view3d(BlenderRNA *brna) RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL); prop = RNA_def_property(srna, "clip_end", PROP_FLOAT, PROP_DISTANCE); - RNA_def_property_float_sdna(prop, NULL, "far"); RNA_def_property_range(prop, 1e-6f, FLT_MAX); RNA_def_property_ui_range(prop, 0.001f, FLT_MAX, 10, 3); RNA_def_property_float_default(prop, 1000.0f); @@ -3182,12 +3179,11 @@ static void rna_def_space_view3d(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Tool Gizmo", "Active tool gizmo"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL); - prop = RNA_def_property(srna, "lock_camera_and_layers", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_sdna(prop, NULL, "scenelock", 1); - RNA_def_property_boolean_funcs(prop, NULL, "rna_SpaceView3D_lock_camera_and_layers_set"); - RNA_def_property_ui_text(prop, "Lock Camera and Layers", - "Use the scene's active camera and layers in this view, rather than local layers"); - RNA_def_property_ui_icon(prop, ICON_LOCKVIEW_OFF, 1); + prop = RNA_def_property(srna, "use_local_camera", PROP_BOOLEAN, PROP_NONE); + RNA_def_property_boolean_negative_sdna(prop, NULL, "scenelock", 1); + RNA_def_property_boolean_funcs(prop, NULL, "rna_SpaceView3D_use_local_camera_set"); + RNA_def_property_ui_text(prop, "Use Local Camera", + "Use a local camera in this view, rather than scene's active camera camera"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL); prop = RNA_def_property(srna, "region_3d", PROP_POINTER, PROP_NONE); @@ -3319,7 +3315,7 @@ static void rna_def_space_view3d(BlenderRNA *brna) RNA_def_property_boolean_negative_sdna( prop, NULL, view_mask_member[mask_index], info[type_index].type_mask); RNA_def_property_ui_text(prop, info[type_index].name, ""); - RNA_def_property_update(prop, NC_SPACE | ND_SPACE_SEQUENCER, NULL); + RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL); } } @@ -3460,7 +3456,7 @@ static void rna_def_space_buttons(BlenderRNA *brna) PropertyRNA *prop; srna = RNA_def_struct(brna, "SpaceProperties", "Space"); - RNA_def_struct_sdna(srna, "SpaceButs"); + RNA_def_struct_sdna(srna, "SpaceProperties"); RNA_def_struct_ui_text(srna, "Properties Space", "Properties space data"); prop = RNA_def_property(srna, "context", PROP_ENUM, PROP_NONE); @@ -3644,7 +3640,7 @@ static void rna_def_space_sequencer(BlenderRNA *brna) {SEQ_VIEW_SEQUENCE, "SEQUENCER", ICON_SEQ_SEQUENCER, "Sequencer", ""}, {SEQ_VIEW_PREVIEW, "PREVIEW", ICON_SEQ_PREVIEW, "Preview", ""}, {SEQ_VIEW_SEQUENCE_PREVIEW, "SEQUENCER_PREVIEW", ICON_SEQ_SPLITVIEW, "Sequencer/Preview", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem display_mode_items[] = { @@ -3652,7 +3648,7 @@ static void rna_def_space_sequencer(BlenderRNA *brna) {SEQ_DRAW_IMG_WAVEFORM, "WAVEFORM", ICON_SEQ_LUMA_WAVEFORM, "Luma Waveform", ""}, {SEQ_DRAW_IMG_VECTORSCOPE, "VECTOR_SCOPE", ICON_SEQ_CHROMA_SCOPE, "Chroma Vectorscope", ""}, {SEQ_DRAW_IMG_HISTOGRAM, "HISTOGRAM", ICON_SEQ_HISTOGRAM, "Histogram", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem proxy_render_size_items[] = { @@ -3663,21 +3659,21 @@ static void rna_def_space_sequencer(BlenderRNA *brna) {SEQ_PROXY_RENDER_SIZE_75, "PROXY_75", 0, "Proxy size 75%", ""}, {SEQ_PROXY_RENDER_SIZE_100, "PROXY_100", 0, "Proxy size 100%", ""}, {SEQ_PROXY_RENDER_SIZE_FULL, "FULL", 0, "No proxy, full render", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem overlay_type_items[] = { {SEQ_DRAW_OVERLAY_RECT, "RECTANGLE", 0, "Rectangle", "Show rectangle area overlay"}, {SEQ_DRAW_OVERLAY_REFERENCE, "REFERENCE", 0, "Reference", "Show reference frame only"}, {SEQ_DRAW_OVERLAY_CURRENT, "CURRENT", 0, "Current", "Show current frame only"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem preview_channels_items[] = { {SEQ_USE_ALPHA, "COLOR_ALPHA", ICON_IMAGE_RGB_ALPHA, "Color and Alpha", "Display image with RGB colors and alpha transparency"}, {0, "COLOR", ICON_IMAGE_RGB, "Color", "Display image with RGB colors"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem waveform_type_display_items[] = { @@ -3687,7 +3683,7 @@ static void rna_def_space_sequencer(BlenderRNA *brna) "Waveforms drawn for all sound strips"}, {0, "DEFAULT_WAVEFORMS", 0, "Use Strip Option", "Waveforms drawn according to strip setting"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "SpaceSequenceEditor", "Space"); @@ -3741,7 +3737,7 @@ static void rna_def_space_sequencer(BlenderRNA *brna) RNA_def_property_update(prop, NC_SPACE | ND_SPACE_SEQUENCER, NULL); prop = RNA_def_property(srna, "show_metadata", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_sdna(prop, NULL, "flag", SEQ_SHOW_METADATA); + RNA_def_property_boolean_sdna(prop, NULL, "flag", SEQ_SHOW_METADATA); RNA_def_property_ui_text(prop, "Show Metadata", "Show metadata of first visible strip"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_SEQUENCER, NULL); @@ -3750,6 +3746,12 @@ static void rna_def_space_sequencer(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Show Seconds", "Show timing in seconds not frames"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_SEQUENCER, NULL); + prop = RNA_def_property(srna, "show_marker_lines", PROP_BOOLEAN, PROP_NONE); + RNA_def_property_boolean_sdna(prop, NULL, "flag", SEQ_SHOW_MARKER_LINES); + RNA_def_property_ui_text(prop, "Show Marker Lines", + "Show a vertical line for every marker"); + RNA_def_property_update(prop, NC_SPACE | ND_SPACE_SEQUENCER, NULL); + prop = RNA_def_property(srna, "show_annotation", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SEQ_SHOW_GPENCIL); RNA_def_property_ui_text(prop, "Show Annotation", @@ -4005,6 +4007,12 @@ static void rna_def_space_dopesheet(BlenderRNA *brna) "Mark keyframes where the key value flow changes direction, based on comparison with adjacent keys"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_DOPESHEET, NULL); + prop = RNA_def_property(srna, "show_marker_lines", PROP_BOOLEAN, PROP_NONE); + RNA_def_property_boolean_sdna(prop, NULL, "flag", SACTION_SHOW_MARKER_LINES); + RNA_def_property_ui_text(prop, "Show Marker Lines", + "Show a vertical line for every marker"); + RNA_def_property_update(prop, NC_SPACE | ND_SPACE_GRAPH, NULL); + /* editing */ prop = RNA_def_property(srna, "use_auto_merge_keyframes", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", SACTION_NOTRANSKEYCULL); @@ -4083,12 +4091,12 @@ static void rna_def_space_graph(BlenderRNA *brna) {V3D_AROUND_LOCAL_ORIGINS, "INDIVIDUAL_ORIGINS", ICON_PIVOT_INDIVIDUAL, "Individual Centers", ""}, /*{V3D_AROUND_CENTER_MEDIAN, "MEDIAN_POINT", 0, "Median Point", ""}, */ /*{V3D_AROUND_ACTIVE, "ACTIVE_ELEMENT", 0, "Active Element", ""}, */ - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "SpaceGraphEditor", "Space"); - RNA_def_struct_sdna(srna, "SpaceIpo"); + RNA_def_struct_sdna(srna, "SpaceGraph"); RNA_def_struct_ui_text(srna, "Space Graph Editor", "Graph Editor space data"); /* mode */ @@ -4146,6 +4154,12 @@ static void rna_def_space_graph(BlenderRNA *brna) "Display groups and channels with colors matching their corresponding groups"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_GRAPH, NULL); + prop = RNA_def_property(srna, "show_marker_lines", PROP_BOOLEAN, PROP_NONE); + RNA_def_property_boolean_sdna(prop, NULL, "flag", SIPO_MARKER_LINES); + RNA_def_property_ui_text(prop, "Show Marker Lines", + "Show a vertical line for every marker"); + RNA_def_property_update(prop, NC_SPACE | ND_SPACE_GRAPH, NULL); + /* editing */ prop = RNA_def_property(srna, "use_auto_merge_keyframes", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", SIPO_NOTRANSKEYCULL); @@ -4245,6 +4259,12 @@ static void rna_def_space_nla(BlenderRNA *brna) "Show action-local markers on the strips, useful when synchronizing timing across strips"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_NLA, NULL); + prop = RNA_def_property(srna, "show_marker_lines", PROP_BOOLEAN, PROP_NONE); + RNA_def_property_boolean_sdna(prop, NULL, "flag", SNLA_SHOW_MARKER_LINES); + RNA_def_property_ui_text(prop, "Show Marker Lines", + "Show a vertical line for every marker"); + RNA_def_property_update(prop, NC_SPACE | ND_SPACE_GRAPH, NULL); + /* editing */ prop = RNA_def_property(srna, "use_realtime_update", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", SNLA_NOREALTIMEUPDATES); @@ -4274,7 +4294,7 @@ static void rna_def_console_line(BlenderRNA *brna) {CONSOLE_LINE_INPUT, "INPUT", 0, "Input", ""}, {CONSOLE_LINE_INFO, "INFO", 0, "Info", ""}, {CONSOLE_LINE_ERROR, "ERROR", 0, "Error", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; StructRNA *srna; @@ -4352,15 +4372,15 @@ static void rna_def_fileselect_params(BlenderRNA *brna) {FILE_SHORTDISPLAY, "LIST_SHORT", ICON_SHORTDISPLAY, "Short List", "Display files as short list"}, {FILE_LONGDISPLAY, "LIST_LONG", ICON_LONGDISPLAY, "Long List", "Display files as a detailed list"}, {FILE_IMGDISPLAY, "THUMBNAIL", ICON_IMGDISPLAY, "Thumbnails", "Display files as thumbnails"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem display_size_items[] = { {32, "TINY", 0, "Tiny", ""}, {64, "SMALL", 0, "Small", ""}, - {128, "NORMAL", 0, "Normal", ""}, + {128, "NORMAL", 0, "Regular", ""}, {256, "LARGE", 0, "Large", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem file_filter_idtypes_items[] = { @@ -4397,7 +4417,7 @@ static void rna_def_fileselect_params(BlenderRNA *brna) {FILTER_ID_VF, "FONT", ICON_FONT_DATA, "Fonts", "Show/hide Font data-blocks"}, {FILTER_ID_WO, "WORLD", ICON_WORLD_DATA, "Worlds", "Show/hide World data-blocks"}, {FILTER_ID_WS, "WORK_SPACE", ICON_NONE, "Workspaces", "Show/hide workspace data-blocks"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem file_filter_idcategories_items[] = { @@ -4418,7 +4438,7 @@ static void rna_def_fileselect_params(BlenderRNA *brna) "ENVIRONMENT", ICON_WORLD_DATA, "Environment", "Show/hide worlds, lights, cameras and speakers"}, {FILTER_ID_BR | FILTER_ID_GD | FILTER_ID_PA | FILTER_ID_PAL | FILTER_ID_PC | FILTER_ID_TXT | FILTER_ID_VF | FILTER_ID_CF, "MISC", ICON_GREASEPENCIL, "Miscellaneous", "Show/hide other data types"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "FileSelectParams", NULL); @@ -4728,7 +4748,8 @@ static void rna_def_space_userpref(BlenderRNA *brna) static const EnumPropertyItem filter_type_items[] = { {0, "NAME", 0, "Name", "Filter based on the operator name"}, {1, "KEY", 0, "Key-Binding", "Filter based on key bindings"}, - {0, NULL, 0, NULL, NULL}}; + {0, NULL, 0, NULL, NULL}, + }; StructRNA *srna; PropertyRNA *prop; @@ -4815,7 +4836,7 @@ static void rna_def_space_node(BlenderRNA *brna) #ifdef WITH_FREESTYLE {SNODE_TEX_LINESTYLE, "LINESTYLE", ICON_LINE_DATA, "Line Style", "Edit texture nodes from Line Style"}, #endif - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem shader_type_items[] = { @@ -4824,7 +4845,7 @@ static void rna_def_space_node(BlenderRNA *brna) #ifdef WITH_FREESTYLE {SNODE_SHADER_LINESTYLE, "LINESTYLE", ICON_LINE_DATA, "Line Style", "Edit shader nodes from Line Style"}, #endif - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem backdrop_channels_items[] = { @@ -4835,18 +4856,19 @@ static void rna_def_space_node(BlenderRNA *brna) {SNODE_SHOW_R, "RED", ICON_COLOR_RED, "Red", ""}, {SNODE_SHOW_G, "GREEN", ICON_COLOR_GREEN, "Green", ""}, {SNODE_SHOW_B, "BLUE", ICON_COLOR_BLUE, "Blue", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem insert_ofs_dir_items[] = { {SNODE_INSERTOFS_DIR_RIGHT, "RIGHT", 0, "Right"}, {SNODE_INSERTOFS_DIR_LEFT, "LEFT", 0, "Left"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem dummy_items[] = { {0, "DUMMY", 0, "", ""}, - {0, NULL, 0, NULL, NULL}}; + {0, NULL, 0, NULL, NULL}, + }; srna = RNA_def_struct(brna, "SpaceNodeEditor", "Space"); RNA_def_struct_sdna(srna, "SpaceNode"); @@ -4974,24 +4996,24 @@ static void rna_def_space_clip(BlenderRNA *brna) {SC_VIEW_CLIP, "CLIP", ICON_SEQUENCE, "Clip", "Show editing clip preview"}, {SC_VIEW_GRAPH, "GRAPH", ICON_GRAPH, "Graph", "Show graph view for active element"}, {SC_VIEW_DOPESHEET, "DOPESHEET", ICON_ACTION, "Dopesheet", "Dopesheet view for tracking data"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem gpencil_source_items[] = { {SC_GPENCIL_SRC_CLIP, "CLIP", 0, "Clip", "Show annotation data-block which belongs to movie clip"}, {SC_GPENCIL_SRC_TRACK, "TRACK", 0, "Track", "Show annotation data-block which belongs to active track"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem pivot_items[] = { {V3D_AROUND_CENTER_BOUNDS, "BOUNDING_BOX_CENTER", ICON_PIVOT_BOUNDBOX, "Bounding Box Center", "Pivot around bounding box center of selected object(s)"}, {V3D_AROUND_CURSOR, "CURSOR", ICON_PIVOT_CURSOR, "2D Cursor", "Pivot around the 2D cursor"}, - {V3D_AROUND_LOCAL_ORIGINS, "INDIVIDUAL_ORIGINS", ICON_CENTER_ONLY, + {V3D_AROUND_LOCAL_ORIGINS, "INDIVIDUAL_ORIGINS", ICON_PIVOT_INDIVIDUAL, "Individual Origins", "Pivot around each object's own origin"}, {V3D_AROUND_CENTER_MEDIAN, "MEDIAN_POINT", ICON_PIVOT_MEDIAN, "Median Point", "Pivot around the median point of selected objects"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "SpaceClipEditor", "Space"); @@ -5095,7 +5117,7 @@ static void rna_def_space_clip(BlenderRNA *brna) RNA_def_property_update(prop, NC_SPACE | ND_SPACE_CLIP, NULL); prop = RNA_def_property(srna, "show_metadata", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_sdna(prop, NULL, "flag", SC_SHOW_METADATA); + RNA_def_property_boolean_sdna(prop, NULL, "flag", SC_SHOW_METADATA); RNA_def_property_ui_text(prop, "Show Metadata", "Show metadata of clip"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_CLIP, NULL); |