From 1f96dd2e0bb7440002b24c98e4c9d7daa44f2ebd Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 15 May 2017 13:47:48 +0200 Subject: Fix T51348: Node highlighting is broken This feature was disabled in the code but not in the interface. Removing the code, since it needs full re-implementation anyway. --- source/blender/makesrna/intern/rna_space.c | 5 ----- 1 file changed, 5 deletions(-) (limited to 'source/blender/makesrna') diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index 7bb17adbc5a..c71af054c02 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -4410,11 +4410,6 @@ static void rna_def_space_node(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Draw Channels", "Channels of the image to draw"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_NODE_VIEW, NULL); - prop = RNA_def_property(srna, "show_highlight", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_sdna(prop, NULL, "flag", SNODE_SHOW_HIGHLIGHT); - RNA_def_property_ui_text(prop, "Highlight", "Highlight nodes that are being calculated"); - RNA_def_property_update(prop, NC_SPACE | ND_SPACE_NODE_VIEW, NULL); - /* the mx/my "cursor" in the node editor is used only by operators to store the mouse position */ prop = RNA_def_property(srna, "cursor_location", PROP_FLOAT, PROP_XYZ); RNA_def_property_array(prop, 2); -- cgit v1.2.3 From 4621583612fa40d90fa89dfc32686d39dc596714 Mon Sep 17 00:00:00 2001 From: Aaron Carlisle Date: Mon, 15 May 2017 14:29:59 -0400 Subject: Fix T51297: Use A Higher Hair Segment Limit Normally, segments up to 50 can be quite enough for most cases. However, when dealing with things like braids, the current limit can sometimes be quite a pain. --- source/blender/makesrna/intern/rna_particle.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source/blender/makesrna') diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c index 127c66a3a5a..ed1792c2ce7 100644 --- a/source/blender/makesrna/intern/rna_particle.c +++ b/source/blender/makesrna/intern/rna_particle.c @@ -2363,7 +2363,8 @@ static void rna_def_particle_settings(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Render", "How many steps paths are rendered with (power of 2)"); prop = RNA_def_property(srna, "hair_step", PROP_INT, PROP_NONE); - RNA_def_property_range(prop, 2, 50); + RNA_def_property_range(prop, 2, INT_MAX); + RNA_def_property_ui_range(prop, 2, 50, 1, -1); RNA_def_property_ui_text(prop, "Segments", "Number of hair segments"); RNA_def_property_update(prop, 0, "rna_Particle_reset"); -- cgit v1.2.3 From 15e8fbd5491cf1ed492cd0b4c9750fa783348093 Mon Sep 17 00:00:00 2001 From: Aaron Carlisle Date: Mon, 15 May 2017 16:43:33 -0400 Subject: Fix compile error on gcc after last commit error: static assertion failed: "invalid limits" --- source/blender/makesrna/intern/rna_particle.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/makesrna') diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c index ed1792c2ce7..3077a49c5cb 100644 --- a/source/blender/makesrna/intern/rna_particle.c +++ b/source/blender/makesrna/intern/rna_particle.c @@ -2364,7 +2364,7 @@ static void rna_def_particle_settings(BlenderRNA *brna) prop = RNA_def_property(srna, "hair_step", PROP_INT, PROP_NONE); RNA_def_property_range(prop, 2, INT_MAX); - RNA_def_property_ui_range(prop, 2, 50, 1, -1); + RNA_def_property_ui_range(prop, 2, 50, 1, 1); RNA_def_property_ui_text(prop, "Segments", "Number of hair segments"); RNA_def_property_update(prop, 0, "rna_Particle_reset"); -- cgit v1.2.3 From 12651aba03c768797cd4bafee5b0e8732e3194c3 Mon Sep 17 00:00:00 2001 From: Aaron Carlisle Date: Mon, 15 May 2017 17:28:01 -0400 Subject: Fix hair_step is a short --- source/blender/makesrna/intern/rna_particle.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/makesrna') diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c index 3077a49c5cb..3c3d88c858f 100644 --- a/source/blender/makesrna/intern/rna_particle.c +++ b/source/blender/makesrna/intern/rna_particle.c @@ -2363,7 +2363,7 @@ static void rna_def_particle_settings(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Render", "How many steps paths are rendered with (power of 2)"); prop = RNA_def_property(srna, "hair_step", PROP_INT, PROP_NONE); - RNA_def_property_range(prop, 2, INT_MAX); + RNA_def_property_range(prop, 2, SHRT_MAX); RNA_def_property_ui_range(prop, 2, 50, 1, 1); RNA_def_property_ui_text(prop, "Segments", "Number of hair segments"); RNA_def_property_update(prop, 0, "rna_Particle_reset"); -- cgit v1.2.3