[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22903] branches/blender2.5/blender/source /blender/editors/transform: Fix crash reported by DingTo with camera transform in camera view.

Martin Poirier theeth at yahoo.com
Sun Aug 30 23:57:10 CEST 2009


Revision: 22903
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22903
Author:   theeth
Date:     2009-08-30 23:57:10 +0200 (Sun, 30 Aug 2009)

Log Message:
-----------
Fix crash reported by DingTo with camera transform in camera view.

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/transform/transform_conversions.c
    branches/blender2.5/blender/source/blender/editors/transform/transform_generics.c

Modified: branches/blender2.5/blender/source/blender/editors/transform/transform_conversions.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/transform/transform_conversions.c	2009-08-30 21:52:13 UTC (rev 22902)
+++ branches/blender2.5/blender/source/blender/editors/transform/transform_conversions.c	2009-08-30 21:57:10 UTC (rev 22903)
@@ -5289,7 +5289,7 @@
 		if (t->ar->regiontype == RGN_TYPE_WINDOW)
 		{
 			View3D *v3d = t->view;
-			RegionView3D *rv3d = t->ar->regiondata;
+			RegionView3D *rv3d = CTX_wm_region_view3d(C);
 			if((t->flag & T_OBJECT) && v3d->camera == OBACT && rv3d->persp==V3D_CAMOB)
 			{
 				t->flag |= T_CAMERA;

Modified: branches/blender2.5/blender/source/blender/editors/transform/transform_generics.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/transform/transform_generics.c	2009-08-30 21:52:13 UTC (rev 22902)
+++ branches/blender2.5/blender/source/blender/editors/transform/transform_generics.c	2009-08-30 21:57:10 UTC (rev 22903)
@@ -1323,7 +1323,7 @@
 	/* voor panning from cameraview */
 	if(t->flag & T_OBJECT)
 	{
-		if(t->spacetype==SPACE_VIEW3D)
+		if(t->spacetype==SPACE_VIEW3D && t->ar->regiontype == RGN_TYPE_WINDOW)
 		{
 			View3D *v3d = t->view;
 			Scene *scene = t->scene;





More information about the Bf-blender-cvs mailing list