[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52806] trunk/blender: Fix missing mapping and influence panel for particles when cycles is selected

[Brecht Van Lommel]

Revision: 52806
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52806
Author:   blendix
Date:     2012-12-07 11:30:40 +0000 (Fri, 07 Dec 2012)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/intern/cycles/blender/addon/ui.py
    trunk/blender/source/blender/editors/space_buttons/buttons_context.c

Modified: trunk/blender/intern/cycles/blender/addon/ui.py
===================================================================
--- trunk/blender/intern/cycles/blender/addon/ui.py	2012-12-07 08:52:48 UTC (rev 52805)
+++ trunk/blender/intern/cycles/blender/addon/ui.py	2012-12-07 11:30:40 UTC (rev 52806)
@@ -1026,6 +1026,8 @@
         bpy.types.TEXTURE_PT_voxeldata,
         bpy.types.TEXTURE_PT_pointdensity,
         bpy.types.TEXTURE_PT_pointdensity_turbulence,
+        bpy.types.TEXTURE_PT_mapping,
+        bpy.types.TEXTURE_PT_influence,
         bpy.types.PARTICLE_PT_context_particles,
         bpy.types.PARTICLE_PT_emission,
         bpy.types.PARTICLE_PT_hair_dynamics,

Modified: trunk/blender/source/blender/editors/space_buttons/buttons_context.c
===================================================================
--- trunk/blender/source/blender/editors/space_buttons/buttons_context.c	2012-12-07 08:52:48 UTC (rev 52805)
+++ trunk/blender/source/blender/editors/space_buttons/buttons_context.c	2012-12-07 11:30:40 UTC (rev 52806)
@@ -822,12 +822,12 @@
 		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 @@
 		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]);
 		}