Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2016-02-23 16:32:28 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-02-23 16:32:57 +0300
commit509953a9db61dc298eae3800e381254bbc80fe06 (patch)
treea94c5664aedb29a2d505095b172ad27a7168e041
parent6ac0d357d68d35dc24be9c77fc48abfe20fb3657 (diff)
Remove unused "Free Unused" option from compositor
It was basically doing nothing, for ages.
-rw-r--r--release/scripts/startup/bl_ui/properties_render.py1
-rw-r--r--release/scripts/startup/bl_ui/space_node.py1
-rw-r--r--source/blender/makesdna/DNA_scene_types.h2
-rw-r--r--source/blender/makesrna/intern/rna_scene.c6
4 files changed, 1 insertions, 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);