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>2010-08-22 20:33:26 +0400
committerCampbell Barton <ideasman42@gmail.com>2010-08-22 20:33:26 +0400
commit0267f6a0a38720a55397d41b254b6641b66ae2c1 (patch)
tree2cbc9fffc5eb4017611bc0e01011456a0abae15a /release
parentcb678f1020e6b3d7c57f1a329a40fc98badb2132 (diff)
patch [#23449] RNA renaming bugs
from Jacob F (raccoon)
Diffstat (limited to 'release')
-rw-r--r--release/scripts/ui/properties_game.py2
-rw-r--r--release/scripts/ui/properties_texture.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/release/scripts/ui/properties_game.py b/release/scripts/ui/properties_game.py
index f90a5446557..7735db8228c 100644
--- a/release/scripts/ui/properties_game.py
+++ b/release/scripts/ui/properties_game.py
@@ -140,7 +140,7 @@ class PHYSICS_PT_game_physics(PhysicsButtonsPanel, bpy.types.Panel):
col.prop(soft, "use_cluster_rigid_to_softbody")
col.prop(soft, "use_cluster_soft_to_softbody")
sub = col.column()
- sub.active = (soft.cluster_rigid_to_softbody or soft.use_cluster_soft_to_softbody)
+ sub.active = (soft.use_cluster_rigid_to_softbody or soft.use_cluster_soft_to_softbody)
sub.prop(soft, "cluster_iterations", text="Iterations")
elif game.physics_type == 'STATIC':
diff --git a/release/scripts/ui/properties_texture.py b/release/scripts/ui/properties_texture.py
index 220d5555964..5163ae884ed 100644
--- a/release/scripts/ui/properties_texture.py
+++ b/release/scripts/ui/properties_texture.py
@@ -581,7 +581,7 @@ def texture_filter_common(tex, layout):
layout.label(text="Filter:")
layout.prop(tex, "filter_type", text="")
if tex.use_mipmap and tex.filter_type in ('AREA', 'EWA', 'FELINE'):
- if tex.filter == 'FELINE':
+ if tex.filter_type == 'FELINE':
layout.prop(tex, "filter_probes", text="Probes")
else:
layout.prop(tex, "filter_eccentricity", text="Eccentricity")