Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Campbell Barton
2017-04-05 11:40:17 +10:00
parent 064eba208e 411e7abe94
commit bcd95dbdbb
2 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/makesrna/intern/rna_access.c
View File

@@ -5547,6 +5547,9 @@ static char *rna_pointer_as_string__bldata(PointerRNA *ptr)
return BLI_strdup("None"); return BLI_strdup("None");
} }
else if (RNA_struct_is_ID(ptr->type)) { else if (RNA_struct_is_ID(ptr->type)) {
if (ptr->id.data == NULL) {
return BLI_strdup("None");
}
return RNA_path_full_ID_py(ptr->id.data); return RNA_path_full_ID_py(ptr->id.data);
} }
else { else {
@@ -5556,7 +5559,10 @@ static char *rna_pointer_as_string__bldata(PointerRNA *ptr)
char *RNA_pointer_as_string(bContext *C, PointerRNA *UNUSED(ptr), PropertyRNA *prop_ptr, PointerRNA *ptr_prop) char *RNA_pointer_as_string(bContext *C, PointerRNA *UNUSED(ptr), PropertyRNA *prop_ptr, PointerRNA *ptr_prop)
{ {
if (RNA_property_flag(prop_ptr) & PROP_IDPROPERTY) { if (ptr_prop->data == NULL) {
return BLI_strdup("None");
}
else if (RNA_property_flag(prop_ptr) & PROP_IDPROPERTY) {
return RNA_pointer_as_string_id(C, ptr_prop); return RNA_pointer_as_string_id(C, ptr_prop);
} }
else { else {

36
source/blender/python/intern/bpy_props.c
View File

@@ -230,7 +230,7 @@ static PyObject *bpy_prop_deferred_return(PyObject *func, PyObject *kw)
static void bpy_prop_update_cb(struct bContext *C, struct PointerRNA *ptr, struct PropertyRNA *prop) static void bpy_prop_update_cb(struct bContext *C, struct PointerRNA *ptr, struct PropertyRNA *prop)
{ {
PyGILState_STATE gilstate; PyGILState_STATE gilstate;
PyObject **py_data = (PyObject **)RNA_property_py_data_get(prop); PyObject **py_data = RNA_property_py_data_get(prop);
PyObject *py_func; PyObject *py_func;
PyObject *args; PyObject *args;
PyObject *self; PyObject *self;
@@ -279,7 +279,7 @@ static void bpy_prop_update_cb(struct bContext *C, struct PointerRNA *ptr, struc
static int bpy_prop_boolean_get_cb(struct PointerRNA *ptr, struct PropertyRNA *prop) static int bpy_prop_boolean_get_cb(struct PointerRNA *ptr, struct PropertyRNA *prop)
{ {
PyObject **py_data = (PyObject **)RNA_property_py_data_get(prop); PyObject **py_data = RNA_property_py_data_get(prop);
PyObject *py_func; PyObject *py_func;
PyObject *args; PyObject *args;
PyObject *self; PyObject *self;
@@ -337,7 +337,7 @@ static int bpy_prop_boolean_get_cb(struct PointerRNA *ptr, struct PropertyRNA *p
static void bpy_prop_boolean_set_cb(struct PointerRNA *ptr, struct PropertyRNA *prop, int value) static void bpy_prop_boolean_set_cb(struct PointerRNA *ptr, struct PropertyRNA *prop, int value)
{ {
PyObject **py_data = (PyObject **)RNA_property_py_data_get(prop); PyObject **py_data = RNA_property_py_data_get(prop);
PyObject *py_func; PyObject *py_func;
PyObject *args; PyObject *args;
PyObject *self; PyObject *self;
@@ -391,7 +391,7 @@ static void bpy_prop_boolean_set_cb(struct PointerRNA *ptr, struct PropertyRNA *
static void bpy_prop_boolean_array_get_cb(struct PointerRNA *ptr, struct PropertyRNA *prop, int *values) static void bpy_prop_boolean_array_get_cb(struct PointerRNA *ptr, struct PropertyRNA *prop, int *values)
{ {
PyObject **py_data = (PyObject **)RNA_property_py_data_get(prop); PyObject **py_data = RNA_property_py_data_get(prop);
PyObject *py_func; PyObject *py_func;
PyObject *args; PyObject *args;
PyObject *self; PyObject *self;
@@ -452,7 +452,7 @@ static void bpy_prop_boolean_array_get_cb(struct PointerRNA *ptr, struct Propert
static void bpy_prop_boolean_array_set_cb(struct PointerRNA *ptr, struct PropertyRNA *prop, const int *values) static void bpy_prop_boolean_array_set_cb(struct PointerRNA *ptr, struct PropertyRNA *prop, const int *values)
{ {
PyObject **py_data = (PyObject **)RNA_property_py_data_get(prop); PyObject **py_data = RNA_property_py_data_get(prop);
PyObject *py_func; PyObject *py_func;
PyObject *args; PyObject *args;
PyObject *self; PyObject *self;
@@ -513,7 +513,7 @@ static void bpy_prop_boolean_array_set_cb(struct PointerRNA *ptr, struct Propert
static int bpy_prop_int_get_cb(struct PointerRNA *ptr, struct PropertyRNA *prop) static int bpy_prop_int_get_cb(struct PointerRNA *ptr, struct PropertyRNA *prop)
{ {
PyObject **py_data = (PyObject **)RNA_property_py_data_get(prop); PyObject **py_data = RNA_property_py_data_get(prop);
PyObject *py_func; PyObject *py_func;
PyObject *args; PyObject *args;
PyObject *self; PyObject *self;
@@ -571,7 +571,7 @@ static int bpy_prop_int_get_cb(struct PointerRNA *ptr, struct PropertyRNA *prop)
static void bpy_prop_int_set_cb(struct PointerRNA *ptr, struct PropertyRNA *prop, int value) static void bpy_prop_int_set_cb(struct PointerRNA *ptr, struct PropertyRNA *prop, int value)
{ {
PyObject **py_data = (PyObject **)RNA_property_py_data_get(prop); PyObject **py_data = RNA_property_py_data_get(prop);
PyObject *py_func; PyObject *py_func;
PyObject *args; PyObject *args;
PyObject *self; PyObject *self;
@@ -625,7 +625,7 @@ static void bpy_prop_int_set_cb(struct PointerRNA *ptr, struct PropertyRNA *prop
static void bpy_prop_int_array_get_cb(struct PointerRNA *ptr, struct PropertyRNA *prop, int *values) static void bpy_prop_int_array_get_cb(struct PointerRNA *ptr, struct PropertyRNA *prop, int *values)
{ {
PyObject **py_data = (PyObject **)RNA_property_py_data_get(prop); PyObject **py_data = RNA_property_py_data_get(prop);
PyObject *py_func; PyObject *py_func;
PyObject *args; PyObject *args;
PyObject *self; PyObject *self;
@@ -686,7 +686,7 @@ static void bpy_prop_int_array_get_cb(struct PointerRNA *ptr, struct PropertyRNA
static void bpy_prop_int_array_set_cb(struct PointerRNA *ptr, struct PropertyRNA *prop, const int *values) static void bpy_prop_int_array_set_cb(struct PointerRNA *ptr, struct PropertyRNA *prop, const int *values)
{ {
PyObject **py_data = (PyObject **)RNA_property_py_data_get(prop); PyObject **py_data = RNA_property_py_data_get(prop);
PyObject *py_func; PyObject *py_func;
PyObject *args; PyObject *args;
PyObject *self; PyObject *self;
@@ -747,7 +747,7 @@ static void bpy_prop_int_array_set_cb(struct PointerRNA *ptr, struct PropertyRNA
static float bpy_prop_float_get_cb(struct PointerRNA *ptr, struct PropertyRNA *prop) static float bpy_prop_float_get_cb(struct PointerRNA *ptr, struct PropertyRNA *prop)
{ {
PyObject **py_data = (PyObject **)RNA_property_py_data_get(prop); PyObject **py_data = RNA_property_py_data_get(prop);
PyObject *py_func; PyObject *py_func;
PyObject *args; PyObject *args;
PyObject *self; PyObject *self;
@@ -805,7 +805,7 @@ static float bpy_prop_float_get_cb(struct PointerRNA *ptr, struct PropertyRNA *p
static void bpy_prop_float_set_cb(struct PointerRNA *ptr, struct PropertyRNA *prop, float value) static void bpy_prop_float_set_cb(struct PointerRNA *ptr, struct PropertyRNA *prop, float value)
{ {
PyObject **py_data = (PyObject **)RNA_property_py_data_get(prop); PyObject **py_data = RNA_property_py_data_get(prop);
PyObject *py_func; PyObject *py_func;
PyObject *args; PyObject *args;
PyObject *self; PyObject *self;
@@ -859,7 +859,7 @@ static void bpy_prop_float_set_cb(struct PointerRNA *ptr, struct PropertyRNA *pr
static void bpy_prop_float_array_get_cb(struct PointerRNA *ptr, struct PropertyRNA *prop, float *values) static void bpy_prop_float_array_get_cb(struct PointerRNA *ptr, struct PropertyRNA *prop, float *values)
{ {
PyObject **py_data = (PyObject **)RNA_property_py_data_get(prop); PyObject **py_data = RNA_property_py_data_get(prop);
PyObject *py_func; PyObject *py_func;
PyObject *args; PyObject *args;
PyObject *self; PyObject *self;
@@ -920,7 +920,7 @@ static void bpy_prop_float_array_get_cb(struct PointerRNA *ptr, struct PropertyR
static void bpy_prop_float_array_set_cb(struct PointerRNA *ptr, struct PropertyRNA *prop, const float *values) static void bpy_prop_float_array_set_cb(struct PointerRNA *ptr, struct PropertyRNA *prop, const float *values)
{ {
PyObject **py_data = (PyObject **)RNA_property_py_data_get(prop); PyObject **py_data = RNA_property_py_data_get(prop);
PyObject *py_func; PyObject *py_func;
PyObject *args; PyObject *args;
PyObject *self; PyObject *self;
@@ -981,7 +981,7 @@ static void bpy_prop_float_array_set_cb(struct PointerRNA *ptr, struct PropertyR
static void bpy_prop_string_get_cb(struct PointerRNA *ptr, struct PropertyRNA *prop, char *value) static void bpy_prop_string_get_cb(struct PointerRNA *ptr, struct PropertyRNA *prop, char *value)
{ {
PyObject **py_data = (PyObject **)RNA_property_py_data_get(prop); PyObject **py_data = RNA_property_py_data_get(prop);
PyObject *py_func; PyObject *py_func;
PyObject *args; PyObject *args;
PyObject *self; PyObject *self;
@@ -1040,7 +1040,7 @@ static void bpy_prop_string_get_cb(struct PointerRNA *ptr, struct PropertyRNA *p
static int bpy_prop_string_length_cb(struct PointerRNA *ptr, struct PropertyRNA *prop) static int bpy_prop_string_length_cb(struct PointerRNA *ptr, struct PropertyRNA *prop)
{ {
PyObject **py_data = (PyObject **)RNA_property_py_data_get(prop); PyObject **py_data = RNA_property_py_data_get(prop);
PyObject *py_func; PyObject *py_func;
PyObject *args; PyObject *args;
PyObject *self; PyObject *self;
@@ -1102,7 +1102,7 @@ static int bpy_prop_string_length_cb(struct PointerRNA *ptr, struct PropertyRNA
static void bpy_prop_string_set_cb(struct PointerRNA *ptr, struct PropertyRNA *prop, const char *value) static void bpy_prop_string_set_cb(struct PointerRNA *ptr, struct PropertyRNA *prop, const char *value)
{ {
PyObject **py_data = (PyObject **)RNA_property_py_data_get(prop); PyObject **py_data = RNA_property_py_data_get(prop);
PyObject *py_func; PyObject *py_func;
PyObject *args; PyObject *args;
PyObject *self; PyObject *self;
@@ -1163,7 +1163,7 @@ static void bpy_prop_string_set_cb(struct PointerRNA *ptr, struct PropertyRNA *p
static int bpy_prop_enum_get_cb(struct PointerRNA *ptr, struct PropertyRNA *prop) static int bpy_prop_enum_get_cb(struct PointerRNA *ptr, struct PropertyRNA *prop)
{ {
PyObject **py_data = (PyObject **)RNA_property_py_data_get(prop); PyObject **py_data = RNA_property_py_data_get(prop);
PyObject *py_func; PyObject *py_func;
PyObject *args; PyObject *args;
PyObject *self; PyObject *self;
@@ -1221,7 +1221,7 @@ static int bpy_prop_enum_get_cb(struct PointerRNA *ptr, struct PropertyRNA *prop
static void bpy_prop_enum_set_cb(struct PointerRNA *ptr, struct PropertyRNA *prop, int value) static void bpy_prop_enum_set_cb(struct PointerRNA *ptr, struct PropertyRNA *prop, int value)
{ {
PyObject **py_data = (PyObject **)RNA_property_py_data_get(prop); PyObject **py_data = RNA_property_py_data_get(prop);
PyObject *py_func; PyObject *py_func;
PyObject *args; PyObject *args;
PyObject *self; PyObject *self;