From 509953a9db61dc298eae3800e381254bbc80fe06 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Tue, 23 Feb 2016 14:32:28 +0100 Subject: Remove unused "Free Unused" option from compositor It was basically doing nothing, for ages. --- release/scripts/startup/bl_ui/properties_render.py | 1 - release/scripts/startup/bl_ui/space_node.py | 1 - source/blender/makesdna/DNA_scene_types.h | 2 +- source/blender/makesrna/intern/rna_scene.c | 6 ------ 4 files changed, 1 insertion(+), 9 deletions(-) diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py index 1f1802aa373..6c4904939bf 100644 --- a/release/scripts/startup/bl_ui/properties_render.py +++ b/release/scripts/startup/bl_ui/properties_render.py @@ -284,7 +284,6 @@ class RENDER_PT_performance(RenderButtonsPanel, Panel): sub = col.column() sub.active = rd.use_compositing sub.prop(rd, "use_free_image_textures") - sub.prop(rd, "use_free_unused_nodes") sub = col.column() sub.active = rd.use_raytrace sub.label(text="Acceleration structure:") diff --git a/release/scripts/startup/bl_ui/space_node.py b/release/scripts/startup/bl_ui/space_node.py index c648093ff1d..986edc7405b 100644 --- a/release/scripts/startup/bl_ui/space_node.py +++ b/release/scripts/startup/bl_ui/space_node.py @@ -100,7 +100,6 @@ class NODE_HT_header(Header): elif snode.tree_type == 'CompositorNodeTree': if snode_id: layout.prop(snode_id, "use_nodes") - layout.prop(snode_id.render, "use_free_unused_nodes", text="Free Unused") layout.prop(snode, "show_backdrop") if snode.show_backdrop: row = layout.row(align=True) diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index ef6d4ac4481..61562e5c014 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -1645,7 +1645,7 @@ typedef struct Scene { #define R_FREE_IMAGE 0x0100 #define R_SINGLE_LAYER 0x0200 #define R_EXR_TILE_FILE 0x0400 -#define R_COMP_FREE 0x0800 +/* #define R_COMP_FREE 0x0800 */ #define R_NO_IMAGE_LOAD 0x1000 #define R_NO_TEX 0x2000 #define R_NO_FRAME_UPDATE 0x4000 diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index e0f3708b338..7505dc28210 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -5617,12 +5617,6 @@ static void rna_def_scene_render_data(BlenderRNA *brna) "Free all image textures from memory after render, to save memory before compositing"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); - prop = RNA_def_property(srna, "use_free_unused_nodes", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_sdna(prop, NULL, "scemode", R_COMP_FREE); - RNA_def_property_ui_text(prop, "Free Unused Nodes", - "Free Nodes that are not used while compositing, to save memory"); - RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); - prop = RNA_def_property(srna, "use_save_buffers", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "scemode", R_EXR_TILE_FILE); RNA_def_property_boolean_funcs(prop, "rna_RenderSettings_save_buffers_get", NULL); -- cgit v1.2.3