[Bf-blender-cvs] [8308a051b49] greasepencil-object: Cleanup: Remove redundant code + note some code issues to fix
Joshua Leung
noreply at git.blender.org
Fri Jun 29 16:57:52 CEST 2018
Commit: 8308a051b49f2ebed061633231ad7fc1d5cddedd
Author: Joshua Leung
Date: Sat Jun 30 02:42:15 2018 +1200
Branches: greasepencil-object
https://developer.blender.org/rB8308a051b49f2ebed061633231ad7fc1d5cddedd
Cleanup: Remove redundant code + note some code issues to fix
===================================================================
M release/scripts/startup/bl_ui/properties_scene.py
M release/scripts/startup/bl_ui/space_view3d.py
M source/blender/editors/gpencil/annotate_draw.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/properties_scene.py b/release/scripts/startup/bl_ui/properties_scene.py
index 0767dced6f5..d7f7bba7f20 100644
--- a/release/scripts/startup/bl_ui/properties_scene.py
+++ b/release/scripts/startup/bl_ui/properties_scene.py
@@ -31,9 +31,6 @@ from .properties_physics_common import (
point_cache_ui,
effector_weights_ui,
)
-from .properties_grease_pencil_common import (
- GreasePencilDataPanel
- )
class SCENE_PT_units_length_presets(PresetMenu):
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index f71fb5517d7..a0d06f65477 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -4129,6 +4129,7 @@ class VIEW3D_PT_quad_view(Panel):
row.prop(region, "use_box_clip")
+# TODO: Move to Overlays popover (when in GP Object Draw Mode)
class VIEW3D_PT_gp_paper(Panel):
bl_space_type = 'VIEW_3D'
bl_region_type = 'UI'
@@ -4270,6 +4271,7 @@ class VIEW3D_PT_context_properties(Panel):
# Grease Pencil multiframe falloff tools
+# FIXME: Name breaks conventions
class VIEW3D_PT_GreasePencilMultiFrame(Panel):
bl_space_type = 'VIEW_3D'
bl_region_type = 'HEADER'
diff --git a/source/blender/editors/gpencil/annotate_draw.c b/source/blender/editors/gpencil/annotate_draw.c
index 6a769c62c67..e1dfd150874 100644
--- a/source/blender/editors/gpencil/annotate_draw.c
+++ b/source/blender/editors/gpencil/annotate_draw.c
@@ -1091,13 +1091,6 @@ void ED_gpencil_draw_view3d(wmWindowManager *wm,
dflag |= GP_DRAWDATA_NOSTATUS;
}
- if ((wm == NULL) || ED_screen_animation_playing(wm)) {
- /* don't show onionskins during animation playback/scrub (i.e. it obscures the poses)
- * OpenGL Renders (i.e. final output), or depth buffer (i.e. not real strokes)
- */
- dflag |= GP_DRAWDATA_NO_ONIONS;
- }
-
/* draw it! */
gp_draw_data_all(scene, gpd, offsx, offsy, winx, winy, CFRA, dflag, v3d->spacetype);
}
More information about the Bf-blender-cvs
mailing list