[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12751] trunk/blender: wizard_curve2tree. py - bounding twig mesh didnt work if it had some transformation.

[Campbell Barton]

Revision: 12751
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12751
Author:   campbellbarton
Date:     2007-12-01 23:00:09 +0100 (Sat, 01 Dec 2007)

Log Message:
-----------
wizard_curve2tree.py - bounding twig mesh didnt work if it had some transformation.
buttons_shading.c - premul button was overlapping movie buttons

Modified Paths:
--------------
    trunk/blender/release/scripts/wizard_curve2tree.py
    trunk/blender/source/blender/blenkernel/intern/image.c
    trunk/blender/source/blender/src/buttons_shading.c

Modified: trunk/blender/release/scripts/wizard_curve2tree.py
===================================================================
--- trunk/blender/release/scripts/wizard_curve2tree.py	2007-12-01 21:02:33 UTC (rev 12750)
+++ trunk/blender/release/scripts/wizard_curve2tree.py	2007-12-01 22:00:09 UTC (rev 12751)
@@ -170,6 +170,7 @@
 		
 		self.objectTwigBounds = None # use for twigs only at the moment.
 		self.objectTwigBoundsIMat = None
+		self.objectTwigBoundsMat = None
 		self.objectTwigBoundsMesh = None
 		
 		self.objectLeafBounds = None
@@ -276,7 +277,8 @@
 	def setTwigBounds(self, objectMesh):
 		self.objectTwigBounds = objectMesh
 		self.objectTwigBoundsMesh = objectMesh.getData(mesh=1)
-		self.objectTwigBoundsIMat = objectMesh.matrixWorld.copy().invert()
+		self.objectTwigBoundsMat = objectMesh.matrixWorld.copy()
+		self.objectTwigBoundsIMat = self.objectTwigBoundsMat.copy().invert()
 		
 		for brch in self.branches_all:
 			brch.calcTwigBounds(self)
@@ -1006,7 +1008,11 @@
 						vert_segment_mapping[i] = len(segments_all)
 						v.sel = True
 						seg = segment(0)
-						seg.tailCo = v.co.copy() # headCo undefined atm.
+						# seg.tailCo = v.co.copy() # headCo undefined atm.
+						seg.tailCo = v.co.copy() * self_tree.objectTwigBoundsMat * self_tree.objectCurveIMat
+						
+						# self_tree.objectCurveMat
+						
 						seg.no = v.no
 			
 			# Build connectivity

Modified: trunk/blender/source/blender/blenkernel/intern/image.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/image.c	2007-12-01 21:02:33 UTC (rev 12750)
+++ trunk/blender/source/blender/blenkernel/intern/image.c	2007-12-01 22:00:09 UTC (rev 12751)
@@ -95,7 +95,7 @@
 
 /* ******** IMAGE PROCESSING ************* */
 
-/* used by sequencer */
+/* used by sequencer and image premul option - IMA_DO_PREMUL */
 void converttopremul(struct ImBuf *ibuf)
 {
 	int x, y, val;

Modified: trunk/blender/source/blender/src/buttons_shading.c
===================================================================
--- trunk/blender/source/blender/src/buttons_shading.c	2007-12-01 21:02:33 UTC (rev 12750)
+++ trunk/blender/source/blender/src/buttons_shading.c	2007-12-01 22:00:09 UTC (rev 12751)
@@ -1171,14 +1171,13 @@
 		 
 		 /* fields */
 		 uiBlockBeginAlign(block);
-		 but= uiDefButBitS(block, TOG, IMA_FIELDS, imagechanged, "Fields",	10, 90, 100, 20, &ima->flag, 0, 0, 0, 0, "Click to enable use of fields in Image");
+		 but= uiDefButBitS(block, TOG, IMA_FIELDS, imagechanged, "Fields",	10, 90, 65, 20, &ima->flag, 0, 0, 0, 0, "Click to enable use of fields in Image");
 		 uiButSetFunc(but, image_field_test, ima, iuser);
-		 uiDefButBitS(block, TOG, IMA_STD_FIELD, B_NOP, "Odd",			10, 70, 100, 20, &ima->flag, 0, 0, 0, 0, "Standard Field Toggle");
+		 uiDefButBitS(block, TOG, IMA_STD_FIELD, B_NOP, "Odd",			75, 90, 45, 20, &ima->flag, 0, 0, 0, 0, "Standard Field Toggle");
 		 
-		 uiBlockBeginAlign(block);
 		 uiBlockSetFunc(block, image_reload_cb, ima, iuser);
-		 uiDefButBitS(block, TOG, IMA_ANTIALI, B_NOP, "Anti",			10, 35, 100, 20, &ima->flag, 0, 0, 0, 0, "Toggles Image anti-aliasing, only works with solid colors");
-		 uiDefButBitS(block, TOG, IMA_DO_PREMUL, imagechanged, "Premul",		110, 35, 100, 20, &ima->flag, 0, 0, 0, 0, "Toggles premultiplying alpha");
+		 uiDefButBitS(block, TOG, IMA_ANTIALI, B_NOP, "Anti",			10, 70, 45, 20, &ima->flag, 0, 0, 0, 0, "Toggles Image anti-aliasing, only works with solid colors");
+		 uiDefButBitS(block, TOG, IMA_DO_PREMUL, imagechanged, "Premul",		55, 70, 65, 20, &ima->flag, 0, 0, 0, 0, "Toggles premultiplying alpha");
 		 uiBlockEndAlign(block);
 		 
 		 if( ELEM(ima->source, IMA_SRC_MOVIE, IMA_SRC_SEQUENCE)) {