[Bf-blender-cvs] [70d48255aea] blender-v2.90-release: Fix T79992: Error calling context.copy() in Properties Editor

Dalai Felinto noreply at git.blender.org
Wed Aug 26 11:34:57 CEST 2020


Commit: 70d48255aeae66c9ce62b0458cf7519adea45cf2
Author: Dalai Felinto
Date:   Wed Aug 26 11:26:19 2020 +0200
Branches: blender-v2.90-release
https://developer.blender.org/rB70d48255aeae66c9ce62b0458cf7519adea45cf2

Fix T79992: Error calling context.copy() in Properties Editor

This was an oversight in rB83e3d25bcae3.

Basically we still have the "hair" and "point_cloud" entries for the
context. However they were ifdef'ed.

Note this would mostly happen in 2.90 since we always build without hair
and particles there.

Differential Revision: https://developer.blender.org/D8712

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

M	source/blender/editors/space_buttons/buttons_context.c

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

diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c
index 044fadb9a50..e3e41af02cf 100644
--- a/source/blender/editors/space_buttons/buttons_context.c
+++ b/source/blender/editors/space_buttons/buttons_context.c
@@ -795,8 +795,12 @@ const char *buttons_context_dir[] = {
     "line_style",
     "collection",
     "gpencil",
+#ifdef WITH_HAIR_NODES
     "hair",
+#endif
+#ifdef WITH_PARTICLE_NODES
     "pointcloud",
+#endif
     "volume",
     NULL,
 };



More information about the Bf-blender-cvs mailing list