diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-02-11 08:10:50 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-11 08:10:50 +0400 |
| commit | 5ea86e1e2b09b58a72992083f79c03ee3f20af49 (patch) | |
| tree | 79d682900c73c4a87aa90a8d9dbd293c4396013e /release | |
| parent | dd2b4a05c3dc527bc0c459f81f5810e6ecb151a6 (diff) | |
| parent | 758c2282635f77ee1317d4bdbdf1959bf0c09525 (diff) | |
svn merge ^/trunk/blender -r43995:44024
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/startup/bl_operators/clip.py | 1 | ||||
| -rw-r--r-- | release/scripts/startup/bl_operators/presets.py | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/release/scripts/startup/bl_operators/clip.py b/release/scripts/startup/bl_operators/clip.py index 9e4a5819961..7a80b432c3a 100644 --- a/release/scripts/startup/bl_operators/clip.py +++ b/release/scripts/startup/bl_operators/clip.py @@ -143,6 +143,7 @@ class CLIP_OT_track_to_empty(Operator): if constraint is None: constraint = ob.constraints.new(type='FOLLOW_TRACK') + constraint.use_active_clip = False constraint.clip = sc.clip constraint.track = track.name constraint.use_3d_position = False diff --git a/release/scripts/startup/bl_operators/presets.py b/release/scripts/startup/bl_operators/presets.py index 946543cc864..f317295d2e5 100644 --- a/release/scripts/startup/bl_operators/presets.py +++ b/release/scripts/startup/bl_operators/presets.py @@ -35,10 +35,11 @@ class AddPresetBase(): name="Name", description="Name of the preset, used to make the path name", maxlen=64, + options={'SKIP_SAVE'}, ) remove_active = bpy.props.BoolProperty( default=False, - options={'HIDDEN'}, + options={'HIDDEN', 'SKIP_SAVE'}, ) @staticmethod |