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:
authorCampbell Barton <ideasman42@gmail.com>2011-09-26 13:31:24 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-09-26 13:31:24 +0400
commit0aa19de52ff0b65352268f1d3728922be48e1c47 (patch)
tree4e244dcacc04ba53f12a9d534896342a88619c6d
parentf0cceedd7ac61464ffea0ede7893c03d998ac7e6 (diff)
add missing imports to wm.py and remove "." from rna descriptions.
-rw-r--r--release/scripts/startup/bl_operators/wm.py2
-rw-r--r--source/blender/makesrna/intern/rna_particle.c5
2 files changed, 4 insertions, 3 deletions
diff --git a/release/scripts/startup/bl_operators/wm.py b/release/scripts/startup/bl_operators/wm.py
index 41dd0eaf64f..d4ed8879e40 100644
--- a/release/scripts/startup/bl_operators/wm.py
+++ b/release/scripts/startup/bl_operators/wm.py
@@ -1321,6 +1321,7 @@ class WM_OT_keyconfig_import(Operator):
)
def execute(self, context):
+ import os
from os.path import basename
import shutil
@@ -1826,6 +1827,7 @@ class WM_OT_addon_remove(Operator):
@staticmethod
def path_from_addon(module):
+ import os
import addon_utils
for mod in addon_utils.modules(addon_utils.addons_fake_modules):
diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c
index 56738dd9f11..1d8a91861d6 100644
--- a/source/blender/makesrna/intern/rna_particle.c
+++ b/source/blender/makesrna/intern/rna_particle.c
@@ -2068,7 +2068,7 @@ static void rna_def_particle_settings(BlenderRNA *brna)
prop= RNA_def_property(srna, "courant_target", PROP_FLOAT, PROP_NONE);
RNA_def_property_range(prop, 0.01, 10);
RNA_def_property_float_default(prop, 0.2);
- RNA_def_property_ui_text(prop, "Adaptive Subframe Threshold", "The relative distance a particle can move before requiring more subframes (target Courant number). 0.1-0.3 is the recommended range.");
+ RNA_def_property_ui_text(prop, "Adaptive Subframe Threshold", "The relative distance a particle can move before requiring more subframes (target Courant number). 0.1-0.3 is the recommended range");
RNA_def_property_update(prop, 0, "rna_Particle_reset");
prop= RNA_def_property(srna, "jitter_factor", PROP_FLOAT, PROP_NONE);
@@ -2881,7 +2881,7 @@ static void rna_def_particle_system(BlenderRNA *brna)
* ParticleSettings.courant_target instead. */
prop= RNA_def_property(srna, "dt_frac", PROP_FLOAT, PROP_NONE);
RNA_def_property_range(prop, 1.0f/101.0f, 1.0f);
- RNA_def_property_ui_text(prop, "Timestep", "The current simulation time step size, as a fraction of a frame.");
+ RNA_def_property_ui_text(prop, "Timestep", "The current simulation time step size, as a fraction of a frame");
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
RNA_def_struct_path_func(srna, "rna_ParticleSystem_path");
@@ -2903,4 +2903,3 @@ void RNA_def_particle(BlenderRNA *brna)
}
#endif
-