Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: style

Browse Source
This commit is contained in:
Campbell Barton
2018-11-10 09:24:23 +11:00
parent 4d5c87f101
commit 2f44ea68d3
10 changed files with 126 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
source/blender/blenkernel/intern/idcode.c
View File

@@ -56,46 +56,46 @@ typedef struct {
/* WARNING! Keep it in sync with i18n contexts in BLT_translation.h */ /* WARNING! Keep it in sync with i18n contexts in BLT_translation.h */
static IDType idtypes[] = { static IDType idtypes[] = {
/** ID's directly below must all be in #Main, and be kept in sync with #MAX_LIBARRAY (membership, not order) */ /** ID's directly below must all be in #Main, and be kept in sync with #MAX_LIBARRAY (membership, not order) */
{ ID_AC, "Action", "actions", BLT_I18NCONTEXT_ID_ACTION, IDTYPE_FLAGS_ISLINKABLE }, {ID_AC, "Action", "actions", BLT_I18NCONTEXT_ID_ACTION, IDTYPE_FLAGS_ISLINKABLE},
{ ID_AR, "Armature", "armatures", BLT_I18NCONTEXT_ID_ARMATURE, IDTYPE_FLAGS_ISLINKABLE }, {ID_AR, "Armature", "armatures", BLT_I18NCONTEXT_ID_ARMATURE, IDTYPE_FLAGS_ISLINKABLE},
{ ID_BR, "Brush", "brushes", BLT_I18NCONTEXT_ID_BRUSH, IDTYPE_FLAGS_ISLINKABLE }, {ID_BR, "Brush", "brushes", BLT_I18NCONTEXT_ID_BRUSH, IDTYPE_FLAGS_ISLINKABLE},
{ ID_CA, "Camera", "cameras", BLT_I18NCONTEXT_ID_CAMERA, IDTYPE_FLAGS_ISLINKABLE }, {ID_CA, "Camera", "cameras", BLT_I18NCONTEXT_ID_CAMERA, IDTYPE_FLAGS_ISLINKABLE},
{ ID_CF, "CacheFile", "cache_files", BLT_I18NCONTEXT_ID_CACHEFILE, IDTYPE_FLAGS_ISLINKABLE }, {ID_CF, "CacheFile", "cache_files", BLT_I18NCONTEXT_ID_CACHEFILE, IDTYPE_FLAGS_ISLINKABLE},
{ ID_GR, "Collection", "collections", BLT_I18NCONTEXT_ID_COLLECTION, IDTYPE_FLAGS_ISLINKABLE }, {ID_GR, "Collection", "collections", BLT_I18NCONTEXT_ID_COLLECTION, IDTYPE_FLAGS_ISLINKABLE},
{ ID_CU, "Curve", "curves", BLT_I18NCONTEXT_ID_CURVE, IDTYPE_FLAGS_ISLINKABLE }, {ID_CU, "Curve", "curves", BLT_I18NCONTEXT_ID_CURVE, IDTYPE_FLAGS_ISLINKABLE},
{ ID_GD, "GPencil", "grease_pencil", BLT_I18NCONTEXT_ID_GPENCIL, IDTYPE_FLAGS_ISLINKABLE }, /* rename gpencil */ {ID_GD, "GPencil", "grease_pencil", BLT_I18NCONTEXT_ID_GPENCIL, IDTYPE_FLAGS_ISLINKABLE}, /* rename gpencil */
{ ID_IM, "Image", "images", BLT_I18NCONTEXT_ID_IMAGE, IDTYPE_FLAGS_ISLINKABLE }, {ID_IM, "Image", "images", BLT_I18NCONTEXT_ID_IMAGE, IDTYPE_FLAGS_ISLINKABLE},
{ ID_IP, "Ipo", "ipos", "", IDTYPE_FLAGS_ISLINKABLE }, /* deprecated */ {ID_IP, "Ipo", "ipos", "", IDTYPE_FLAGS_ISLINKABLE}, /* deprecated */
{ ID_KE, "Key", "shape_keys", BLT_I18NCONTEXT_ID_SHAPEKEY, 0 }, {ID_KE, "Key", "shape_keys", BLT_I18NCONTEXT_ID_SHAPEKEY, 0 },
{ ID_LA, "Light", "lights", BLT_I18NCONTEXT_ID_LAMP, IDTYPE_FLAGS_ISLINKABLE }, {ID_LA, "Light", "lights", BLT_I18NCONTEXT_ID_LAMP, IDTYPE_FLAGS_ISLINKABLE},
{ ID_LI, "Library", "libraries", BLT_I18NCONTEXT_ID_LIBRARY, 0 }, {ID_LI, "Library", "libraries", BLT_I18NCONTEXT_ID_LIBRARY, 0 },
{ ID_LS, "FreestyleLineStyle", "linestyles", BLT_I18NCONTEXT_ID_FREESTYLELINESTYLE, IDTYPE_FLAGS_ISLINKABLE }, {ID_LS, "FreestyleLineStyle", "linestyles", BLT_I18NCONTEXT_ID_FREESTYLELINESTYLE, IDTYPE_FLAGS_ISLINKABLE},
{ ID_LT, "Lattice", "lattices", BLT_I18NCONTEXT_ID_LATTICE, IDTYPE_FLAGS_ISLINKABLE }, {ID_LT, "Lattice", "lattices", BLT_I18NCONTEXT_ID_LATTICE, IDTYPE_FLAGS_ISLINKABLE},
{ ID_MA, "Material", "materials", BLT_I18NCONTEXT_ID_MATERIAL, IDTYPE_FLAGS_ISLINKABLE }, {ID_MA, "Material", "materials", BLT_I18NCONTEXT_ID_MATERIAL, IDTYPE_FLAGS_ISLINKABLE},
{ ID_MB, "Metaball", "metaballs", BLT_I18NCONTEXT_ID_METABALL, IDTYPE_FLAGS_ISLINKABLE }, {ID_MB, "Metaball", "metaballs", BLT_I18NCONTEXT_ID_METABALL, IDTYPE_FLAGS_ISLINKABLE},
{ ID_MC, "MovieClip", "movieclips", BLT_I18NCONTEXT_ID_MOVIECLIP, IDTYPE_FLAGS_ISLINKABLE }, {ID_MC, "MovieClip", "movieclips", BLT_I18NCONTEXT_ID_MOVIECLIP, IDTYPE_FLAGS_ISLINKABLE},
{ ID_ME, "Mesh", "meshes", BLT_I18NCONTEXT_ID_MESH, IDTYPE_FLAGS_ISLINKABLE }, {ID_ME, "Mesh", "meshes", BLT_I18NCONTEXT_ID_MESH, IDTYPE_FLAGS_ISLINKABLE},
{ ID_MSK, "Mask", "masks", BLT_I18NCONTEXT_ID_MASK, IDTYPE_FLAGS_ISLINKABLE }, {ID_MSK, "Mask", "masks", BLT_I18NCONTEXT_ID_MASK, IDTYPE_FLAGS_ISLINKABLE},
{ ID_NT, "NodeTree", "node_groups", BLT_I18NCONTEXT_ID_NODETREE, IDTYPE_FLAGS_ISLINKABLE }, {ID_NT, "NodeTree", "node_groups", BLT_I18NCONTEXT_ID_NODETREE, IDTYPE_FLAGS_ISLINKABLE},
{ ID_OB, "Object", "objects", BLT_I18NCONTEXT_ID_OBJECT, IDTYPE_FLAGS_ISLINKABLE }, {ID_OB, "Object", "objects", BLT_I18NCONTEXT_ID_OBJECT, IDTYPE_FLAGS_ISLINKABLE},
{ ID_PA, "ParticleSettings", "particles", BLT_I18NCONTEXT_ID_PARTICLESETTINGS, IDTYPE_FLAGS_ISLINKABLE }, {ID_PA, "ParticleSettings", "particles", BLT_I18NCONTEXT_ID_PARTICLESETTINGS, IDTYPE_FLAGS_ISLINKABLE},
{ ID_PAL, "Palettes", "palettes", BLT_I18NCONTEXT_ID_PALETTE, IDTYPE_FLAGS_ISLINKABLE }, {ID_PAL, "Palettes", "palettes", BLT_I18NCONTEXT_ID_PALETTE, IDTYPE_FLAGS_ISLINKABLE},
{ ID_PC, "PaintCurve", "paint_curves", BLT_I18NCONTEXT_ID_PAINTCURVE, IDTYPE_FLAGS_ISLINKABLE }, {ID_PC, "PaintCurve", "paint_curves", BLT_I18NCONTEXT_ID_PAINTCURVE, IDTYPE_FLAGS_ISLINKABLE},
{ ID_LP, "LightProbe", "light_probes", BLT_I18NCONTEXT_ID_LIGHTPROBE, IDTYPE_FLAGS_ISLINKABLE }, {ID_LP, "LightProbe", "light_probes", BLT_I18NCONTEXT_ID_LIGHTPROBE, IDTYPE_FLAGS_ISLINKABLE},
{ ID_SCE, "Scene", "scenes", BLT_I18NCONTEXT_ID_SCENE, IDTYPE_FLAGS_ISLINKABLE }, {ID_SCE, "Scene", "scenes", BLT_I18NCONTEXT_ID_SCENE, IDTYPE_FLAGS_ISLINKABLE},
{ ID_SCR, "Screen", "screens", BLT_I18NCONTEXT_ID_SCREEN, IDTYPE_FLAGS_ISLINKABLE }, {ID_SCR, "Screen", "screens", BLT_I18NCONTEXT_ID_SCREEN, IDTYPE_FLAGS_ISLINKABLE},
{ ID_SEQ, "Sequence", "sequences", BLT_I18NCONTEXT_ID_SEQUENCE, 0 }, /* not actually ID data */ {ID_SEQ, "Sequence", "sequences", BLT_I18NCONTEXT_ID_SEQUENCE, 0 }, /* not actually ID data */
{ ID_SPK, "Speaker", "speakers", BLT_I18NCONTEXT_ID_SPEAKER, IDTYPE_FLAGS_ISLINKABLE }, {ID_SPK, "Speaker", "speakers", BLT_I18NCONTEXT_ID_SPEAKER, IDTYPE_FLAGS_ISLINKABLE},
{ ID_SO, "Sound", "sounds", BLT_I18NCONTEXT_ID_SOUND, IDTYPE_FLAGS_ISLINKABLE }, {ID_SO, "Sound", "sounds", BLT_I18NCONTEXT_ID_SOUND, IDTYPE_FLAGS_ISLINKABLE},
{ ID_TE, "Texture", "textures", BLT_I18NCONTEXT_ID_TEXTURE, IDTYPE_FLAGS_ISLINKABLE }, {ID_TE, "Texture", "textures", BLT_I18NCONTEXT_ID_TEXTURE, IDTYPE_FLAGS_ISLINKABLE},
{ ID_TXT, "Text", "texts", BLT_I18NCONTEXT_ID_TEXT, IDTYPE_FLAGS_ISLINKABLE }, {ID_TXT, "Text", "texts", BLT_I18NCONTEXT_ID_TEXT, IDTYPE_FLAGS_ISLINKABLE},
{ ID_VF, "VFont", "fonts", BLT_I18NCONTEXT_ID_VFONT, IDTYPE_FLAGS_ISLINKABLE }, {ID_VF, "VFont", "fonts", BLT_I18NCONTEXT_ID_VFONT, IDTYPE_FLAGS_ISLINKABLE},
{ ID_WO, "World", "worlds", BLT_I18NCONTEXT_ID_WORLD, IDTYPE_FLAGS_ISLINKABLE }, {ID_WO, "World", "worlds", BLT_I18NCONTEXT_ID_WORLD, IDTYPE_FLAGS_ISLINKABLE},
{ ID_WM, "WindowManager", "window_managers", BLT_I18NCONTEXT_ID_WINDOWMANAGER, 0 }, {ID_WM, "WindowManager", "window_managers", BLT_I18NCONTEXT_ID_WINDOWMANAGER, 0 },
{ ID_WS, "WorkSpace", "workspaces", BLT_I18NCONTEXT_ID_WORKSPACE, IDTYPE_FLAGS_ISLINKABLE }, {ID_WS, "WorkSpace", "workspaces", BLT_I18NCONTEXT_ID_WORKSPACE, IDTYPE_FLAGS_ISLINKABLE},
/** Keep last, not an ID exactly, only include for completeness */ /** Keep last, not an ID exactly, only include for completeness */
{ ID_ID, "ID", "ids", BLT_I18NCONTEXT_ID_ID, 0 }, /* plural is fake */ {ID_ID, "ID", "ids", BLT_I18NCONTEXT_ID_ID, 0 }, /* plural is fake */
}; };
/* -1 for ID_ID */ /* -1 for ID_ID */

6
source/blender/editors/gpencil/gpencil_data.c
View File

@@ -597,9 +597,9 @@ static int gp_frame_duplicate_exec(bContext *C, wmOperator *op)
void GPENCIL_OT_frame_duplicate(wmOperatorType *ot) void GPENCIL_OT_frame_duplicate(wmOperatorType *ot)
{ {
static const EnumPropertyItem duplicate_mode[] = { static const EnumPropertyItem duplicate_mode[] = {
{ GP_FRAME_DUP_ACTIVE, "ACTIVE", 0, "Active", "Duplicate frame in active layer only" }, {GP_FRAME_DUP_ACTIVE, "ACTIVE", 0, "Active", "Duplicate frame in active layer only"},
{ GP_FRAME_DUP_ALL, "ALL", 0, "All", "Duplicate active frames in all layers" }, {GP_FRAME_DUP_ALL, "ALL", 0, "All", "Duplicate active frames in all layers"},
{ 0, NULL, 0, NULL, NULL } {0, NULL, 0, NULL, NULL}
}; };
/* identifiers */ /* identifiers */

12
source/blender/editors/gpencil/gpencil_edit.c
View File

@@ -2079,10 +2079,10 @@ static int gp_dissolve_exec(bContext *C, wmOperator *op)
void GPENCIL_OT_dissolve(wmOperatorType *ot) void GPENCIL_OT_dissolve(wmOperatorType *ot)
{ {
static EnumPropertyItem prop_gpencil_dissolve_types[] = { static EnumPropertyItem prop_gpencil_dissolve_types[] = {
{ GP_DISSOLVE_POINTS, "POINTS", 0, "Dissolve", "Dissolve selected points" }, {GP_DISSOLVE_POINTS, "POINTS", 0, "Dissolve", "Dissolve selected points"},
{ GP_DISSOLVE_BETWEEN, "BETWEEN", 0, "Dissolve Between", "Dissolve points between selected points" }, {GP_DISSOLVE_BETWEEN, "BETWEEN", 0, "Dissolve Between", "Dissolve points between selected points"},
{ GP_DISSOLVE_UNSELECT, "UNSELECT", 0, "Dissolve Unselect", "Dissolve all unselected points" }, {GP_DISSOLVE_UNSELECT, "UNSELECT", 0, "Dissolve Unselect", "Dissolve all unselected points"},
{ 0, NULL, 0, NULL, NULL } {0, NULL, 0, NULL, NULL}
}; };
/* identifiers */ /* identifiers */
@@ -2963,9 +2963,9 @@ static int gp_strokes_reproject_exec(bContext *C, wmOperator *op)
void GPENCIL_OT_reproject(wmOperatorType *ot) void GPENCIL_OT_reproject(wmOperatorType *ot)
{ {
static const EnumPropertyItem reproject_type[] = { static const EnumPropertyItem reproject_type[] = {
{ GP_REPROJECT_AXIS, "AXIS", 0, "Axis", {GP_REPROJECT_AXIS, "AXIS", 0, "Axis",
"Reproject the strokes using the current lock axis configuration. This is the same projection using while" "Reproject the strokes using the current lock axis configuration. This is the same projection using while"
"drawing new strokes" }, "drawing new strokes"},
{GP_REPROJECT_PLANAR, "PLANAR", 0, "Planar", {GP_REPROJECT_PLANAR, "PLANAR", 0, "Planar",
"Reproject the strokes to end up on the same plane, as if drawn from the current viewpoint " "Reproject the strokes to end up on the same plane, as if drawn from the current viewpoint "
"using 'Cursor' Stroke Placement"}, "using 'Cursor' Stroke Placement"},

8
source/blender/editors/gpencil/gpencil_primitive.c
View File

@@ -724,10 +724,10 @@ static void gpencil_primitive_cancel(bContext *C, wmOperator *op)
void GPENCIL_OT_primitive(wmOperatorType *ot) void GPENCIL_OT_primitive(wmOperatorType *ot)
{ {
static EnumPropertyItem primitive_type[] = { static EnumPropertyItem primitive_type[] = {
{ GP_STROKE_BOX, "BOX", 0, "Box", "" }, {GP_STROKE_BOX, "BOX", 0, "Box", ""},
{ GP_STROKE_LINE, "LINE", 0, "Line", "" }, {GP_STROKE_LINE, "LINE", 0, "Line", ""},
{ GP_STROKE_CIRCLE, "CIRCLE", 0, "Circle", "" }, {GP_STROKE_CIRCLE, "CIRCLE", 0, "Circle", ""},
{ 0, NULL, 0, NULL, NULL } {0, NULL, 0, NULL, NULL}
}; };
/* identifiers */ /* identifiers */

38
source/blender/makesrna/intern/rna_brush.c
View File

@@ -122,31 +122,31 @@ const EnumPropertyItem rna_enum_brush_gpencil_types_items[] = {
#ifndef RNA_RUNTIME #ifndef RNA_RUNTIME
static EnumPropertyItem rna_enum_gpencil_brush_eraser_modes_items[] = { static EnumPropertyItem rna_enum_gpencil_brush_eraser_modes_items[] = {
{ GP_BRUSH_ERASER_SOFT, "SOFT", 0, "Soft", "Use soft eraser" }, {GP_BRUSH_ERASER_SOFT, "SOFT", 0, "Soft", "Use soft eraser"},
{ GP_BRUSH_ERASER_HARD, "HARD", 0, "Hard", "Use hard eraser" }, {GP_BRUSH_ERASER_HARD, "HARD", 0, "Hard", "Use hard eraser"},
{ GP_BRUSH_ERASER_STROKE, "STROKE", 0, "Stroke", "Use stroke eraser" }, {GP_BRUSH_ERASER_STROKE, "STROKE", 0, "Stroke", "Use stroke eraser"},
{ 0, NULL, 0, NULL, NULL } {0, NULL, 0, NULL, NULL}
}; };
static EnumPropertyItem rna_enum_gpencil_fill_draw_modes_items[] = { static EnumPropertyItem rna_enum_gpencil_fill_draw_modes_items[] = {
{ GP_FILL_DMODE_STROKE, "STROKE", 0, "Strokes", "Use visible strokes as fill boundary limits" }, {GP_FILL_DMODE_STROKE, "STROKE", 0, "Strokes", "Use visible strokes as fill boundary limits"},
{ GP_FILL_DMODE_CONTROL, "CONTROL", 0, "Control", "Use internal control lines as fill boundary limits" }, {GP_FILL_DMODE_CONTROL, "CONTROL", 0, "Control", "Use internal control lines as fill boundary limits"},
{ GP_FILL_DMODE_BOTH, "BOTH", 0, "Both", "Use visible strokes and control lines as fill boundary limits" }, {GP_FILL_DMODE_BOTH, "BOTH", 0, "Both", "Use visible strokes and control lines as fill boundary limits"},
{ 0, NULL, 0, NULL, NULL } {0, NULL, 0, NULL, NULL}
}; };
static EnumPropertyItem rna_enum_gpencil_brush_icons_items[] = { static EnumPropertyItem rna_enum_gpencil_brush_icons_items[] = {
{ GP_BRUSH_ICON_PENCIL, "PENCIL", ICON_GPBRUSH_PENCIL, "Pencil", "" }, {GP_BRUSH_ICON_PENCIL, "PENCIL", ICON_GPBRUSH_PENCIL, "Pencil", ""},
{ GP_BRUSH_ICON_PEN, "PEN", ICON_GPBRUSH_PEN, "Pen", "" }, {GP_BRUSH_ICON_PEN, "PEN", ICON_GPBRUSH_PEN, "Pen", ""},
{ GP_BRUSH_ICON_INK, "INK", ICON_GPBRUSH_INK, "Ink", "" }, {GP_BRUSH_ICON_INK, "INK", ICON_GPBRUSH_INK, "Ink", ""},
{ GP_BRUSH_ICON_INKNOISE, "INKNOISE", ICON_GPBRUSH_INKNOISE, "Ink Noise", "" }, {GP_BRUSH_ICON_INKNOISE, "INKNOISE", ICON_GPBRUSH_INKNOISE, "Ink Noise", ""},
{ GP_BRUSH_ICON_BLOCK, "BLOCK", ICON_GPBRUSH_BLOCK, "Block", "" }, {GP_BRUSH_ICON_BLOCK, "BLOCK", ICON_GPBRUSH_BLOCK, "Block", ""},
{ GP_BRUSH_ICON_MARKER, "MARKER", ICON_GPBRUSH_MARKER, "Marker", "" }, {GP_BRUSH_ICON_MARKER, "MARKER", ICON_GPBRUSH_MARKER, "Marker", ""},
{ GP_BRUSH_ICON_FILL, "FILL", ICON_GPBRUSH_FILL, "Fill", "" }, {GP_BRUSH_ICON_FILL, "FILL", ICON_GPBRUSH_FILL, "Fill", ""},
{ GP_BRUSH_ICON_ERASE_SOFT, "SOFT", ICON_GPBRUSH_ERASE_SOFT, "Eraser Soft", "" }, {GP_BRUSH_ICON_ERASE_SOFT, "SOFT", ICON_GPBRUSH_ERASE_SOFT, "Eraser Soft", ""},
{ GP_BRUSH_ICON_ERASE_HARD, "HARD", ICON_GPBRUSH_ERASE_HARD, "Eraser Hard", "" }, {GP_BRUSH_ICON_ERASE_HARD, "HARD", ICON_GPBRUSH_ERASE_HARD, "Eraser Hard", ""},
{ GP_BRUSH_ICON_ERASE_STROKE, "STROKE", ICON_GPBRUSH_ERASE_STROKE, "Eraser Stroke", "" }, {GP_BRUSH_ICON_ERASE_STROKE, "STROKE", ICON_GPBRUSH_ERASE_STROKE, "Eraser Stroke", ""},
{ 0, NULL, 0, NULL, NULL } {0, NULL, 0, NULL, NULL}
}; };
#endif #endif

22
source/blender/makesrna/intern/rna_gpencil.c
View File

@@ -59,23 +59,23 @@ static const EnumPropertyItem parent_type_items[] = {
#ifndef RNA_RUNTIME #ifndef RNA_RUNTIME
static EnumPropertyItem rna_enum_gpencil_xraymodes_items[] = { static EnumPropertyItem rna_enum_gpencil_xraymodes_items[] = {
{ GP_XRAY_FRONT, "FRONT", 0, "Front", "Draw all strokes in front" }, {GP_XRAY_FRONT, "FRONT", 0, "Front", "Draw all strokes in front"},
{ GP_XRAY_3DSPACE, "3DSPACE", 0, "3D Space", "Draw strokes relative to other objects in 3D space" }, {GP_XRAY_3DSPACE, "3DSPACE", 0, "3D Space", "Draw strokes relative to other objects in 3D space"},
{ GP_XRAY_BACK, "BACK", 0, "Back", "Draw all strokes last" }, {GP_XRAY_BACK, "BACK", 0, "Back", "Draw all strokes last"},
{ 0, NULL, 0, NULL, NULL } {0, NULL, 0, NULL, NULL}
}; };
static EnumPropertyItem rna_enum_gpencil_onion_modes_items[] = { static EnumPropertyItem rna_enum_gpencil_onion_modes_items[] = {
{ GP_ONION_MODE_ABSOLUTE, "ABSOLUTE", 0, "Frames", "Frames in absolute range of the scene frame" }, {GP_ONION_MODE_ABSOLUTE, "ABSOLUTE", 0, "Frames", "Frames in absolute range of the scene frame"},
{ GP_ONION_MODE_RELATIVE, "RELATIVE", 0, "Keyframes", "Frames in relative range of the Grease Pencil keyframes" }, {GP_ONION_MODE_RELATIVE, "RELATIVE", 0, "Keyframes", "Frames in relative range of the Grease Pencil keyframes"},
{ GP_ONION_MODE_SELECTED, "SELECTED", 0, "Selected", "Only selected keyframes" }, {GP_ONION_MODE_SELECTED, "SELECTED", 0, "Selected", "Only selected keyframes"},
{ 0, NULL, 0, NULL, NULL } {0, NULL, 0, NULL, NULL}
}; };
const EnumPropertyItem rna_enum_gplayer_move_type_items[] = { const EnumPropertyItem rna_enum_gplayer_move_type_items[] = {
{ -1, "UP", 0, "Up", ""}, {-1, "UP", 0, "Up", ""},
{ 1, "DOWN", 0, "Down", ""}, {1, "DOWN", 0, "Down", ""},
{ 0, NULL, 0, NULL, NULL} {0, NULL, 0, NULL, NULL}
}; };
#endif #endif

44
source/blender/makesrna/intern/rna_gpencil_modifier.c
View File

@@ -84,30 +84,30 @@ const EnumPropertyItem rna_enum_object_greasepencil_modifier_type_items[] = {
#ifndef RNA_RUNTIME #ifndef RNA_RUNTIME
static const EnumPropertyItem modifier_modify_color_items[] = { static const EnumPropertyItem modifier_modify_color_items[] = {
{ GP_MODIFY_COLOR_BOTH, "BOTH", 0, "Both", "Modify fill and stroke colors" }, {GP_MODIFY_COLOR_BOTH, "BOTH", 0, "Both", "Modify fill and stroke colors"},
{ GP_MODIFY_COLOR_STROKE, "STROKE", 0, "Stroke", "Modify stroke color only" }, {GP_MODIFY_COLOR_STROKE, "STROKE", 0, "Stroke", "Modify stroke color only"},
{ GP_MODIFY_COLOR_FILL, "FILL", 0, "Fill", "Modify fill color only" }, {GP_MODIFY_COLOR_FILL, "FILL", 0, "Fill", "Modify fill color only"},
{ 0, NULL, 0, NULL, NULL } {0, NULL, 0, NULL, NULL}
}; };
static const EnumPropertyItem modifier_gphook_falloff_items[] = { static const EnumPropertyItem modifier_gphook_falloff_items[] = {
{ eGPHook_Falloff_None, "NONE", 0, "No Falloff", "" }, {eGPHook_Falloff_None, "NONE", 0, "No Falloff", ""},
{ eGPHook_Falloff_Curve, "CURVE", 0, "Curve", "" }, {eGPHook_Falloff_Curve, "CURVE", 0, "Curve", ""},
{ eGPHook_Falloff_Smooth, "SMOOTH", ICON_SMOOTHCURVE, "Smooth", "" }, {eGPHook_Falloff_Smooth, "SMOOTH", ICON_SMOOTHCURVE, "Smooth", ""},
{ eGPHook_Falloff_Sphere, "SPHERE", ICON_SPHERECURVE, "Sphere", "" }, {eGPHook_Falloff_Sphere, "SPHERE", ICON_SPHERECURVE, "Sphere", ""},
{ eGPHook_Falloff_Root, "ROOT", ICON_ROOTCURVE, "Root", "" }, {eGPHook_Falloff_Root, "ROOT", ICON_ROOTCURVE, "Root", ""},
{ eGPHook_Falloff_InvSquare, "INVERSE_SQUARE", ICON_ROOTCURVE, "Inverse Square", "" }, {eGPHook_Falloff_InvSquare, "INVERSE_SQUARE", ICON_ROOTCURVE, "Inverse Square", ""},
{ eGPHook_Falloff_Sharp, "SHARP", ICON_SHARPCURVE, "Sharp", "" }, {eGPHook_Falloff_Sharp, "SHARP", ICON_SHARPCURVE, "Sharp", ""},
{ eGPHook_Falloff_Linear, "LINEAR", ICON_LINCURVE, "Linear", "" }, {eGPHook_Falloff_Linear, "LINEAR", ICON_LINCURVE, "Linear", ""},
{ eGPHook_Falloff_Const, "CONSTANT", ICON_NOCURVE, "Constant", "" }, {eGPHook_Falloff_Const, "CONSTANT", ICON_NOCURVE, "Constant", ""},
{ 0, NULL, 0, NULL, NULL } {0, NULL, 0, NULL, NULL}
}; };
static const EnumPropertyItem rna_enum_time_mode_items[] = { static const EnumPropertyItem rna_enum_time_mode_items[] = {
{ GP_TIME_MODE_NORMAL, "NORMAL", 0, "Normal", "Apply offset in normal animation direction" }, {GP_TIME_MODE_NORMAL, "NORMAL", 0, "Normal", "Apply offset in normal animation direction"},
{ GP_TIME_MODE_REVERSE, "REVERSE", 0, "Reverse", "Apply offset in reverse animation direction" }, {GP_TIME_MODE_REVERSE, "REVERSE", 0, "Reverse", "Apply offset in reverse animation direction"},
{ GP_TIME_MODE_FIX, "FIX", 0, "Fixed Frame", "Keep frame and do not change with time" }, {GP_TIME_MODE_FIX, "FIX", 0, "Fixed Frame", "Keep frame and do not change with time"},
{ 0, NULL, 0, NULL, NULL } {0, NULL, 0, NULL, NULL}
}; };
#endif #endif
@@ -543,11 +543,11 @@ static void rna_def_modifier_gpencilsimplify(BlenderRNA *brna)
PropertyRNA *prop; PropertyRNA *prop;
static EnumPropertyItem prop_gpencil_simplify_mode_items[] = { static EnumPropertyItem prop_gpencil_simplify_mode_items[] = {
{ GP_SIMPLIFY_FIXED, "FIXED", ICON_IPO_CONSTANT, "Fixed", {GP_SIMPLIFY_FIXED, "FIXED", ICON_IPO_CONSTANT, "Fixed",
"Delete alternative vertices in the stroke, except extrems" }, "Delete alternative vertices in the stroke, except extrems"},
{ GP_SIMPLIFY_ADAPTATIVE, "ADAPTATIVE", ICON_IPO_EASE_IN_OUT, "Adaptative", {GP_SIMPLIFY_ADAPTATIVE, "ADAPTATIVE", ICON_IPO_EASE_IN_OUT, "Adaptative",
"Use a RDP algorithm to simplify" }, "Use a RDP algorithm to simplify" },
{ 0, NULL, 0, NULL, NULL } {0, NULL, 0, NULL, NULL}
}; };
srna = RNA_def_struct(brna, "SimplifyGpencilModifier", "GpencilModifier"); srna = RNA_def_struct(brna, "SimplifyGpencilModifier", "GpencilModifier");

30
source/blender/makesrna/intern/rna_material.c
View File

@@ -406,32 +406,32 @@ static void rna_def_material_greasepencil(BlenderRNA *brna)
/* mode type styles */ /* mode type styles */
static EnumPropertyItem gpcolordata_mode_types_items[] = { static EnumPropertyItem gpcolordata_mode_types_items[] = {
{ GP_STYLE_MODE_LINE, "LINE", 0, "Line", "Draw strokes using a continuous line" }, {GP_STYLE_MODE_LINE, "LINE", 0, "Line", "Draw strokes using a continuous line"},
{ GP_STYLE_MODE_DOTS, "DOTS", 0, "Dots", "Draw strokes using separated dots" }, {GP_STYLE_MODE_DOTS, "DOTS", 0, "Dots", "Draw strokes using separated dots"},
{ GP_STYLE_MODE_BOX, "BOX", 0, "Boxes", "Draw strokes using separated rectangle boxes" }, {GP_STYLE_MODE_BOX, "BOX", 0, "Boxes", "Draw strokes using separated rectangle boxes"},
{ 0, NULL, 0, NULL, NULL } {0, NULL, 0, NULL, NULL}
}; };
/* stroke styles */ /* stroke styles */
static EnumPropertyItem stroke_style_items[] = { static EnumPropertyItem stroke_style_items[] = {
{ GP_STYLE_STROKE_STYLE_SOLID, "SOLID", 0, "Solid", "Draw strokes with solid color" }, {GP_STYLE_STROKE_STYLE_SOLID, "SOLID", 0, "Solid", "Draw strokes with solid color"},
{ GP_STYLE_STROKE_STYLE_TEXTURE, "TEXTURE", 0, "Texture", "Draw strokes using texture" }, {GP_STYLE_STROKE_STYLE_TEXTURE, "TEXTURE", 0, "Texture", "Draw strokes using texture"},
{ 0, NULL, 0, NULL, NULL } {0, NULL, 0, NULL, NULL}
}; };
/* fill styles */ /* fill styles */
static EnumPropertyItem fill_style_items[] = { static EnumPropertyItem fill_style_items[] = {
{ GP_STYLE_FILL_STYLE_SOLID, "SOLID", 0, "Solid", "Fill area with solid color" }, {GP_STYLE_FILL_STYLE_SOLID, "SOLID", 0, "Solid", "Fill area with solid color"},
{ GP_STYLE_FILL_STYLE_GRADIENT, "GRADIENT", 0, "Gradient", "Fill area with gradient color" }, {GP_STYLE_FILL_STYLE_GRADIENT, "GRADIENT", 0, "Gradient", "Fill area with gradient color"},
{ GP_STYLE_FILL_STYLE_CHESSBOARD, "CHESSBOARD", 0, "Checker Board", "Fill area with chessboard pattern" }, {GP_STYLE_FILL_STYLE_CHESSBOARD, "CHESSBOARD", 0, "Checker Board", "Fill area with chessboard pattern"},
{ GP_STYLE_FILL_STYLE_TEXTURE, "TEXTURE", 0, "Texture", "Fill area with image texture" }, {GP_STYLE_FILL_STYLE_TEXTURE, "TEXTURE", 0, "Texture", "Fill area with image texture"},
{ 0, NULL, 0, NULL, NULL } {0, NULL, 0, NULL, NULL}
}; };
static EnumPropertyItem fill_gradient_items[] = { static EnumPropertyItem fill_gradient_items[] = {
{ GP_STYLE_GRADIENT_LINEAR, "LINEAR", 0, "Linear", "Fill area with gradient color" }, {GP_STYLE_GRADIENT_LINEAR, "LINEAR", 0, "Linear", "Fill area with gradient color"},
{ GP_STYLE_GRADIENT_RADIAL, "RADIAL", 0, "Radial", "Fill area with radial gradient" }, {GP_STYLE_GRADIENT_RADIAL, "RADIAL", 0, "Radial", "Fill area with radial gradient"},
{ 0, NULL, 0, NULL, NULL } {0, NULL, 0, NULL, NULL}
}; };
srna = RNA_def_struct(brna, "MaterialGPencilStyle", NULL); srna = RNA_def_struct(brna, "MaterialGPencilStyle", NULL);

14
source/blender/makesrna/intern/rna_sculpt_paint.c
View File

@@ -80,16 +80,16 @@ const EnumPropertyItem rna_enum_gpencil_sculpt_brush_items[] = {
#ifndef RNA_RUNTIME #ifndef RNA_RUNTIME
static EnumPropertyItem rna_enum_gpencil_weight_brush_items[] = { static EnumPropertyItem rna_enum_gpencil_weight_brush_items[] = {
{ GP_EDITBRUSH_TYPE_WEIGHT, "WEIGHT", ICON_GPBRUSH_WEIGHT, "Weight", "Weight Paint for Vertex Groups" }, {GP_EDITBRUSH_TYPE_WEIGHT, "WEIGHT", ICON_GPBRUSH_WEIGHT, "Weight", "Weight Paint for Vertex Groups"},
{ 0, NULL, 0, NULL, NULL } {0, NULL, 0, NULL, NULL}
}; };
static const EnumPropertyItem rna_enum_gpencil_lock_axis_items[] = { static const EnumPropertyItem rna_enum_gpencil_lock_axis_items[] = {
{ GP_LOCKAXIS_VIEW, "VIEW", ICON_RESTRICT_VIEW_ON, "View", "Align strokes to current view plane" }, {GP_LOCKAXIS_VIEW, "VIEW", ICON_RESTRICT_VIEW_ON, "View", "Align strokes to current view plane"},
{ GP_LOCKAXIS_X, "AXIS_X", ICON_AXIS_SIDE, "Y-Z Plane", "Project strokes to plane locked to X" }, {GP_LOCKAXIS_X, "AXIS_X", ICON_AXIS_SIDE, "Y-Z Plane", "Project strokes to plane locked to X"},
{ GP_LOCKAXIS_Y, "AXIS_Y", ICON_AXIS_FRONT, "X-Z Plane", "Project strokes to plane locked to Y" }, {GP_LOCKAXIS_Y, "AXIS_Y", ICON_AXIS_FRONT, "X-Z Plane", "Project strokes to plane locked to Y"},
{ GP_LOCKAXIS_Z, "AXIS_Z", ICON_AXIS_TOP, "X-Y Plane", "Project strokes to plane locked to Z" }, {GP_LOCKAXIS_Z, "AXIS_Z", ICON_AXIS_TOP, "X-Y Plane", "Project strokes to plane locked to Z"},
{ 0, NULL, 0, NULL, NULL } {0, NULL, 0, NULL, NULL}
}; };
#endif #endif

2
source/blender/nodes/shader/nodes/node_shader_tex_image.c
View File

@@ -85,7 +85,7 @@ static int node_shader_gpu_tex_image(GPUMaterial *mat, bNode *node, bNodeExecDat
const bool do_texco_clip = (tex->extension == SHD_IMAGE_EXTENSION_CLIP); const bool do_texco_clip = (tex->extension == SHD_IMAGE_EXTENSION_CLIP);
if (do_texco_extend && (tex->projection != SHD_PROJ_BOX) && if (do_texco_extend && (tex->projection != SHD_PROJ_BOX) &&
ELEM(tex->interpolation, SHD_INTERP_CUBIC, SHD_INTERP_SMART)) ELEM(tex->interpolation, SHD_INTERP_CUBIC, SHD_INTERP_SMART))
{ {
gpu_node_name = "node_tex_image_cubic_extend"; gpu_node_name = "node_tex_image_cubic_extend";
/* We do it inside the sampling function */ /* We do it inside the sampling function */