Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
B
blender-embree3
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
blender
blender-embree3
Commits
5f18d863
Commit
5f18d863
authored
11 years ago
by
Joshua Leung
Browse files
Options
Downloads
Patches
Plain Diff
Bugfix: Toggling "auto-blends" option on NLA Strips doesn't update them immediately
parent
4ff3ec83
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
source/blender/makesrna/intern/rna_nla.c
+23
-0
23 additions, 0 deletions
source/blender/makesrna/intern/rna_nla.c
with
23 additions
and
0 deletions
source/blender/makesrna/intern/rna_nla.c
+
23
−
0
View file @
5f18d863
...
@@ -231,6 +231,28 @@ static void rna_NlaStrip_blend_out_set(PointerRNA *ptr, float value)
...
@@ -231,6 +231,28 @@ static void rna_NlaStrip_blend_out_set(PointerRNA *ptr, float value)
data
->
blendout
=
value
;
data
->
blendout
=
value
;
}
}
static
void
rna_NlaStrip_use_auto_blend_set
(
PointerRNA
*
ptr
,
int
value
)
{
NlaStrip
*
data
=
(
NlaStrip
*
)
ptr
->
data
;
if
(
value
)
{
/* set the flag, then make sure a curve for this exists */
data
->
flag
|=
NLASTRIP_FLAG_USR_INFLUENCE
;
/* validate state to ensure that auto-blend gets applied immediately */
if
(
ptr
->
id
.
data
)
{
IdAdtTemplate
*
iat
=
(
IdAdtTemplate
*
)
ptr
->
id
.
data
;
if
(
iat
->
adt
)
{
BKE_nla_validate_state
(
iat
->
adt
);
}
}
}
else
{
data
->
flag
&=
~
NLASTRIP_FLAG_USR_INFLUENCE
;
}
}
static
int
rna_NlaStrip_action_editable
(
PointerRNA
*
ptr
)
static
int
rna_NlaStrip_action_editable
(
PointerRNA
*
ptr
)
{
{
NlaStrip
*
strip
=
(
NlaStrip
*
)
ptr
->
data
;
NlaStrip
*
strip
=
(
NlaStrip
*
)
ptr
->
data
;
...
@@ -502,6 +524,7 @@ static void rna_def_nlastrip(BlenderRNA *brna)
...
@@ -502,6 +524,7 @@ static void rna_def_nlastrip(BlenderRNA *brna)
prop
=
RNA_def_property
(
srna
,
"use_auto_blend"
,
PROP_BOOLEAN
,
PROP_NONE
);
prop
=
RNA_def_property
(
srna
,
"use_auto_blend"
,
PROP_BOOLEAN
,
PROP_NONE
);
RNA_def_property_boolean_sdna
(
prop
,
NULL
,
"flag"
,
NLASTRIP_FLAG_AUTO_BLENDS
);
RNA_def_property_boolean_sdna
(
prop
,
NULL
,
"flag"
,
NLASTRIP_FLAG_AUTO_BLENDS
);
RNA_def_property_boolean_funcs
(
prop
,
NULL
,
"rna_NlaStrip_use_auto_blend_set"
);
RNA_def_property_ui_text
(
prop
,
"Auto Blend In/Out"
,
RNA_def_property_ui_text
(
prop
,
"Auto Blend In/Out"
,
"Number of frames for Blending In/Out is automatically determined from "
"Number of frames for Blending In/Out is automatically determined from "
"overlapping strips"
);
"overlapping strips"
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment