[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14560] branches/apricot: changes from trunk

[Campbell Barton]

Revision: 14560
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14560
Author:   campbellbarton
Date:     2008-04-27 17:00:31 +0200 (Sun, 27 Apr 2008)

Log Message:
-----------
changes from trunk

Modified Paths:
--------------
    branches/apricot/bin/.blender/.Blanguages
    branches/apricot/bin/.blender/locale/uk/LC_MESSAGES/blender.mo
    branches/apricot/release/datafiles/datatoc.c
    branches/apricot/source/blender/include/blendef.h
    branches/apricot/source/blender/src/editobject.c
    branches/apricot/source/blender/src/meshtools.c
    branches/apricot/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp

Modified: branches/apricot/bin/.blender/.Blanguages
===================================================================
--- branches/apricot/bin/.blender/.Blanguages	2008-04-27 14:29:49 UTC (rev 14559)
+++ branches/apricot/bin/.blender/.Blanguages	2008-04-27 15:00:31 UTC (rev 14560)
@@ -14,7 +14,7 @@
 Russian:ru_RU
 Croatian:hr_HR
 Serbian:sr
-Ukrainian:uk
+Ukrainian:uk_UA
 Polish:pl_PL
 Romanian:ro
 Arabic:ar

Modified: branches/apricot/bin/.blender/locale/uk/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)

Modified: branches/apricot/release/datafiles/datatoc.c
===================================================================
--- branches/apricot/release/datafiles/datatoc.c	2008-04-27 14:29:49 UTC (rev 14559)
+++ branches/apricot/release/datafiles/datatoc.c	2008-04-27 15:00:31 UTC (rev 14560)
@@ -93,7 +93,6 @@
 		/* fprintf (fpout, "\\x%02x", getc(fpin)); */
 		fprintf (fpout, "%3d,", getc(fpin));
 	}
-
 	/* null terminate for the case it is a string */
 	fprintf (fpout, "\n  0};\n\n");
 	

Modified: branches/apricot/source/blender/include/blendef.h
===================================================================
--- branches/apricot/source/blender/include/blendef.h	2008-04-27 14:29:49 UTC (rev 14559)
+++ branches/apricot/source/blender/include/blendef.h	2008-04-27 15:00:31 UTC (rev 14560)
@@ -96,6 +96,10 @@
 
 #define TESTBASE(base)	( ((base)->flag & SELECT) && ((base)->lay & G.vd->lay) && (((base)->object->restrictflag & OB_RESTRICT_VIEW)==0) )
 #define TESTBASELIB(base)	( ((base)->flag & SELECT) && ((base)->lay & G.vd->lay) && ((base)->object->id.lib==0) && (((base)->object->restrictflag & OB_RESTRICT_VIEW)==0))
+
+/* This is a TESTBASELIB that can work without a 3D view */
+#define TESTBASELIB_BGMODE(base)	( ((base)->flag & SELECT) && ((base)->lay & (G.vd ? G.vd->lay : G.scene->lay)) && ((base)->object->id.lib==0) && (((base)->object->restrictflag & OB_RESTRICT_VIEW)==0))
+
 #define BASE_SELECTABLE(base)	 ((base->lay & G.vd->lay) && (base->object->restrictflag & (OB_RESTRICT_SELECT|OB_RESTRICT_VIEW))==0)
 #define FIRSTBASE		G.scene->base.first
 #define LASTBASE		G.scene->base.last

Modified: branches/apricot/source/blender/src/editobject.c
===================================================================
--- branches/apricot/source/blender/src/editobject.c	2008-04-27 14:29:49 UTC (rev 14559)
+++ branches/apricot/source/blender/src/editobject.c	2008-04-27 15:00:31 UTC (rev 14560)
@@ -3896,7 +3896,7 @@
 void apply_objects_locrot( void )
 {
 	Base *base, *basact;
-	Object *ob;
+	Object *ob, *ob_child;
 	bArmature *arm;
 	Mesh *me;
 	Curve *cu;
@@ -3907,6 +3907,7 @@
 	float mat[3][3];
 	int a, change = 0;
 	
+	
 	/* first check if we can execute */
 	for (base= FIRSTBASE; base; base= base->next) {
 		if TESTBASELIB(base) {
@@ -4040,7 +4041,18 @@
 				BASACT= basact;
 				
 				change = 1;
+			} else {
+				continue;
 			}
+			
+			/* a change was made, adjust the children to compensate */
+			for (ob_child=G.main->object.first; ob_child; ob_child=ob_child->id.next) {
+				if (ob_child->parent == ob) {
+					apply_obmat(ob_child);
+					what_does_parent(ob_child);
+					Mat4Invert(ob_child->parentinv, workob.obmat);
+				}
+			}
 		}
 	}
 	if (change) {

Modified: branches/apricot/source/blender/src/meshtools.c
===================================================================
--- branches/apricot/source/blender/src/meshtools.c	2008-04-27 14:29:49 UTC (rev 14559)
+++ branches/apricot/source/blender/src/meshtools.c	2008-04-27 15:00:31 UTC (rev 14560)
@@ -164,7 +164,7 @@
 	/* count & check */
 	base= FIRSTBASE;
 	while(base) {
-		if TESTBASELIB(base) {
+		if TESTBASELIB_BGMODE(base) { /* BGMODE since python can access */
 			if(base->object->type==OB_MESH) {
 				me= base->object->data;
 				totvert+= me->totvert;
@@ -200,7 +200,7 @@
 
 	/* if needed add edges to other meshes */
 	for(base= FIRSTBASE; base; base= base->next) {
-		if TESTBASELIB(base) {
+		if TESTBASELIB_BGMODE(base) {
 			if(base->object->type==OB_MESH) {
 				me= base->object->data;
 				totedge += me->totedge;
@@ -221,7 +221,7 @@
 	
 	base= FIRSTBASE;
 	while(base) {
-		if TESTBASELIB(base) {
+		if TESTBASELIB_BGMODE(base) {
 			if(ob!=base->object && base->object->type==OB_MESH) {
 				me= base->object->data;
 
@@ -288,7 +288,7 @@
 	base= FIRSTBASE;
 	while(base) {
 		nextb= base->next;
-		if TESTBASELIB(base) {
+		if TESTBASELIB_BGMODE(base) {
 			if(base->object->type==OB_MESH) {
 				
 				me= base->object->data;

Modified: branches/apricot/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
===================================================================
--- branches/apricot/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp	2008-04-27 14:29:49 UTC (rev 14559)
+++ branches/apricot/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp	2008-04-27 15:00:31 UTC (rev 14560)
@@ -44,7 +44,6 @@
 
 #include "BMF_Api.h"
 
-#include "BIF_gl.h"
 
 #ifdef __APPLE__
 #define GL_GLEXT_LEGACY 1
@@ -78,6 +77,7 @@
 #include "BKE_bmfont.h"
 #include "BKE_image.h"
 
+#include "BIF_gl.h"
 extern "C" {
 #include "BDR_drawmesh.h"
 #include "BIF_mywindow.h"