- added xmirror to the weightpaint options

- made texture_slot return the texture slot for the node texture

7 files changed, 30 insertions, 14 deletions

diff --git a/release/scripts/ui/buttons_texture.py b/release/scripts/ui/buttons_texture.py
index 4e4fbd2bc25..30262ea3415 100644
--- a/release/scripts/ui/buttons_texture.py
+++ b/release/scripts/ui/buttons_texture.py
@@ -219,8 +219,12 @@ class TEXTURE_PT_mapping(TextureSlotPanel):
 
 class TEXTURE_PT_influence(TextureSlotPanel):
 	__label__ = "Influence"
+	def poll(self, context):
+		return 1
+		
 	
 	def draw(self, context):
+		
 		layout = self.layout
 		
 		idblock = context_tex_datablock(context)
diff --git a/release/scripts/ui/space_view3d_toolbar.py b/release/scripts/ui/space_view3d_toolbar.py
index 9bdd25da3e1..f354a3314f2 100644
--- a/release/scripts/ui/space_view3d_toolbar.py
+++ b/release/scripts/ui/space_view3d_toolbar.py
@@ -650,6 +650,11 @@ class VIEW3D_PT_tools_weightpaint(View3DPanel):
 		col.itemR(wpaint, "normals")
 		col.itemR(wpaint, "spray")
 		col.itemR(wpaint, "vertex_dist", text="Distance")
+		
+		
+		data = context.weight_paint_object.data
+		if type(data) == bpy.types.Mesh:
+			col.itemR(data, "use_mirror_x")
 
 # Commented out because the Apply button isn't an operator yet, making these settings useless
 #		col.itemL(text="Gamma:")
diff --git a/source/blender/blenkernel/BKE_material.h b/source/blender/blenkernel/BKE_material.h
index 85316dddedf..3ea7cae2c86 100644
--- a/source/blender/blenkernel/BKE_material.h
+++ b/source/blender/blenkernel/BKE_material.h
@@ -47,6 +47,7 @@ void test_object_materials(struct ID *id);
 void init_material(struct Material *ma);
 struct Material *add_material(char *name);
 struct Material *copy_material(struct Material *ma);
+struct Material *give_node_material(struct Material *ma); /* returns node material or self */
 void make_local_material(struct Material *ma);
 
 void automatname(struct Material *);
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c
index ab700ab283c..c2260e1e761 100644
--- a/source/blender/blenkernel/intern/material.c
+++ b/source/blender/blenkernel/intern/material.c
@@ -485,6 +485,18 @@ ID *material_from(Object *ob, int act)
 	else return ob->data;
 }
 
+Material *give_node_material(Material *ma)
+{
+	if(ma && ma->use_nodes && ma->nodetree) {
+		bNode *node= nodeGetActiveID(ma->nodetree, ID_MA);
+
+		if(node)
+			return (Material *)node->id;
+	}
+
+	return NULL;
+}
+
 /* GS reads the memory pointed at in a specific ordering. There are,
  * however two definitions for it. I have jotted them down here, both,
  * but I think the first one is actually used. The thing is that
diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c
index 7648c9412b7..ad96796213d 100644
--- a/source/blender/editors/interface/interface_icons.c
+++ b/source/blender/editors/interface/interface_icons.c
@@ -38,6 +38,8 @@
 #endif   
 #include "MEM_guardedalloc.h"
 
+#include "GPU_extensions.h"
+
 #include "BLI_arithb.h"
 #include "BLI_blenlib.h"
 #include "BLI_storage_types.h"
diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c
index 504e4a6866e..bc0cc536857 100644
--- a/source/blender/editors/space_buttons/buttons_context.c
+++ b/source/blender/editors/space_buttons/buttons_context.c
@@ -622,7 +622,9 @@ int buttons_context(const bContext *C, const char *member, bContextDataResult *r
 		PointerRNA *ptr;
 
 		if((ptr=get_pointer_type(path, &RNA_Material))) {
-			Material *ma= ptr->data;
+			Material *ma= ptr->data; /* should this be made a different option? */
+			Material *ma_node= give_node_material(ma);
+			ma= ma_node?ma_node:ma;
 
 			if(ma)
 				CTX_data_pointer_set(result, &ma->id, &RNA_MaterialTextureSlot, ma->mtex[(int)ma->texact]);
diff --git a/source/blender/makesrna/intern/rna_material.c b/source/blender/makesrna/intern/rna_material.c
index d0aa4e4439c..fbecf2b5f07 100644
--- a/source/blender/makesrna/intern/rna_material.c
+++ b/source/blender/makesrna/intern/rna_material.c
@@ -58,6 +58,7 @@ static EnumPropertyItem prop_texture_coordinates_items[] = {
 
 #include "BKE_depsgraph.h"
 #include "BKE_main.h"
+#include "BKE_material.h"
 #include "BKE_texture.h"
 #include "BKE_node.h"
 
@@ -143,19 +144,8 @@ static void rna_Material_active_texture_set(PointerRNA *ptr, PointerRNA value)
 
 static PointerRNA rna_Material_active_node_material_get(PointerRNA *ptr)
 {
-	Material *ma= (Material*)ptr->data;
-	Material *ma_node= NULL;
-
-	/* used in buttons to check context, also checks for edited groups */
-
-	if(ma && ma->use_nodes && ma->nodetree) {
-		bNode *node= nodeGetActiveID(ma->nodetree, ID_MA);
-
-		if(node)
-			ma_node= (Material *)node->id;
-	}
-
-	return rna_pointer_inherit_refine(ptr, &RNA_Material, ma_node);
+	Material *ma= give_node_material((Material*)ptr->data);
+	return rna_pointer_inherit_refine(ptr, &RNA_Material, ma);
 }
 
 static void rna_Material_active_node_material_set(PointerRNA *ptr, PointerRNA value)