diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-04-23 16:14:51 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-04-23 16:15:53 +0300 |
| commit | a7960db471011fbf67174b4ae7a64dd2052d20d1 (patch) | |
| tree | 6a523628f9b840b1dde36ac395c23715966d1190 /source/blender/makesrna/intern/rna_rna.c | |
| parent | 054d7038cc97ee022baec6aef7c6e6deff0e56f1 (diff) | |
Static Overrides: hide/deactivate all but 'REPLACE' operation.
Others remain in code for now, just not exposed to user.
Diffstat (limited to 'source/blender/makesrna/intern/rna_rna.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_rna.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/makesrna/intern/rna_rna.c b/source/blender/makesrna/intern/rna_rna.c index a46c8e2f18f..b16a5ce8baa 100644 --- a/source/blender/makesrna/intern/rna_rna.c +++ b/source/blender/makesrna/intern/rna_rna.c @@ -1300,7 +1300,6 @@ int rna_property_override_diff_default(PointerRNA *ptr_a, PointerRNA *ptr_b, case PROP_FLOAT: { - const bool is_proportional = (prop_a->flag & PROP_PROPORTIONAL) != 0; if (len_a) { float array_stack_a[RNA_STACK_ARRAY], array_stack_b[RNA_STACK_ARRAY]; float *array_a, *array_b; @@ -1320,7 +1319,7 @@ int rna_property_override_diff_default(PointerRNA *ptr_a, PointerRNA *ptr_b, if (op != NULL && created) { BKE_override_static_property_operation_get( - op, is_proportional ? IDOVERRIDESTATIC_OP_MULTIPLY : IDOVERRIDESTATIC_OP_REPLACE, + op, IDOVERRIDESTATIC_OP_REPLACE, NULL, NULL, -1, -1, true, NULL, NULL); if (r_override_changed) { *r_override_changed = created; @@ -1347,7 +1346,7 @@ int rna_property_override_diff_default(PointerRNA *ptr_a, PointerRNA *ptr_b, if (op != NULL && created) { /* If not yet overridden... */ BKE_override_static_property_operation_get( - op, is_proportional ? IDOVERRIDESTATIC_OP_MULTIPLY : IDOVERRIDESTATIC_OP_REPLACE, + op, IDOVERRIDESTATIC_OP_REPLACE, NULL, NULL, -1, -1, true, NULL, NULL); if (r_override_changed) { *r_override_changed = created; |