diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-05-08 13:35:38 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-05-08 13:35:52 +0300 |
| commit | 3bbb4020e7f0fae80a5edd31e19b7fa97d2149e4 (patch) | |
| tree | d4d3b3d1a5d07bc6a2e5947972668ec4cbf58041 | |
| parent | 900fc43bb4f366764f3a3b04929829ad7abf15ae (diff) | |
Motionpaths: Use scene range option, takes start/end frame and preview
settings into account.
| -rw-r--r-- | source/blender/editors/space_view3d/drawanimviz.c | 4 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_action_types.h | 1 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_animviz.c | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/editors/space_view3d/drawanimviz.c b/source/blender/editors/space_view3d/drawanimviz.c index d753ad68fcc..aa06f5ec716 100644 --- a/source/blender/editors/space_view3d/drawanimviz.c +++ b/source/blender/editors/space_view3d/drawanimviz.c @@ -95,6 +95,10 @@ void draw_motion_path_instance(Scene *scene, sfra = CFRA - avs->path_bc; efra = CFRA + avs->path_ac; } + else if (avs->path_type == MOTIONPATH_TYPE_SCENE_RANGE) { + sfra = PSFRA; + efra = PEFRA; + } else { /* Use the current display range */ sfra = avs->path_sf; diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h index 761e76eb249..bc30c7f9fb2 100644 --- a/source/blender/makesdna/DNA_action_types.h +++ b/source/blender/makesdna/DNA_action_types.h @@ -148,6 +148,7 @@ typedef enum eMotionPaths_Types { MOTIONPATH_TYPE_RANGE = 0, /* only show the parts of the paths around the current frame */ MOTIONPATH_TYPE_ACFRA = 1, + MOTIONPATH_TYPE_SCENE_RANGE = 2, } eMotionPath_Types; /* bAnimVizSettings->path_viewflag */ diff --git a/source/blender/makesrna/intern/rna_animviz.c b/source/blender/makesrna/intern/rna_animviz.c index 719eb9f8a20..f156f616196 100644 --- a/source/blender/makesrna/intern/rna_animviz.c +++ b/source/blender/makesrna/intern/rna_animviz.c @@ -252,6 +252,7 @@ static void rna_def_animviz_paths(BlenderRNA *brna) {MOTIONPATH_TYPE_ACFRA, "CURRENT_FRAME", 0, "Around Frame", "Display Paths of poses within a fixed number of frames around the current frame"}, {MOTIONPATH_TYPE_RANGE, "RANGE", 0, "In Range", "Display Paths of poses within specified range"}, + {MOTIONPATH_TYPE_SCENE_RANGE, "SCENE", 0, "Scene Range", "Display Paths based on scene start/end frames (preview setting taken into account)"}, {0, NULL, 0, NULL, NULL} }; |