Commit: a468368540491a9364eb845fa25f2f421488d278 Author: Adrian Newton Date: Mon Mar 9 17:49:14 2020 +0100 Branches: master https://developer.blender.org/rBa468368540491a9364eb845fa25f2f421488d278
UI: use pixel units for tile sizes and node auto-offset margin Differential Revision: https://developer.blender.org/D7077 =================================================================== M source/blender/makesrna/intern/rna_scene.c M source/blender/makesrna/intern/rna_userdef.c =================================================================== diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 4657501548c..27d742fd33c 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -5712,14 +5712,14 @@ static void rna_def_scene_render_data(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Resolution %", "Percentage scale for render resolution"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneSequencer_update"); - prop = RNA_def_property(srna, "tile_x", PROP_INT, PROP_NONE); + prop = RNA_def_property(srna, "tile_x", PROP_INT, PROP_PIXEL); RNA_def_property_int_sdna(prop, NULL, "tilex"); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_range(prop, 8, 65536); RNA_def_property_ui_text(prop, "Tile X", "Horizontal tile size to use while rendering"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); - prop = RNA_def_property(srna, "tile_y", PROP_INT, PROP_NONE); + prop = RNA_def_property(srna, "tile_y", PROP_INT, PROP_PIXEL); RNA_def_property_int_sdna(prop, NULL, "tiley"); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_range(prop, 8, 65536); diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index 7250f8a2d59..f3077d5ab56 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -4987,7 +4987,7 @@ static void rna_def_userdef_edit(BlenderRNA *brna) /* Currently only used for insert offset (aka auto-offset), * maybe also be useful for later stuff though. */ - prop = RNA_def_property(srna, "node_margin", PROP_INT, PROP_NONE); + prop = RNA_def_property(srna, "node_margin", PROP_INT, PROP_PIXEL); RNA_def_property_int_sdna(prop, NULL, "node_margin"); RNA_def_property_ui_text( prop, "Auto-offset Margin", "Minimum distance between nodes for Auto-offsetting nodes"); _______________________________________________ Bf-blender-cvs mailing list [email protected] https://lists.blender.org/mailman/listinfo/bf-blender-cvs
