diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-05-22 01:39:15 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-05-22 01:53:04 +0300 |
| commit | 8accb5a46f4a498327ddd41ffb6e07972b373422 (patch) | |
| tree | adffe39cd5e713560c1a84dfefaec5f673d87f0b | |
| parent | 0910932e71d2b869e0f9d4289d89f20c64beabaa (diff) | |
Cleanup: minor corrections
| -rw-r--r-- | release/scripts/templates_py/operator_modal_view3d_raycast.py | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_depsgraph.c | 16 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 3 |
3 files changed, 6 insertions, 15 deletions
diff --git a/release/scripts/templates_py/operator_modal_view3d_raycast.py b/release/scripts/templates_py/operator_modal_view3d_raycast.py index 7569477af68..9130f47843a 100644 --- a/release/scripts/templates_py/operator_modal_view3d_raycast.py +++ b/release/scripts/templates_py/operator_modal_view3d_raycast.py @@ -19,7 +19,7 @@ def main(context, event): def visible_objects_and_duplis(): """Loop over (object, matrix) pairs (mesh only)""" - depsgraph = bpy.context.evaluated_depsgraph_get() + depsgraph = context.evaluated_depsgraph_get() for dup in depsgraph.object_instances: if dup.is_instance: # Real dupli instance obj = dup.instance_object diff --git a/source/blender/makesrna/intern/rna_depsgraph.c b/source/blender/makesrna/intern/rna_depsgraph.c index c4a2a64f3f0..df1727ff87c 100644 --- a/source/blender/makesrna/intern/rna_depsgraph.c +++ b/source/blender/makesrna/intern/rna_depsgraph.c @@ -622,21 +622,13 @@ static void rna_def_depsgraph(BlenderRNA *brna) func = RNA_def_function( srna, "debug_relations_graphviz", "rna_Depsgraph_debug_relations_graphviz"); - parm = RNA_def_string_file_path(func, - "filename", - NULL, - FILE_MAX, - "File Name", - "File in which to store graphviz debug output"); + parm = RNA_def_string_file_path( + func, "filename", NULL, FILE_MAX, "File Name", "Output path for the graphviz debug file"); RNA_def_parameter_flags(parm, 0, PARM_REQUIRED); func = RNA_def_function(srna, "debug_stats_gnuplot", "rna_Depsgraph_debug_stats_gnuplot"); - parm = RNA_def_string_file_path(func, - "filename", - NULL, - FILE_MAX, - "File Name", - "File in which to store graphviz debug output"); + parm = RNA_def_string_file_path( + func, "filename", NULL, FILE_MAX, "File Name", "Output path for the gnuplot debug file"); RNA_def_parameter_flags(parm, 0, PARM_REQUIRED); parm = RNA_def_string_file_path(func, "output_filename", diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index bf2bf69fc22..2a69ca76c22 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -2835,8 +2835,7 @@ static void rna_def_tool_settings(BlenderRNA *brna) prop = RNA_def_property(srna, "double_threshold", PROP_FLOAT, PROP_DISTANCE); RNA_def_property_float_sdna(prop, NULL, "doublimit"); - RNA_def_property_ui_text( - prop, "Merge Threshold", "Threshold distance for Auto Merge"); + RNA_def_property_ui_text(prop, "Merge Threshold", "Threshold distance for Auto Merge"); RNA_def_property_range(prop, 0.0, 1.0); RNA_def_property_ui_range(prop, 0.0, 0.1, 0.01, 6); |