Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorBrecht Van Lommel <brecht@blender.org>2020-12-23 17:45:55 +0300
committerBrecht Van Lommel <brecht@blender.org>2020-12-23 17:50:31 +0300
commit9d04fa39d13b75b207fa7ab0315cb7731ecfff06 (patch)
tree1ce36661e347ceb17b8d79a7754bbea3140ebdae /source
parent635694c0ff8fc5c9828bf920ecb81bb9bf792a82 (diff)
Fix T84063: crash reading pointer properties in Attribute shader node
Path resolving can find e.g. a datablock rather than a float or integer, treat that as a failure to find a valid property.
Diffstat (limited to 'source')
-rw-r--r--source/blender/draw/intern/draw_instance_data.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/draw/intern/draw_instance_data.c b/source/blender/draw/intern/draw_instance_data.c
index ba03cee8149..449f2cd9606 100644
--- a/source/blender/draw/intern/draw_instance_data.c
+++ b/source/blender/draw/intern/draw_instance_data.c
@@ -633,6 +633,10 @@ static bool drw_uniform_property_lookup(ID *id, const char *name, float r_data[4
return false;
}
+ if (prop == NULL) {
+ return false;
+ }
+
PropertyType type = RNA_property_type(prop);
int arraylen = RNA_property_array_length(&ptr, prop);