[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48857] trunk/blender/source/blender/ blenkernel/intern/object.c: Fix #32041: Empty display size is not taken into account for centering view

[Sergey Sharybin]

Revision: 48857
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48857
Author:   nazgul
Date:     2012-07-12 10:27:22 +0000 (Thu, 12 Jul 2012)
Log Message:
-----------
Fix #32041: Empty display size is not taken into account for centering view

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/object.c

Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/object.c     2012-07-12 
09:56:18 UTC (rev 48856)
+++ trunk/blender/source/blender/blenkernel/intern/object.c     2012-07-12 
10:27:22 UTC (rev 48857)
@@ -2300,14 +2300,21 @@
        }
 
        if (change == FALSE) {
+               float size[3];
+
+               copy_v3_v3(size, ob->size);
+               if (ob->type == OB_EMPTY) {
+                       mul_v3_fl(size, ob->empty_drawsize);
+               }
+
                minmax_v3v3_v3(min_r, max_r, ob->obmat[3]);
 
                copy_v3_v3(vec, ob->obmat[3]);
-               add_v3_v3(vec, ob->size);
+               add_v3_v3(vec, size);
                minmax_v3v3_v3(min_r, max_r, vec);
 
                copy_v3_v3(vec, ob->obmat[3]);
-               sub_v3_v3(vec, ob->size);
+               sub_v3_v3(vec, size);
                minmax_v3v3_v3(min_r, max_r, vec);
        }
 }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs