[Bf-blender-cvs] [42c7d533b61] greasepencil-object: merge branch 'master' into greasepencil-object

[Antonio Vazquez]

Commit: 42c7d533b612711b2f6be8d40be3eb22e9a3ad06
Author: Antonio Vazquez
Date:   Tue Dec 17 17:19:11 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rB42c7d533b612711b2f6be8d40be3eb22e9a3ad06

merge branch 'master' into greasepencil-object

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

M	release/scripts/startup/bl_ui/space_userpref.py
M	source/blender/editors/io/io_usd.c
M	source/blender/editors/space_graph/graph_edit.c

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

diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py
index 3aecd7b9775..ae77b9df01b 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -2225,6 +2225,11 @@ class USERPREF_PT_experimental_virtual_reality(ExperimentalPanel, Panel):
 class USERPREF_PT_experimental_usd(ExperimentalPanel, Panel):
     bl_label = "Universal Scene Description"
 
+    @classmethod
+    def poll(cls, context):
+        # Only show the panel if Blender was actually built with USD support.
+        return getattr(bpy.app.build_options, 'usd', False)
+
     def draw_props(self, context, layout):
         prefs = context.preferences
 
diff --git a/source/blender/editors/io/io_usd.c b/source/blender/editors/io/io_usd.c
index 524d8d50b7b..2818b134509 100644
--- a/source/blender/editors/io/io_usd.c
+++ b/source/blender/editors/io/io_usd.c
@@ -176,7 +176,7 @@ void WM_OT_usd_export(struct wmOperatorType *ot)
                                  FILE_TYPE_FOLDER | FILE_TYPE_USD,
                                  FILE_BLENDER,
                                  FILE_SAVE,
-                                 WM_FILESEL_FILEPATH,
+                                 WM_FILESEL_FILEPATH | WM_FILESEL_SHOW_PROPS,
                                  FILE_DEFAULTDISPLAY,
                                  FILE_SORT_ALPHA);
 
diff --git a/source/blender/editors/space_graph/graph_edit.c b/source/blender/editors/space_graph/graph_edit.c
index 4d2772aabee..03df93e4c8a 100644
--- a/source/blender/editors/space_graph/graph_edit.c
+++ b/source/blender/editors/space_graph/graph_edit.c
@@ -1409,6 +1409,8 @@ static void decimate_exit(bContext *C, wmOperator *op)
   if (dgo == NULL) {
     return;
   }
+
+  ScrArea *sa = dgo->sa;
   LinkData *link;
 
   for (link = dgo->bezt_arr_list.first; link != NULL; link = link->next) {
@@ -1422,7 +1424,7 @@ static void decimate_exit(bContext *C, wmOperator *op)
 
   /* Return to normal cursor and header status. */
   WM_cursor_modal_restore(win);
-  ED_area_status_text(dgo->sa, NULL);
+  ED_area_status_text(sa, NULL);
 
   /* cleanup */
   op->customdata = NULL;