[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53167] tags/blender-2.65a-release/blender : svn merge ^/trunk/blender -c53096 -c53112 -c53123 -c53129

Campbell Barton ideasman42 at gmail.com
Wed Dec 19 11:13:59 CET 2012


Revision: 53167
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53167
Author:   campbellbarton
Date:     2012-12-19 10:13:59 +0000 (Wed, 19 Dec 2012)
Log Message:
-----------
svn merge ^/trunk/blender -c53096 -c53112 -c53123 -c53129

Modified Paths:
--------------
    tags/blender-2.65a-release/blender/release/scripts/startup/bl_ui/properties_physics_cloth.py
    tags/blender-2.65a-release/blender/release/scripts/templates/operator_modal_view3d_raycast.py
    tags/blender-2.65a-release/blender/source/blender/blenkernel/BKE_object.h
    tags/blender-2.65a-release/blender/source/blender/blenkernel/intern/object.c
    tags/blender-2.65a-release/blender/source/blender/editors/interface/interface_panel.c
    tags/blender-2.65a-release/blender/source/blender/editors/object/object_transform.c
    tags/blender-2.65a-release/blender/source/blender/editors/space_clip/tracking_ops.c
    tags/blender-2.65a-release/blender/source/blender/makesrna/intern/rna_cloth.c
    tags/blender-2.65a-release/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp

Property Changed:
----------------
    tags/blender-2.65a-release/blender/


Property changes on: tags/blender-2.65a-release/blender
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126
/trunk/blender:52842-52858,52867,52870-52871,52883,52891,52910,52915,52919,52928,52930,52945,52958,52966,52977,52981,52994-52998,53005,53015,53037-53039,53056,53061,53063,53065-53067,53077,53086-53087,53090,53095,53102-53105,53107,53148
   + /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126
/trunk/blender:52842-52858,52867,52870-52871,52883,52891,52910,52915,52919,52928,52930,52945,52958,52966,52977,52981,52994-52998,53005,53015,53037-53039,53056,53061,53063,53065-53067,53077,53086-53087,53090,53095-53096,53102-53105,53107,53112,53123,53129,53148

Modified: tags/blender-2.65a-release/blender/release/scripts/startup/bl_ui/properties_physics_cloth.py
===================================================================
--- tags/blender-2.65a-release/blender/release/scripts/startup/bl_ui/properties_physics_cloth.py	2012-12-19 10:12:58 UTC (rev 53166)
+++ tags/blender-2.65a-release/blender/release/scripts/startup/bl_ui/properties_physics_cloth.py	2012-12-19 10:13:59 UTC (rev 53167)
@@ -91,7 +91,7 @@
         sub.prop(cloth, "pin_stiffness", text="Stiffness")
 
         col.label(text="Pre roll:")
-        col.prop(cloth, "pre_roll", text="Frame")
+        col.prop(cloth, "pre_roll", text="Frames")
 
         # Disabled for now
         """

Modified: tags/blender-2.65a-release/blender/release/scripts/templates/operator_modal_view3d_raycast.py
===================================================================
--- tags/blender-2.65a-release/blender/release/scripts/templates/operator_modal_view3d_raycast.py	2012-12-19 10:12:58 UTC (rev 53166)
+++ tags/blender-2.65a-release/blender/release/scripts/templates/operator_modal_view3d_raycast.py	2012-12-19 10:13:59 UTC (rev 53167)
@@ -16,7 +16,6 @@
     ray_origin = view3d_utils.region_2d_to_origin_3d(region, rv3d, coord)
     ray_target = ray_origin + (view_vector * ray_max)
 
-    scene.cursor_location = ray_target
 
     def visible_objects_and_duplis():
         """Loop over (object, matrix) pairs (mesh only)"""
@@ -58,7 +57,9 @@
         if obj.type == 'MESH':
             hit, normal, face_index = obj_ray_cast(obj, matrix)
             if hit is not None:
-                length_squared = (hit - ray_origin).length_squared
+                hit_world = matrix * hit
+                scene.cursor_location = hit_world
+                length_squared = (hit_world - ray_origin).length_squared
                 if length_squared < best_length_squared:
                     best_length_squared = length_squared
                     best_obj = obj
@@ -67,6 +68,7 @@
     # we could do lots of stuff but for the example just select.
     if best_obj is not None:
         best_obj.select = True
+        context.scene.objects.active = best_obj
 
 
 class ViewOperatorRayCast(bpy.types.Operator):
@@ -105,3 +107,4 @@
 
 if __name__ == "__main__":
     register()
+

Modified: tags/blender-2.65a-release/blender/source/blender/blenkernel/BKE_object.h
===================================================================
--- tags/blender-2.65a-release/blender/source/blender/blenkernel/BKE_object.h	2012-12-19 10:12:58 UTC (rev 53166)
+++ tags/blender-2.65a-release/blender/source/blender/blenkernel/BKE_object.h	2012-12-19 10:13:59 UTC (rev 53167)
@@ -88,7 +88,7 @@
 int  BKE_object_obdata_is_libdata(struct Object *ob);
 
 void BKE_object_scale_to_mat3(struct Object *ob, float mat[][3]);
-void BKE_object_rot_to_mat3(struct Object *ob, float mat[][3]);
+void BKE_object_rot_to_mat3(struct Object *ob, float mat[][3], short use_drot);
 void BKE_object_mat3_to_rot(struct Object *ob, float mat[][3], short use_compat);
 void BKE_object_to_mat3(struct Object *ob, float mat[][3]);
 void BKE_object_to_mat4(struct Object *ob, float mat[][4]);

Modified: tags/blender-2.65a-release/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- tags/blender-2.65a-release/blender/source/blender/blenkernel/intern/object.c	2012-12-19 10:12:58 UTC (rev 53166)
+++ tags/blender-2.65a-release/blender/source/blender/blenkernel/intern/object.c	2012-12-19 10:13:59 UTC (rev 53167)
@@ -1495,7 +1495,7 @@
 	size_to_mat3(mat, vec);
 }
 
-void BKE_object_rot_to_mat3(Object *ob, float mat[][3])
+void BKE_object_rot_to_mat3(Object *ob, float mat[3][3], short use_drot)
 {
 	float rmat[3][3], dmat[3][3];
 	
@@ -1526,7 +1526,10 @@
 	}
 	
 	/* combine these rotations */
-	mul_m3_m3m3(mat, dmat, rmat);
+	if(use_drot)
+		mul_m3_m3m3(mat, dmat, rmat);
+	else
+		copy_m3_m3(mat, rmat);
 }
 
 void BKE_object_mat3_to_rot(Object *ob, float mat[][3], short use_compat)
@@ -1671,7 +1674,7 @@
 	BKE_object_scale_to_mat3(ob, smat);
 
 	/* rot */
-	BKE_object_rot_to_mat3(ob, rmat);
+	BKE_object_rot_to_mat3(ob, rmat, TRUE);
 	mul_m3_m3m3(mat, rmat, smat);
 }
 

Modified: tags/blender-2.65a-release/blender/source/blender/editors/interface/interface_panel.c
===================================================================
--- tags/blender-2.65a-release/blender/source/blender/editors/interface/interface_panel.c	2012-12-19 10:12:58 UTC (rev 53166)
+++ tags/blender-2.65a-release/blender/source/blender/editors/interface/interface_panel.c	2012-12-19 10:13:59 UTC (rev 53167)
@@ -164,15 +164,20 @@
 
 /****************************** panels ******************************/
 
-static void panels_collapse_all(ScrArea *sa, ARegion *ar)
+static void panels_collapse_all(ScrArea *sa, ARegion *ar, Panel *from_pa)
 {
 	Panel *pa;
+	PanelType *pt, *from_pt;
 	int flag = ((panel_aligned(sa, ar) == BUT_HORIZONTAL) ? PNL_CLOSEDX : PNL_CLOSEDY);
 
 	for (pa = ar->panels.first; pa; pa = pa->next) {
-		if (pa->type && !(pa->type->flag & PNL_NO_HEADER)) {
-			pa->flag = flag;
-		}
+		pt = pa->type;
+		from_pt = from_pa->type;
+
+		/* close panels with headers in the same context */
+		if (pt && from_pt && !(pt->flag & PNL_NO_HEADER))
+			if (!pt->context[0] || strcmp(pt->context, from_pt->context) == 0)
+				pa->flag = flag;
 	}
 }
 
@@ -1016,7 +1021,7 @@
 
 /* this function is supposed to call general window drawing too */
 /* also it supposes a block has panel, and isn't a menu */
-static void ui_handle_panel_header(const bContext *C, uiBlock *block, int mx, int my, int event)
+static void ui_handle_panel_header(const bContext *C, uiBlock *block, int mx, int my, int event, int ctrl)
 {
 	ScrArea *sa = CTX_wm_area(C);
 	ARegion *ar = CTX_wm_region(C);
@@ -1049,6 +1054,9 @@
 			ED_region_tag_redraw(ar);
 		}
 		else {  /* collapse */
+			if(ctrl)
+				panels_collapse_all(sa, ar, block->panel);
+
 			if (block->panel->flag & PNL_CLOSED) {
 				block->panel->flag &= ~PNL_CLOSED;
 				/* snap back up so full panel aligns with screen edge */
@@ -1088,7 +1096,6 @@
 
 int ui_handler_panel_region(bContext *C, wmEvent *event)
 {
-	ScrArea *sa = CTX_wm_area(C);
 	ARegion *ar = CTX_wm_region(C);
 	uiBlock *block;
 	Panel *pa;
@@ -1118,10 +1125,10 @@
 				
 				if (pa->flag & PNL_CLOSEDY) {
 					if ((block->rect.ymax <= my) && (block->rect.ymax + PNL_HEADER >= my))
-						ui_handle_panel_header(C, block, mx, my, event->type);
+						ui_handle_panel_header(C, block, mx, my, event->type, event->ctrl);
 				}
 				else
-					ui_handle_panel_header(C, block, mx, my, event->type);
+					ui_handle_panel_header(C, block, mx, my, event->type, event->ctrl);
 				
 				continue;
 			}
@@ -1150,15 +1157,13 @@
 				/* open close on header */
 				if (ELEM(event->type, RETKEY, PADENTER)) {
 					if (inside_header) {
-						ui_handle_panel_header(C, block, mx, my, RETKEY);
+						ui_handle_panel_header(C, block, mx, my, RETKEY, event->ctrl);
 						break;
 					}
 				}
 				else if (event->type == LEFTMOUSE) {
 					if (inside_header) {
-						if (event->ctrl)
-							panels_collapse_all(sa, ar);
-						ui_handle_panel_header(C, block, mx, my, 0);
+						ui_handle_panel_header(C, block, mx, my, 0, event->ctrl);
 						break;
 					}
 					else if (inside_scale && !(pa->flag & PNL_CLOSED)) {

Modified: tags/blender-2.65a-release/blender/source/blender/editors/object/object_transform.c
===================================================================
--- tags/blender-2.65a-release/blender/source/blender/editors/object/object_transform.c	2012-12-19 10:12:58 UTC (rev 53166)
+++ tags/blender-2.65a-release/blender/source/blender/editors/object/object_transform.c	2012-12-19 10:13:59 UTC (rev 53167)
@@ -447,7 +447,7 @@
 			float tmat[3][3], timat[3][3];
 
 			/* simple rotation matrix */
-			BKE_object_rot_to_mat3(ob, rsmat);
+			BKE_object_rot_to_mat3(ob, rsmat, TRUE);
 
 			/* correct for scale, note mul_m3_m3m3 has swapped args! */
 			BKE_object_scale_to_mat3(ob, tmat);

Modified: tags/blender-2.65a-release/blender/source/blender/editors/space_clip/tracking_ops.c
===================================================================
--- tags/blender-2.65a-release/blender/source/blender/editors/space_clip/tracking_ops.c	2012-12-19 10:12:58 UTC (rev 53166)
+++ tags/blender-2.65a-release/blender/source/blender/editors/space_clip/tracking_ops.c	2012-12-19 10:13:59 UTC (rev 53167)
@@ -2025,7 +2025,7 @@
 		if (!flip) {

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list