[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44135] trunk/blender/source/blender: readfile update after version/subversion bump

[Dalai Felinto]

Revision: 44135
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44135
Author:   dfelinto
Date:     2012-02-15 18:17:31 +0000 (Wed, 15 Feb 2012)
Log Message:
-----------
readfile update after version/subversion bump
Note, there is no need to leave doversion code outside a version/subversion nest.
e.g. having if version < 262   in a 2.61 file will make the code to double-run.
however this is the same case for the code nested outside the if versions ...
with the advantage of making ahoys/version bumping easier.

Ton himself was unaware of how we were doing this and suggested to get rid of the /* put subversion code here */ practise.

Modified Paths:
--------------
    trunk/blender/source/blender/blenloader/intern/readfile.c
    trunk/blender/source/blender/editors/space_logic/logic_buttons.c
    trunk/blender/source/blender/editors/space_logic/logic_intern.h
    trunk/blender/source/blender/editors/space_logic/space_logic.c

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2012-02-15 18:11:10 UTC (rev 44134)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2012-02-15 18:17:31 UTC (rev 44135)
@@ -13062,20 +13062,18 @@
 			}
 		}
 	}
-	
-	/* put compatibility code here until next subversion bump */
+
+	if (main->versionfile < 262)
 	{
-		{
-			Object *ob;
-			for(ob=main->object.first; ob; ob= ob->id.next) {
-				ModifierData *md;
+		Object *ob;
+		for(ob=main->object.first; ob; ob= ob->id.next) {
+			ModifierData *md;
 
-				for (md=ob->modifiers.first; md; md=md->next) {
-					if (md->type==eModifierType_Cloth) {
-						ClothModifierData *clmd = (ClothModifierData*) md;
-						if(clmd->sim_parms)
-							clmd->sim_parms->vel_damping = 1.0f;
-					}
+			for (md=ob->modifiers.first; md; md=md->next) {
+				if (md->type==eModifierType_Cloth) {
+					ClothModifierData *clmd = (ClothModifierData*) md;
+					if(clmd->sim_parms)
+						clmd->sim_parms->vel_damping = 1.0f;
 				}
 			}
 		}

Modified: trunk/blender/source/blender/editors/space_logic/logic_buttons.c
===================================================================
--- trunk/blender/source/blender/editors/space_logic/logic_buttons.c	2012-02-15 18:11:10 UTC (rev 44134)
+++ trunk/blender/source/blender/editors/space_logic/logic_buttons.c	2012-02-15 18:17:31 UTC (rev 44135)
@@ -127,6 +127,31 @@
 	ot->flag= 0;
 }
 
+static int logic_view_all_exec(bContext *C, wmOperator *UNUSED(op))
+{
+	ScrArea *sa= CTX_wm_area(C);
+	ARegion *ar= logic_has_buttons_region(sa);
+	SpaceLogic *slog = CTX_wm_space_image(C);
+
+
+	ED_region_tag_redraw(CTX_wm_region(C));
+
+	return OPERATOR_FINISHED;
+}
+
+void LOGIC_OT_view_all(wmOperatorType *ot)
+{
+	ot->name= "View All";
+	ot->idname= "LOGIC_OT_view_all";
+	
+	ot->exec= logic_view_all_exec;;
+	ot->poll= ED_operator_logic_active;
+	
+	/* flags */
+	ot->flag= 0;
+}
+
+
 /* Remove Logic Bricks Connections */
 /* ********************** Cut Link operator ***************** */
 

Modified: trunk/blender/source/blender/editors/space_logic/logic_intern.h
===================================================================
--- trunk/blender/source/blender/editors/space_logic/logic_intern.h	2012-02-15 18:11:10 UTC (rev 44134)
+++ trunk/blender/source/blender/editors/space_logic/logic_intern.h	2012-02-15 18:17:31 UTC (rev 44135)
@@ -51,6 +51,7 @@
 void logic_buttons_register(struct ARegionType *art);
 void LOGIC_OT_properties(struct wmOperatorType *ot);
 void LOGIC_OT_links_cut(struct wmOperatorType *ot);
+void LOGIC_OT_view_all(struct wmOperatorType *ot);
 
 /* logic_window.c */
 void logic_buttons(struct bContext *C, struct ARegion *ar);

Modified: trunk/blender/source/blender/editors/space_logic/space_logic.c
===================================================================
--- trunk/blender/source/blender/editors/space_logic/space_logic.c	2012-02-15 18:11:10 UTC (rev 44134)
+++ trunk/blender/source/blender/editors/space_logic/space_logic.c	2012-02-15 18:17:31 UTC (rev 44135)
@@ -131,7 +131,7 @@
 	
 	ar->v2d.min[0]= 1.0f;
 	ar->v2d.min[1]= 1.0f;
-	
+
 	ar->v2d.max[0]= 32000.0f;
 	ar->v2d.max[1]= 32000.0f;
 	
@@ -174,6 +174,7 @@
 {
 	WM_operatortype_append(LOGIC_OT_properties);
 	WM_operatortype_append(LOGIC_OT_links_cut);
+	WM_operatortype_append(LOGIC_OT_view_all);
 }
 
 static void logic_keymap(struct wmKeyConfig *keyconf)
@@ -182,6 +183,7 @@
 	
 	WM_keymap_add_item(keymap, "LOGIC_OT_properties", NKEY, KM_PRESS, 0, 0);
 	WM_keymap_add_item(keymap, "LOGIC_OT_links_cut", LEFTMOUSE, KM_PRESS, KM_CTRL, 0);
+	WM_keymap_add_item(keymap, "LOGIC_OT_view_all", HOMEKEY, KM_PRESS, 0, 0);
 	WM_keymap_add_menu(keymap, "LOGIC_MT_logicbricks_add", AKEY, KM_PRESS, KM_SHIFT, 0);
 }