[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27245] trunk/blender/source/blender/ editors/animation/anim_markers.c: marker/camera select, makes active as well as selecting.

Campbell Barton ideasman42 at gmail.com
Wed Mar 3 12:48:04 CET 2010


Revision: 27245
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27245
Author:   campbellbarton
Date:     2010-03-03 12:48:03 +0100 (Wed, 03 Mar 2010)

Log Message:
-----------
marker/camera select, makes active as well as selecting.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/animation/anim_markers.c

Modified: trunk/blender/source/blender/editors/animation/anim_markers.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_markers.c	2010-03-03 11:40:12 UTC (rev 27244)
+++ trunk/blender/source/blender/editors/animation/anim_markers.c	2010-03-03 11:48:03 UTC (rev 27245)
@@ -817,6 +817,7 @@
 
 	if(camera) {
 		Scene *scene= CTX_data_scene(C);
+		Base *base;
 		TimeMarker *marker;
 		int sel;
 
@@ -833,7 +834,12 @@
 		for (marker= markers->first; marker; marker= marker->next) {
 			if(marker->camera) {
 				if(marker->frame==cfra) {
-					ED_base_object_select(object_in_scene(marker->camera, scene), sel);
+					base= object_in_scene(marker->camera, scene);
+					if(base) {
+						ED_base_object_select(base, sel);
+						if(sel)
+							ED_base_object_activate(C, base);
+					}
 				}
 			}
 		}





More information about the Bf-blender-cvs mailing list