Merge branch 'master' into blender2.8
authorPhilipp Oeser <info@graphics-engineer.com>
Thu, 24 May 2018 07:03:07 +0000 (09:03 +0200)
committerPhilipp Oeser <info@graphics-engineer.com>
Thu, 24 May 2018 07:03:07 +0000 (09:03 +0200)
source/blender/editors/interface/interface_handlers.c

index 1959821ecdd34679b14fd8945a886c4bc7a1bb2b..70cd53c440f7d489f56052578e7590cc724b5ad9 100644 (file)
@@ -1596,6 +1596,7 @@ static void ui_selectcontext_apply(
                        bool  b;
                        int   i;
                        float f;
+                       PointerRNA p;
                } delta, min, max;
 
                const bool is_array = RNA_property_array_check(prop);
@@ -1620,6 +1621,9 @@ static void ui_selectcontext_apply(
                                delta.b = RNA_property_boolean_get(&but->rnapoin, prop);  /* not a delta infact */
                        }
                }
+               else if (rna_type == PROP_POINTER) {
+                       delta.p = RNA_property_pointer_get(&but->rnapoin, prop);  /* not a delta infact */
+               }
 
 #ifdef USE_ALLSELECT_LAYER_HACK
                /* make up for not having 'handle_layer_buttons' */
@@ -1692,6 +1696,10 @@ static void ui_selectcontext_apply(
                                BLI_assert(!is_array);
                                RNA_property_enum_set(&lptr, lprop, other_value);
                        }
+                       else if (rna_type == PROP_POINTER) {
+                               const PointerRNA other_value = delta.p;
+                               RNA_property_pointer_set(&lptr, lprop, other_value);
+                       }
 
                        RNA_property_update(C, &lptr, prop);
                }