[Bf-blender-cvs] [f2acf3bab68] master: Cleanup: use 'use_' prefix for RNA booleans

Campbell Barton noreply at git.blender.org
Mon Apr 29 04:07:17 CEST 2019


Commit: f2acf3bab68ab44396599d7998d34a2c4c3946e4
Author: Campbell Barton
Date:   Mon Apr 29 11:26:17 2019 +1000
Branches: master
https://developer.blender.org/rBf2acf3bab68ab44396599d7998d34a2c4c3946e4

Cleanup: use 'use_' prefix for RNA booleans

===================================================================

M	release/scripts/startup/bl_ui/space_sequencer.py
M	source/blender/makesrna/intern/rna_sequencer.c

===================================================================

diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py
index bd3eb2bc304..bc21daa2043 100644
--- a/release/scripts/startup/bl_ui/space_sequencer.py
+++ b/release/scripts/startup/bl_ui/space_sequencer.py
@@ -1177,10 +1177,10 @@ class SEQUENCER_PT_cache_settings(SequencerButtonsPanel, Panel):
         layout = self.layout
         ed = context.scene.sequence_editor
 
-        layout.prop(ed, "cache_raw")
-        layout.prop(ed, "cache_preprocessed")
-        layout.prop(ed, "cache_composite")
-        layout.prop(ed, "cache_final")
+        layout.prop(ed, "use_cache_raw")
+        layout.prop(ed, "use_cache_preprocessed")
+        layout.prop(ed, "use_cache_composite")
+        layout.prop(ed, "use_cache_final")
         layout.separator()
         layout.prop(ed, "recycle_max_cost")
 
@@ -1285,9 +1285,9 @@ class SEQUENCER_PT_strip_cache(SequencerButtonsPanel, Panel):
         strip = act_strip(context)
         layout.active = strip.override_cache_settings
 
-        layout.prop(strip, "cache_raw")
-        layout.prop(strip, "cache_preprocessed")
-        layout.prop(strip, "cache_composite")
+        layout.prop(strip, "use_cache_raw")
+        layout.prop(strip, "use_cache_preprocessed")
+        layout.prop(strip, "use_cache_composite")
 
 
 class SEQUENCER_PT_preview(SequencerButtonsPanel_Output, Panel):
diff --git a/source/blender/makesrna/intern/rna_sequencer.c b/source/blender/makesrna/intern/rna_sequencer.c
index 7daf4474eb6..0b1e35e3a74 100644
--- a/source/blender/makesrna/intern/rna_sequencer.c
+++ b/source/blender/makesrna/intern/rna_sequencer.c
@@ -1726,21 +1726,21 @@ static void rna_def_sequence(BlenderRNA *brna)
   RNA_def_property_ui_text(prop, "Modifiers", "Modifiers affecting this strip");
   rna_def_sequence_modifiers(brna, prop);
 
-  prop = RNA_def_property(srna, "cache_raw", PROP_BOOLEAN, PROP_NONE);
+  prop = RNA_def_property(srna, "use_cache_raw", PROP_BOOLEAN, PROP_NONE);
   RNA_def_property_boolean_sdna(prop, NULL, "cache_flag", SEQ_CACHE_STORE_RAW);
   RNA_def_property_ui_text(prop,
                            "Cache Raw",
                            "Cache raw images read from disk, for faster tweaking of strip "
                            "parameters at the cost of memory usage");
 
-  prop = RNA_def_property(srna, "cache_preprocessed", PROP_BOOLEAN, PROP_NONE);
+  prop = RNA_def_property(srna, "use_cache_preprocessed", PROP_BOOLEAN, PROP_NONE);
   RNA_def_property_boolean_sdna(prop, NULL, "cache_flag", SEQ_CACHE_STORE_PREPROCESSED);
   RNA_def_property_ui_text(
       prop,
       "Cache Rreprocessed",
       "Cache preprocessed images, for faster tweaking of effects at the cost of memory usage");
 
-  prop = RNA_def_property(srna, "cache_composite", PROP_BOOLEAN, PROP_NONE);
+  prop = RNA_def_property(srna, "use_cache_composite", PROP_BOOLEAN, PROP_NONE);
   RNA_def_property_boolean_sdna(prop, NULL, "cache_flag", SEQ_CACHE_STORE_COMPOSITE);
   RNA_def_property_ui_text(prop,
                            "Cache Composite",
@@ -1862,28 +1862,28 @@ static void rna_def_editor(BlenderRNA *brna)
   RNA_def_property_ui_text(prop, "Composite Images", "Visualize cached composite images");
   RNA_def_property_update(prop, NC_SCENE | ND_SEQUENCER, NULL);
 
-  prop = RNA_def_property(srna, "cache_raw", PROP_BOOLEAN, PROP_NONE);
+  prop = RNA_def_property(srna, "use_cache_raw", PROP_BOOLEAN, PROP_NONE);
   RNA_def_property_boolean_sdna(prop, NULL, "cache_flag", SEQ_CACHE_STORE_RAW);
   RNA_def_property_ui_text(prop,
                            "Cache Raw",
                            "Cache raw images read from disk, for faster tweaking of strip "
                            "parameters at the cost of memory usage");
 
-  prop = RNA_def_property(srna, "cache_preprocessed", PROP_BOOLEAN, PROP_NONE);
+  prop = RNA_def_property(srna, "use_cache_preprocessed", PROP_BOOLEAN, PROP_NONE);
   RNA_def_property_boolean_sdna(prop, NULL, "cache_flag", SEQ_CACHE_STORE_PREPROCESSED);
   RNA_def_property_ui_text(
       prop,
       "Cache Preprocessed",
       "Cache preprocessed images, for faster tweaking of effects at the cost of memory usage");
 
-  prop = RNA_def_property(srna, "cache_composite", PROP_BOOLEAN, PROP_NONE);
+  prop = RNA_def_property(srna, "use_cache_composite", PROP_BOOLEAN, PROP_NONE);
   RNA_def_property_boolean_sdna(prop, NULL, "cache_flag", SEQ_CACHE_STORE_COMPOSITE);
   RNA_def_property_ui_text(prop,
                            "Cache Composite",
                            "Cache intermediate composited images, for faster tweaking of stacked "
                            "strips at the cost of memory usage");
 
-  prop = RNA_def_property(srna, "cache_final", PROP_BOOLEAN, PROP_NONE);
+  prop = RNA_def_property(srna, "use_cache_final", PROP_BOOLEAN, PROP_NONE);
   RNA_def_property_boolean_sdna(prop, NULL, "cache_flag", SEQ_CACHE_STORE_FINAL_OUT);
   RNA_def_property_ui_text(prop, "Cache Final", "Cache final image for each frame");



More information about the Bf-blender-cvs mailing list