[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19322] trunk/blender: New icon and button for Peel Object option for volume snapping.

Martin Poirier theeth at yahoo.com
Tue Mar 17 22:26:09 CET 2009


Revision: 19322
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19322
Author:   theeth
Date:     2009-03-17 22:26:09 +0100 (Tue, 17 Mar 2009)

Log Message:
-----------
New icon and button for Peel Object option for volume snapping.
Use snap point to get default embedding depth (for overlapping volumes).

Modified Paths:
--------------
    trunk/blender/release/datafiles/blenderbuttons
    trunk/blender/source/blender/include/BIF_resources.h
    trunk/blender/source/blender/include/transform.h
    trunk/blender/source/blender/src/blenderbuttons.c
    trunk/blender/source/blender/src/header_view3d.c
    trunk/blender/source/blender/src/transform_snap.c

Modified: trunk/blender/release/datafiles/blenderbuttons
===================================================================
(Binary files differ)

Modified: trunk/blender/source/blender/include/BIF_resources.h
===================================================================
--- trunk/blender/source/blender/include/BIF_resources.h	2009-03-17 06:37:50 UTC (rev 19321)
+++ trunk/blender/source/blender/include/BIF_resources.h	2009-03-17 21:26:09 UTC (rev 19322)
@@ -294,7 +294,7 @@
 	ICON_SNAP_GEAR,
 	ICON_SNAP_GEO,
 	ICON_SNAP_NORMAL,
-	ICON_BLANK42,
+	ICON_SNAP_PEEL_OBJECT,
 	
 	ICON_SMOOTHCURVE,
 	ICON_SPHERECURVE,

Modified: trunk/blender/source/blender/include/transform.h
===================================================================
--- trunk/blender/source/blender/include/transform.h	2009-03-17 06:37:50 UTC (rev 19321)
+++ trunk/blender/source/blender/include/transform.h	2009-03-17 21:26:09 UTC (rev 19322)
@@ -73,8 +73,8 @@
 	short	modePoint;
 	short	modeTarget;
 	int  	status;
-	float	snapPoint[3];
-	float	snapTarget[3];
+	float	snapPoint[3]; /* snapping from this point */
+	float	snapTarget[3];/* to this point */
 	float	snapNormal[3];
 	float	snapTangent[3];
 	float	dist; // Distance from snapPoint to snapTarget

Modified: trunk/blender/source/blender/src/blenderbuttons.c
===================================================================
--- trunk/blender/source/blender/src/blenderbuttons.c	2009-03-17 06:37:50 UTC (rev 19321)
+++ trunk/blender/source/blender/src/blenderbuttons.c	2009-03-17 21:26:09 UTC (rev 19322)
@@ -1,2139 +1,2157 @@
 /* DataToC output of file <blenderbuttons> */
 
-int datatoc_blenderbuttons_size= 68242;
+int datatoc_blenderbuttons_size= 68804;
 char datatoc_blenderbuttons[]= {
-137, 80, 78, 71, 13, 10, 26, 10,  0,  0,  0, 13, 73, 72, 68, 82,  0,  0,
-  2,  0,  0,  0,  1,  0,  8,  6,  0,  0,  0,197,144,206,103,  0,  0,  0,  1,115, 82, 71, 66,  0,174,206, 28,233,  0,  0,  0,  6,
- 98, 75, 71, 68,  0,255,  0,255,  0,255,160,189,167,147,  0,  0,  0,  9,112, 72, 89,115,  0,  0, 11, 19,  0,  0, 11, 19,  1,  0,
-154,156, 24,  0,  0,  0,  7,116, 73, 77, 69,  7,216,  9,  7, 16, 32, 48, 13,  5,217, 84,  0,  0, 32,  0, 73, 68, 65, 84,120,218,
-236,125,121, 92, 84, 85,255,255,251,220,217,217, 23,  1, 21,133,193,125, 95,201, 37, 55, 40, 49, 51,205, 52,192,212, 36,219,196,
-210,180,178,180,111,249, 60,233, 79,159, 12,148,202,212,132,158, 74,179,210, 18,151,180, 92, 18,116, 80, 83, 82,209, 92,202,  5,
- 69,  1, 65,145,101, 86,102,187,115,231,222,223, 31, 51,131,  3,  2,179,128, 73, 61,243,126,113, 95,195, 93,230, 51,231,158,237,
-253,249,124,206,231,156, 67,250,245,235,199,193,  3, 15, 60,240,192,  3, 15, 60,248,159,  2,229,201,  2, 15, 60,240,192,  3, 15,
- 60,248,223,193,153,223,179,  1,  0,196,227,  1,240,192,  3, 15, 60,240,192,  3,143,  7,192,  3, 15, 60,240,192,  3, 15, 60,240,
- 40,  0, 30,120,224,129,  7, 30,120,224,129, 71,  1,240,192,  3, 15, 60,240,192,  3, 15,254, 17,224,219,159,156, 61,123,150,184,
- 43,168,190, 88,  2,143, 60,143,188,134,144,145,145,193,173, 95,191,254,129,165,111,234,212,169,220,150, 45, 91,136,167, 60,254,
-214,242,208,  4,121,240,228,159, 71,222, 63, 89,158,203, 10,192,255, 56,234,102, 32,105,201,233, 76, 79, 79,199,236,217,179,137,
-167,216,220, 47,227,184,184,184,154,243,172,172,172,127, 68, 94, 78,124, 42,185,209,142, 96,215,143, 25,255,232, 58, 35,  9,220,
-  9,177,161, 19,162, 64,163, 26,251,144,175, 95,220,146,235,162,167,253,122,208,114, 60,  0,127, 69,101,157, 56,113, 98,204,174,
- 93,187,100,118,231,177,187,118,237,202,105, 17, 45,146,179,244,157,132,180,216,118,201, 21, 22, 22,  2,  0,164, 82,233,223,169,
- 19,113, 90, 59,157, 58,117,170,211,207,110,217,178,197, 21, 69,141,219,186,117,107,205,201,206,157, 59, 17, 23, 23, 87,235,254,
-131, 82,  2,242,242,242, 56,  0,136,142,142, 38,205,241,220,174, 31, 51,238,107,249,133, 71,181,  7,  0,220, 49, 24,192,232,141,
-150,139, 74, 53,  0, 32, 33, 33,  1,153,153,153, 13,166,111, 96,193, 64,174,243,237,206, 46,253,248,247,195,191,119,162, 92, 36,
-  8,124,245,  2, 12,187,118, 66,161,152,  4,  5,128,  1,146,149, 88, 44, 57,141,246, 98,160,194, 80,128,197,250, 68,151,126, 55,
- 33, 33, 33, 38, 51, 51, 83, 86,231, 90,108,102,102,102, 78, 11,107, 91,205, 82,111,255, 38,239,219,236,104, 19, 44, 34, 62,  2,
-127, 98, 20, 11, 57,163, 82, 79, 85,235,213,172,214,104,250,159,152, 29,231, 80,  1,176, 18,182,237,179,169, 21,129,219,181,107,
- 23,150,110, 93, 14,159,246,254,168,190,169,194,251,137,139,101, 45,220,226,110, 73, 32, 82,169,148, 43, 44, 44, 68, 97, 97, 33,
-246,239,223,143,217,179,103,183, 84, 37,192,214,128, 72, 70, 70,134, 32, 57, 57,217,148,154,154,122, 10,  0, 22, 46, 92,248, 80,
- 99, 95,156, 52,105, 82,205,255, 12, 99,  6,109, 50,130, 54,210,160,105,203,193, 48, 12, 22, 46, 92,232, 82, 90,236,201,191, 62,
- 88,149,  1,238, 65,122,  2, 92, 81,126, 30,152,133, 31,224,135,243,215,191,135,  4,237, 96,198, 49,148,127,113,  6,231, 10,170,
- 48,249,195, 13, 78,125,189,243,237,206, 78, 18,186,  5,207,252,250,140,195, 60,145,140, 91,140,160,137, 47,162,244,245,  1,128,
- 94, 81,115,253,140,254,109,156,  1,  0, 61, 48, 82,146,128,131,129,167, 17,  0, 96,160, 98,160, 83,117, 38, 51, 51,243,158,139,
-118,  4, 73, 90, 80, 27,107,142, 62,224,239,240,190,205,138, 97,125,250,145,103,195,163,248,202,136, 86,188,208,238,225, 20,159,
-132, 18,157, 74,197,138, 17,102,166,250,183, 51, 63, 55, 97,140,217, 73, 81,183, 92,248,217,182, 78, 60,179,192,  5,121,105,247,
- 85,  1,216,181,107,151,108,235,191,222, 69,226,178, 15,100, 77,172,  4,156,141,248,  1,160, 82, 87,  5,  4,  3,255,119,112,  9,
-212,215, 21, 88,247,242,234,150, 70,100, 13,117, 60, 15, 58,141, 53, 74,192,216,177, 99, 81, 88, 88,  8,169, 84,218,226,242, 78,
- 38,179,244, 27,177,177,177, 28,  0, 42, 35, 35, 35, 60, 57, 57,185, 52, 53, 53,245,180,179, 66, 24,134,  1, 77,155,106,136,223,
-158,252,243,242,242, 16, 29, 29,237, 82,162, 18, 19, 19,237,201, 22, 89, 89, 89,117, 21,128,230,168, 43, 46,151, 67,116,116, 52,
-153, 58,117, 42, 55,102,204,152,123,238, 29, 56,112,192,230,233,176,121, 61,156,150,223,156,195,  1,225, 81,237, 81,170, 80, 97,
-199,236,167, 17, 76,134,161,224,191,111,161,195,164, 14,200,114,129,252,107, 50,203,234,106, 35,205,224,106, 11,223,122, 12,186,
-162,106,148, 38, 71, 53,250,220,  5,113, 54,150,246,190,131, 21, 23,222,107,106,121, 54,  7,233, 54,167, 12, 52,179,172,251,241,
-190,205,130,164,164, 36, 47,  0, 15,  3,240,177,187,172,  4,112,126,211,166, 77,114,103,229,124,178,254, 19,138,174, 52, 10,104,
-163, 65,172,128, 73, 44, 16,240,249,106,131,152, 18, 10,245, 44,207,207,155,161, 37, 38, 19,191,236,150,241,235, 47, 54, 26,158,
-123,105,166,217,153,247, 86, 42,149,255,177,253,159,159,159, 95,233,237,237, 77,105,181, 90,214,254,153, 65,131,  6,125,220,204,
-196,190,160,169,121,202,119,100,253, 95,186,116,  9,157,125,252,236,189,  1,238,120,  1,106,200,191, 82, 87,133, 21,143, 46,169,
-185,241,252,174, 87,129, 80, 96, 82,106, 34,118, 46,220,234, 74, 37,107,172,115,107,114, 69,189,121,243, 38,  0,160,125,251,246,
-181,254,135, 11,238,236,102, 84, 68, 72, 67, 74,128,201,196,216,226,  1,154,197, 10,104,134,188,180, 39,127,  0, 32,201,201,201,
-  0,112, 43, 35, 35, 35, 48, 57, 57, 89,225, 52,249,155, 76,160,105, 35,140, 52, 13, 83, 29,242,231, 88,215,138, 33, 49, 49, 17,
-121,121,121,119, 91, 87, 90, 26,226,227,227,107,206,183,109,219,214,100,101,199, 78,225,105,114,253,179, 39,254,169, 83,167,162,
-127,255,254, 54,  5,192, 85,143, 64,179, 84,194,146,235,197,208,238,252, 55,124, 94, 88,141,240,168,246,  8, 11,150,224,250,206,
-235, 22,242, 15,240,179, 12,  1,  8,120,206,105,176,205, 52,198,214,229,226, 53,220,124,127, 57,244,153, 27, 27,247, 16, 72, 36,
- 48, 24, 12, 40, 40, 40, 64,185,225, 10,186, 32,188,193,103,173,110,240,198,234, 62,177,181, 19,235,179, 57,110,180, 47, 98,215,
-174, 57, 55,219, 25,105,132,184,157,174,131,245,189,111,124,124, 60, 71,  8,177, 13,229, 52,229,125,109,109,153,227,243,249, 77,
- 42,243,164,164, 36,127,  0,147, 14, 30, 60,248,111,150,101,141,118,117,137,207,227,241,188,147,146,146, 94,218,180,105,211, 94,
-135,140,185,104,  1,191,242, 86,133, 88, 32, 16,121, 83,124,226,199,241, 68, 94, 44,143,199,103,  9,  5,150,240,205, 28,143,103,
-228,177,196,160,229,153,117,222, 66,  1,249,226,216, 94,195,220,148,153, 44,138, 29,167, 81,161, 80,168,117, 58, 29,  3,  0, 90,
-173,150,125,247,221,119,107,  8,255,131, 15, 62,120,163,169,245,125,244,232,209,179,109,255,103,103,103,167, 55, 71, 27,162, 28,
- 89,255,203,167,196,195, 80, 81,129,183,122,118,131,253,216,189,211, 86,200,196,137, 49,  0,106,145,255,196,137, 19, 99,  1,144,
-137, 19, 39,198,110,152,248,153,197,179,216,181, 85,173,231,157,193,194,117,249, 88,184, 46, 31,115, 86, 93,194,115,203,254,192,
-228,255, 59,219,244,142,174,164,196, 41,197,224,175, 34,127,235,152, 63,215,128, 39,  0, 38,154,198,224, 65,131,154, 67,201,224,
-182,110,221,138,173, 91,183, 66, 38,147,213, 28, 46, 42, 60,156, 76, 38, 67,108,108,108, 13,249,219,223, 76, 78, 78, 86, 58,211,
- 49, 49,140,217, 98,249, 27, 45,174,255,186,228,111, 54,155,161,213,107, 93,122, 65,155,199,160,174,215, 96,219,182,109,216,182,
-109, 91, 45,101,192,165,247,205,169,221, 31, 90,207,155,164, 36,218,200,127,234,212,169, 72, 77, 77,173, 33,127,  1, 95,224, 42,
-249,219, 58,240,134, 14,167,161, 71, 49,170, 39, 13,  6,151,249, 22, 74,174, 23,131,155,212,253,110, 38,100,190,  5,126,155, 16,
- 32, 32,224, 47,213,140,181,149,  5,208,103,110,  4,199,113,184,112,225,  2, 70,142, 28,  9,137, 68, 82,139,248,  3,  3,  3,161,
-215,235,161,215,235, 81, 90, 90,138,105,250,121,248, 34,240,245,  6,101, 58,233,242, 38,117,158,117,149,184,155,203, 88, 33, 13,
-144,191,211,117,176,238,251,198,199,199,115,219,182,109, 67,102,102, 38, 18, 18, 18,184,166,190,175,149,252,193, 48,140,219,109,
- 34, 41, 41, 73, 12,224,229,236,236,236,119,151, 45, 91,118,130, 16, 34,181, 29,  0,218,  5,  7,  7,123, 29, 58,116,104,125, 82,
- 82,210,200,198,228,124,150,190,158,199, 35,  2, 17,205,112,126, 70,163, 41,212,204,178,237,204, 44, 27,101, 38, 36,  2, 60, 94,
- 48, 33, 36,  0,132,231,199,114,  8,226,104, 54, 64,173, 55,121,135,250, 49, 60,106,144,198,169, 50,210,233,116, 76, 93,171,191,
-165,131,106,140,184,187,116,233,130,206, 62,126,208,149,221,198,227,253,  7,184, 76,208, 54, 37, 98,233,214,229,  0, 80, 67,254,

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list