[Bf-blender-cvs] [ac2b609e4ee] soc-2020-io-performance: Fix UI: don't edit frame numbers if animation is disabled.

Ankit Meel noreply at git.blender.org
Tue Sep 29 19:20:18 CEST 2020


Commit: ac2b609e4eeebf3a78924f595606c5ee586240e9
Author: Ankit Meel
Date:   Tue Sep 29 19:41:24 2020 +0530
Branches: soc-2020-io-performance
https://developer.blender.org/rBac2b609e4eeebf3a78924f595606c5ee586240e9

Fix UI: don't edit frame numbers if animation is disabled.

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

M	source/blender/editors/io/io_obj.c

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

diff --git a/source/blender/editors/io/io_obj.c b/source/blender/editors/io/io_obj.c
index 7b8b1a03a78..f1ca5263a7d 100644
--- a/source/blender/editors/io/io_obj.c
+++ b/source/blender/editors/io/io_obj.c
@@ -216,7 +216,7 @@ static bool wm_obj_export_check(bContext *C, wmOperator *op)
     changed = true;
   }
 
-  if (RNA_boolean_get(op->ptr, "export_animation")) {
+  {
     int start = RNA_int_get(op->ptr, "start_frame");
     int end = RNA_int_get(op->ptr, "end_frame");
     /* Set the defaults. */
@@ -228,7 +228,7 @@ static bool wm_obj_export_check(bContext *C, wmOperator *op)
       end = EFRA;
       changed = true;
     }
-    /* Fix manual errors. */
+    /* Fix user errors. */
     if (end < start) {
       end = start;
       changed = true;
@@ -236,12 +236,6 @@ static bool wm_obj_export_check(bContext *C, wmOperator *op)
     RNA_int_set(op->ptr, "start_frame", start);
     RNA_int_set(op->ptr, "end_frame", end);
   }
-  else {
-    /* Set the default export frames to the current one in viewport. */
-    RNA_int_set(op->ptr, "start_frame", CFRA);
-    RNA_int_set(op->ptr, "end_frame", CFRA);
-    changed = true;
-  }
 
   /* Both forward and up axes cannot be the same (or same except opposite sign). */
   if (RNA_enum_get(op->ptr, "forward_axis") % TOTAL_AXES ==



More information about the Bf-blender-cvs mailing list