[Bf-blender-cvs] [401cdb36f8d] greasepencil-object: Merge branch 'blender2.8' into greasepencil-object
Antonio Vazquez
noreply at git.blender.org
Wed Jun 13 16:38:33 CEST 2018
Commit: 401cdb36f8d8578a6173a26abf461d7b4bb9da6b
Author: Antonio Vazquez
Date: Wed Jun 13 16:27:34 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB401cdb36f8d8578a6173a26abf461d7b4bb9da6b
Merge branch 'blender2.8' into greasepencil-object
Conflicts:
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/gpencil.c
source/blender/editors/gpencil/gpencil_data.c
source/blender/editors/gpencil/gpencil_paint.c
source/blender/editors/space_view3d/view3d_manipulator_ruler.c
source/blender/editors/space_view3d/view3d_ruler.c
source/blender/makesrna/intern/rna_main_api.c
===================================================================
===================================================================
diff --cc release/scripts/startup/bl_ui/properties_scene.py
index 9e657e992af,9c5cf3a4d6d..70b2ed691f1
--- a/release/scripts/startup/bl_ui/properties_scene.py
+++ b/release/scripts/startup/bl_ui/properties_scene.py
@@@ -25,17 -25,15 +25,18 @@@ from bpy.types import
)
from rna_prop_ui import PropertyPanel
+ from bl_operators.presets import PresetMenu
from .properties_physics_common import (
- point_cache_ui,
- effector_weights_ui,
-)
+ point_cache_ui,
+ effector_weights_ui,
+ )
+from .properties_grease_pencil_common import (
+ GreasePencilDataPanel
+ )
- class SCENE_MT_units_length_presets(Menu):
+ class SCENE_MT_units_length_presets(PresetMenu):
"""Unit of measure for properties that use length values"""
bl_label = "Unit Presets"
preset_subdir = "units_length"
diff --cc release/scripts/startup/bl_ui/space_clip.py
index 7393b2c00dd,91e725b451d..01684f36624
--- a/release/scripts/startup/bl_ui/space_clip.py
+++ b/release/scripts/startup/bl_ui/space_clip.py
@@@ -21,14 -21,16 +21,15 @@@
import bpy
from bpy.types import Panel, Header, Menu, UIList
from bpy.app.translations import pgettext_iface as iface_
+ from bl_operators.presets import PresetMenu
from .properties_grease_pencil_common import (
- GreasePencilDrawingToolsPanel,
- GreasePencilStrokeEditPanel,
- GreasePencilStrokeSculptPanel,
- GreasePencilBrushPanel,
- GreasePencilBrushCurvesPanel,
- GreasePencilDataPanel,
- GreasePencilPaletteColorPanel,
-)
+ GreasePencilDrawingToolsPanel,
+ GreasePencilStrokeEditPanel,
+ GreasePencilStrokeSculptPanel,
+ GreasePencilBrushPanel,
+ GreasePencilPaletteColorPanel,
+ GreasePencilBrushCurvesPanel,
+ GreasePencilDataPanel)
class CLIP_UL_tracking_objects(UIList):
diff --cc release/scripts/startup/bl_ui/space_node.py
index 1388add301e,7c9c47f8eb8..0fc05c88d50
--- a/release/scripts/startup/bl_ui/space_node.py
+++ b/release/scripts/startup/bl_ui/space_node.py
@@@ -21,16 -21,17 +21,17 @@@ import bp
import nodeitems_utils
from bpy.types import Header, Menu, Panel
from bpy.app.translations import pgettext_iface as iface_
+ from bl_operators.presets import PresetMenu
from .properties_grease_pencil_common import (
- GreasePencilDrawingToolsPanel,
- GreasePencilStrokeEditPanel,
- GreasePencilStrokeSculptPanel,
- GreasePencilBrushPanel,
- GreasePencilBrushCurvesPanel,
- GreasePencilDataPanel,
- GreasePencilPaletteColorPanel,
- GreasePencilToolsPanel
-)
+ GreasePencilDrawingToolsPanel,
+ GreasePencilStrokeEditPanel,
+ GreasePencilStrokeSculptPanel,
+ GreasePencilBrushPanel,
+ GreasePencilPaletteColorPanel,
+ GreasePencilBrushCurvesPanel,
+ GreasePencilDataPanel,
+ GreasePencilToolsPanel
+ )
class NODE_HT_header(Header):
diff --cc release/scripts/startup/bl_ui/space_view3d.py
index 3e683cdf78c,f371cad6d72..6236def3d9b
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@@ -73,73 -77,18 +73,73 @@@ class VIEW3D_HT_header(Header)
row.operator("pose.paste", text="", icon='PASTEDOWN').flipped = False
row.operator("pose.paste", text="", icon='PASTEFLIPDOWN').flipped = True
- # GPencil
- if context.gpencil_data and context.gpencil_data.use_stroke_edit_mode:
- row = layout.row(align=True)
- row.operator("gpencil.copy", text="", icon='COPYDOWN')
- row.operator("gpencil.paste", text="", icon='PASTEDOWN')
+ # Grease Pencil
+ # GPXX this is a hack while we merge to keep all running
+ if context.active_object and context.gpencil_data and context.active_object.type == 'GPENCIL':
+ ob = context.active_object
+ gpd = context.gpencil_data
+
+ if gpd.is_stroke_paint_mode:
+ layout.popover_group(space_type='PROPERTIES', region_type='WINDOW', context=".greasepencil_paint",
+ category="")
+ elif gpd.use_stroke_edit_mode:
+ layout.popover_group(space_type='PROPERTIES', region_type='WINDOW', context=".greasepencil_edit",
+ category="")
+ elif gpd.is_stroke_sculpt_mode:
+ layout.popover_group(space_type='PROPERTIES', region_type='WINDOW', context=".greasepencil_sculpt",
+ category="")
+ elif gpd.is_stroke_weight_mode:
+ layout.popover_group(space_type='PROPERTIES', region_type='WINDOW', context=".greasepencil_weight",
+ category="")
+
+ if gpd.is_stroke_paint_mode:
+ row = layout.row()
+ row.prop(toolsettings, "gpencil_stroke_placement_view3d", text='')
+ if toolsettings.gpencil_stroke_placement_view3d in('ORIGIN', 'CURSOR'):
+ row.prop(toolsettings.gpencil_sculpt, "lockaxis", text='')
- # XXX: icon
- layout.prop(context.gpencil_data, "use_onion_skinning", text="Onion Skins", icon='PARTICLE_PATH')
+ if toolsettings.gpencil_stroke_placement_view3d in ('SURFACE', 'STROKE'):
+ row.prop(toolsettings, "use_gpencil_stroke_endpoints")
- row = layout.row(align=True)
- row.prop(tool_settings.gpencil_sculpt, "use_select_mask")
- row.prop(tool_settings.gpencil_sculpt, "selection_alpha", slider=True)
+ if gpd.use_stroke_edit_mode or gpd.is_stroke_sculpt_mode or gpd.is_stroke_weight_mode:
+ row = layout.row(align=True)
+ row.prop(gpd, "use_multiedit", text="", icon="FORCE_HARMONIC")
+
+ sub = row.row(align=True)
+ sub.active = gpd.use_multiedit
+ sub.popover(
+ space_type='VIEW_3D',
+ region_type='HEADER',
+ panel_type="VIEW3D_PT_GreasePencilMultiFrame",
+ text="Multiframe"
+ )
+
+ if gpd.is_stroke_sculpt_mode:
+ settings = context.tool_settings.gpencil_sculpt
+ if settings.tool in ('GRAB', 'PUSH', 'TWIST', 'PINCH', 'RANDOMIZE'):
+ row = layout.row()
+ row.prop(toolsettings.gpencil_sculpt, "lockaxis", text='')
+
+ if gpd.use_stroke_edit_mode:
+ row = layout.row(align=True)
+ row.operator("gpencil.copy", text="", icon='COPYDOWN')
+ row.operator("gpencil.paste", text="", icon='PASTEDOWN')
+
+ view = context.space_data
+ row = layout.row()
+ row.prop(view, "use_gpencil_paper", text="", icon='GHOST')
+
+ row.prop(gpd, "use_onion_skinning", text="Onion Skins", icon='PARTICLE_PATH')
+ row.prop(gpd, "show_edit_lines", text="", icon="PARTICLE_POINT")
+
+ if gpd.use_stroke_edit_mode or gpd.is_stroke_sculpt_mode:
+ row = layout.row(align=True)
- row.prop(context.tool_settings.gpencil_sculpt, "use_select_mask")
- row.prop(context.tool_settings.gpencil_sculpt, "selection_alpha", slider=True)
++ row.prop(tool_settings.gpencil_sculpt, "use_select_mask")
++ row.prop(tool_settings.gpencil_sculpt, "selection_alpha", slider=True)
+
+ if gpd.is_stroke_paint_mode:
+ row = layout.row(align=True)
+ row.operator("gpencil.colorpick", text="Colors", icon="GROUP_VCOL")
VIEW3D_MT_editor_menus.draw_collapsible(context, layout)
@@@ -3446,10 -3404,10 +3459,10 @@@ class VIEW3D_MT_edit_armature_delete(Me
class VIEW3D_MT_edit_gpencil(Menu):
- bl_label = "GPencil"
+ bl_label = "Strokes"
def draw(self, context):
- toolsettings = context.tool_settings
+ tool_settings = context.tool_settings
layout = self.layout
diff --cc source/blender/editors/gpencil/gpencil_data.c
index 96678cb3928,9f437f28f0f..0e1906139b8
--- a/source/blender/editors/gpencil/gpencil_data.c
+++ b/source/blender/editors/gpencil/gpencil_data.c
@@@ -56,21 -50,14 +56,21 @@@
#include "DNA_screen_types.h"
#include "DNA_space_types.h"
#include "DNA_view3d_types.h"
-#include "DNA_gpencil_types.h"
-#include "BKE_colortools.h"
+#include "BKE_main.h"
+#include "BKE_brush.h"
+#include "BKE_animsys.h"
- #include "BKE_colortools.h"
#include "BKE_context.h"
+#include "BKE_deform.h"
+#include "BKE_fcurve.h"
+#include "BKE_global.h"
#include "BKE_gpencil.h"
#include "BKE_library.h"
+ #include "BKE_main.h"
+#include "BKE_modifier.h"
#include "BKE_object.h"
+#include "BKE_material.h"
+#include "BKE_paint.h"
#include "BKE_report.h"
#include "BKE_scene.h"
#include "BKE_screen.h"
@@@ -102,7 -84,9 +102,8 @@@
/* add new datablock - wrapper around API */
static int gp_data_add_exec(bContext *C, wmOperator *op)
{
+ Main *bmain = CTX_data_main(C);
bGPdata **gpd_ptr = ED_gpencil_data_get_pointers(C, NULL);
- ToolSettings *ts = CTX_data_tool_settings(C);
if (gpd_ptr == NULL) {
BKE_report(op->reports, RPT_ERROR, "Nowhere for grease pencil data to go");
@@@ -197,7 -185,9 +198,8 @@@ void GPENCIL_OT_data_unlink(wmOperatorT
/* add new layer - wrapper around API */
static int gp_layer_add_exec(bContext *C, wmOperator *op)
{
+ Main *bmain = CTX_data_main(C);
bGPdata **gpd_ptr = ED_gpencil_data_get_pointers(C, NULL);
- ToolSettings *ts = CTX_data_tool_settings(C);
/* if there's no existing Grease-Pencil data there, add some */
if (gpd_ptr == NULL) {
diff --cc source/blender/editors/gpencil/gpencil_paint.c
index b6ec2145895,6afa6f41828..f92dbc31c2e
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@@ -1635,8 -1385,9 +1635,9 @@@ static void gp_init_colors(tGPsdata *p
}
/* (re)init new painting data */
-static bool gp_session_initdata(bContext *C, tGPsdata *p)
+static bool gp_
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list