[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23802] trunk/blender/source/blender/ editors: * Fixing crash on mingw when entering world buttons

[Joshua Leung]

Revision: 23802
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23802
Author:   aligorith
Date:     2009-10-13 08:15:41 +0200 (Tue, 13 Oct 2009)

Log Message:
-----------
* Fixing crash on mingw when entering world buttons
* Changing hotkey in text editor for 'jumping' to a particular line to Ctrl-G, since this appears to be more standard (and is easier to hit).

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_buttons/buttons_context.c
    trunk/blender/source/blender/editors/space_text/space_text.c

Modified: trunk/blender/source/blender/editors/space_buttons/buttons_context.c
===================================================================
--- trunk/blender/source/blender/editors/space_buttons/buttons_context.c	2009-10-13 05:50:26 UTC (rev 23801)
+++ trunk/blender/source/blender/editors/space_buttons/buttons_context.c	2009-10-13 06:15:41 UTC (rev 23802)
@@ -117,6 +117,7 @@
 static int buttons_context_path_world(ButsContextPath *path)
 {
 	Scene *scene;
+	World *world;
 	PointerRNA *ptr= &path->ptr[path->len-1];
 
 	/* if we already have a (pinned) world, we're done */
@@ -126,11 +127,14 @@
 	/* if we have a scene, use the scene's world */
 	else if(buttons_context_path_scene(path)) {
 		scene= path->ptr[path->len-1].data;
+		world= scene->world;
+		
+		if(world) {
+			RNA_id_pointer_create(&scene->world->id, &path->ptr[path->len]);
+			path->len++;
 
-		RNA_id_pointer_create(&scene->world->id, &path->ptr[path->len]);
-		path->len++;
-
-		return 1;
+			return 1;
+		}
 	}
 
 	/* no path to a world possible */
@@ -367,7 +371,7 @@
 		wo= path->ptr[path->len-1].data;
 
 		if(wo) {
-			give_current_world_texture(wo);
+			tex= give_current_world_texture(wo);
 
 			RNA_id_pointer_create(&tex->id, &path->ptr[path->len]);
 			path->len++;

Modified: trunk/blender/source/blender/editors/space_text/space_text.c
===================================================================
--- trunk/blender/source/blender/editors/space_text/space_text.c	2009-10-13 05:50:26 UTC (rev 23801)
+++ trunk/blender/source/blender/editors/space_text/space_text.c	2009-10-13 06:15:41 UTC (rev 23802)
@@ -241,7 +241,7 @@
 	if(U.uiflag & USER_MMB_PASTE) // XXX not dynamic
 		RNA_boolean_set(WM_keymap_add_item(keymap, "TEXT_OT_paste", MIDDLEMOUSE, KM_PRESS, 0, 0)->ptr, "selection", 1);
 
-	WM_keymap_add_item(keymap, "TEXT_OT_jump", JKEY, KM_PRESS, KM_ALT, 0);
+	WM_keymap_add_item(keymap, "TEXT_OT_jump", GKEY, KM_PRESS, KM_CTRL, 0);
 	WM_keymap_add_item(keymap, "TEXT_OT_find", FKEY, KM_PRESS, KM_CTRL, 0);
 	
 	WM_keymap_add_item(keymap, "TEXT_OT_properties", FKEY, KM_PRESS, KM_CTRL, 0);