[Bf-blender-cvs] [4c088075f0a] soc-2018-npr: Fix compiler warnings (use 0 in enums for no icon, not NULL) + whitespace (mixed tabs/spaces)
Joshua Leung
noreply at git.blender.org
Mon Jul 30 15:51:39 CEST 2018
Commit: 4c088075f0a3799dcccbf469e0ad8cc8ea0d3128
Author: Joshua Leung
Date: Tue Jul 31 01:44:54 2018 +1200
Branches: soc-2018-npr
https://developer.blender.org/rB4c088075f0a3799dcccbf469e0ad8cc8ea0d3128
Fix compiler warnings (use 0 in enums for no icon, not NULL) + whitespace (mixed tabs/spaces)
===================================================================
M source/blender/makesrna/intern/rna_scene.c
===================================================================
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index 220f17dae79..34b6159d602 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -6212,41 +6212,41 @@ static void rna_def_scene_lanpr(BlenderRNA *brna)
PropertyRNA *prop;
static const EnumPropertyItem DEBUG_rna_enum_lanpr_reload[] = {
- {0, "IDLE", NULL, "Idle", "Idle"},
- {1, "RELOAD", NULL, "RELOAD", "Force reload the scene"},
- {0, NULL, 0, NULL, NULL}
- };
+ {0, "IDLE", 0, "Idle", "Idle"},
+ {1, "RELOAD", 0, "RELOAD", "Force reload the scene"},
+ {0, NULL, 0, NULL, NULL}
+ };
static const EnumPropertyItem rna_enum_lanpr_master_mode[] = {
- {LANPR_MASTER_MODE_SOFTWARE, "SOFTWARE", NULL, "Software", "Software edge calculation" },
- {LANPR_MASTER_MODE_DPIX, "DPIX", NULL, "DPIX", "DPIX GPU edge calculation"},
- {LANPR_MASTER_MODE_SNAKE, "SNAKE", NULL, "Snake", "Image filter and GPU tracing method"},
- {0, NULL, 0, NULL, NULL}
- };
+ {LANPR_MASTER_MODE_SOFTWARE, "SOFTWARE", 0, "Software", "Software edge calculation" },
+ {LANPR_MASTER_MODE_DPIX, "DPIX", 0, "DPIX", "DPIX GPU edge calculation"},
+ {LANPR_MASTER_MODE_SNAKE, "SNAKE", 0, "Snake", "Image filter and GPU tracing method"},
+ {0, NULL, 0, NULL, NULL}
+ };
static const EnumPropertyItem rna_enum_lanpr_enable_post_processing[] = {
- {LANPR_POST_PROCESSING_DISABLED, "DISABLED", NULL, "Disabled", "LANPR does not compute anything"},
- {LANPR_POST_PROCESSING_ENABLED, "ENABLED", NULL, "Enabled", "LANPR will compute feature lines in image post processing"},
- {0, NULL, 0, NULL, NULL}
- };
+ {LANPR_POST_PROCESSING_DISABLED, "DISABLED", 0, "Disabled", "LANPR does not compute anything"},
+ {LANPR_POST_PROCESSING_ENABLED, "ENABLED", 0, "Enabled", "LANPR will compute feature lines in image post processing"},
+ {0, NULL, 0, NULL, NULL}
+ };
static const EnumPropertyItem rna_enum_lanpr_display_thinning_result[] = {
- {LANPR_POST_PROCESSING_DISABLED, "DISABLED", NULL, "Edge Detection", "Display edge detector result"},
- {LANPR_POST_PROCESSING_ENABLED, "ENABLED", NULL, "Thinning", "Apply thinning filters for vector usage"},
- {0, NULL, 0, NULL, NULL}
- };
+ {LANPR_POST_PROCESSING_DISABLED, "DISABLED", 0, "Edge Detection", "Display edge detector result"},
+ {LANPR_POST_PROCESSING_ENABLED, "ENABLED", 0, "Thinning", "Apply thinning filters for vector usage"},
+ {0, NULL, 0, NULL, NULL}
+ };
static const EnumPropertyItem rna_enum_lanpr_use_same_taper[] = {
- {LANPR_USE_DIFFERENT_TAPER, "DISABLED", NULL, "Different", "Use different taper value"},
- {LANPR_USE_SAME_TAPER, "ENABLED", NULL, "Same", "Use same taper value for both sides of the line"},
- {0, NULL, 0, NULL, NULL}
- };
+ {LANPR_USE_DIFFERENT_TAPER, "DISABLED", 0, "Different", "Use different taper value"},
+ {LANPR_USE_SAME_TAPER, "ENABLED", 0, "Same", "Use same taper value for both sides of the line"},
+ {0, NULL, 0, NULL, NULL}
+ };
static const EnumPropertyItem rna_enum_lanpr_enable_tip_extend[] = {
- {LANPR_DISABLE_TIP_EXTEND, "DISABLED", NULL, "Disable", "Do not extend curve tips"},
- {LANPR_ENABLE_TIP_EXTEND, "ENABLED", NULL, "Enable", "Extend curve tips to a user specified length"},
- {0, NULL, 0, NULL, NULL}
- };
+ {LANPR_DISABLE_TIP_EXTEND, "DISABLED", 0, "Disable", "Do not extend curve tips"},
+ {LANPR_ENABLE_TIP_EXTEND, "ENABLED", 0, "Enable", "Extend curve tips to a user specified length"},
+ {0, NULL, 0, NULL, NULL}
+ };
srna = RNA_def_struct(brna, "SceneLANPR", NULL);
RNA_def_struct_sdna(srna, "SceneLANPR");
More information about the Bf-blender-cvs
mailing list