[Bf-blender-cvs] [c494f6cc8d8] greasepencil-object: Set GP modes from outliner

[Antonio Vazquez]

Commit: c494f6cc8d857ede998cfc70857673ea1bb10d11
Author: Antonio Vazquez
Date:   Tue Jul 4 17:19:37 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rBc494f6cc8d857ede998cfc70857673ea1bb10d11

Set GP modes from outliner

Set special gp modes if the object is selected in outliner

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

M       source/blender/editors/space_outliner/outliner_select.c

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

diff --git a/source/blender/editors/space_outliner/outliner_select.c 
b/source/blender/editors/space_outliner/outliner_select.c
index 2ef7f54e355..e95b25bdb55 100644
--- a/source/blender/editors/space_outliner/outliner_select.c
+++ b/source/blender/editors/space_outliner/outliner_select.c
@@ -49,6 +49,7 @@
 #include "BKE_scene.h"
 #include "BKE_sequencer.h"
 #include "BKE_armature.h"
+#include "BKE_workspace.h"
 
 #include "DEG_depsgraph.h"
 
@@ -57,6 +58,7 @@
 #include "ED_screen.h"
 #include "ED_sequencer.h"
 #include "ED_util.h"
+#include "ED_gpencil.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
@@ -193,6 +195,25 @@ static eOLDrawState tree_element_set_active_object(
                }
        }
        
+       /* set special grease pencil modes */
+       if (ob->type == OB_GPENCIL) {
+               /* set cursor */
+               if (ob->mode == OB_MODE_GPENCIL_PAINT) {
+                       WM_cursor_modal_set(CTX_wm_window(C), 
BC_PAINTBRUSHCURSOR);
+                       ED_gpencil_toggle_brush_cursor(C, false);
+               }
+               else if (ob->mode == OB_MODE_GPENCIL_SCULPT) {
+                       WM_cursor_modal_set(CTX_wm_window(C), BC_CROSSCURSOR);
+                       ED_gpencil_toggle_brush_cursor(C, true);
+               }
+               else {
+                       WM_cursor_modal_set(CTX_wm_window(C), CURSOR_STD);
+                       ED_gpencil_toggle_brush_cursor(C, false);
+               }
+               /* set workspace mode */
+               BKE_workspace_object_mode_set(CTX_wm_workspace(C), ob->mode);
+       }
+
        if (ob != scene->obedit)
                ED_object_editmode_exit(C, EM_FREEDATA | EM_FREEUNDO | 
EM_WAITCURSOR | EM_DO_UNDO);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs