Fix missing mapping and influence panel for particles when cycles is selected

as render engine. Still missing is colors and texture slots, but that's too
tricky to fix this close to release.

1 files changed, 9 insertions, 3 deletions

diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c
index 2da70468f0c..2a5b64cd6ed 100644
--- a/source/blender/editors/space_buttons/buttons_context.c
+++ b/source/blender/editors/space_buttons/buttons_context.c
@@ -822,12 +822,12 @@ int buttons_context(const bContext *C, const char *member, bContextDataResult *r
 		ButsContextTexture *ct = sbuts->texuser;
 		PointerRNA *ptr;
 
-		if (ct)
-			return 0;  /* new shading system */
-
 		if ((ptr = get_pointer_type(path, &RNA_Material))) {
 			Material *ma = ptr->data;
 
+			if (ct)
+				return 0;  /* new shading system */
+
 			/* if we have a node material, get slot from material in material node */
 			if (ma && ma->use_nodes && ma->nodetree) {
 				/* if there's an active texture node in the node tree,
@@ -848,12 +848,18 @@ int buttons_context(const bContext *C, const char *member, bContextDataResult *r
 		else if ((ptr = get_pointer_type(path, &RNA_Lamp))) {
 			Lamp *la = ptr->data;
 
+			if (ct)
+				return 0;  /* new shading system */
+
 			if (la)
 				CTX_data_pointer_set(result, &la->id, &RNA_LampTextureSlot, la->mtex[(int)la->texact]);
 		}
 		else if ((ptr = get_pointer_type(path, &RNA_World))) {
 			World *wo = ptr->data;
 
+			if (ct)
+				return 0;  /* new shading system */
+
 			if (wo)
 				CTX_data_pointer_set(result, &wo->id, &RNA_WorldTextureSlot, wo->mtex[(int)wo->texact]);
 		}