[Bf-blender-cvs] [9556e434b61] greasepencil-object: Fix errors after merge

Antonio Vazquez noreply at git.blender.org
Wed Jun 13 16:38:35 CEST 2018


Commit: 9556e434b616c7a8d2bd880ae21f716017d34453
Author: Antonio Vazquez
Date:   Wed Jun 13 16:38:23 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB9556e434b616c7a8d2bd880ae21f716017d34453

Fix errors after merge

===================================================================

M	release/scripts/startup/bl_ui/space_view3d.py
M	source/blender/editors/space_view3d/view3d_ruler.c

===================================================================

diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 6236def3d9b..9ded0e4dbb0 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -94,12 +94,12 @@ class VIEW3D_HT_header(Header):
 
             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='')
+                row.prop(tool_settings, "gpencil_stroke_placement_view3d", text='')
+                if tool_settings.gpencil_stroke_placement_view3d in('ORIGIN', 'CURSOR'):
+                    row.prop(tool_settings.gpencil_sculpt, "lockaxis", text='')
 
-                if toolsettings.gpencil_stroke_placement_view3d in ('SURFACE', 'STROKE'):
-                    row.prop(toolsettings, "use_gpencil_stroke_endpoints")
+                if tool_settings.gpencil_stroke_placement_view3d in ('SURFACE', 'STROKE'):
+                    row.prop(tool_settings, "use_gpencil_stroke_endpoints")
 
             if gpd.use_stroke_edit_mode or gpd.is_stroke_sculpt_mode or gpd.is_stroke_weight_mode:
                 row = layout.row(align=True)
@@ -118,7 +118,7 @@ class VIEW3D_HT_header(Header):
                 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='')
+                    row.prop(tool_settings.gpencil_sculpt, "lockaxis", text='')
 
             if gpd.use_stroke_edit_mode:
                 row = layout.row(align=True)
diff --git a/source/blender/editors/space_view3d/view3d_ruler.c b/source/blender/editors/space_view3d/view3d_ruler.c
index 7aa7a55cbe7..cf1c761e606 100644
--- a/source/blender/editors/space_view3d/view3d_ruler.c
+++ b/source/blender/editors/space_view3d/view3d_ruler.c
@@ -303,7 +303,6 @@ static bool view3d_ruler_to_gpencil(bContext *C, RulerInfo *ruler_info)
 {
 	Main *bmain = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
-	Main *bmain = CTX_data_main(C);
 	Object *ob = CTX_data_active_object(C);
 
 	bGPDlayer *gpl;



More information about the Bf-blender-cvs mailing list