[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46630] branches/soc-2011-tomato: svn merge ^/trunk/blender -r46612:46629

Campbell Barton ideasman42 at gmail.com
Mon May 14 15:55:13 CEST 2012


Revision: 46630
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46630
Author:   campbellbarton
Date:     2012-05-14 13:55:12 +0000 (Mon, 14 May 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r46612:46629

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46612

Modified Paths:
--------------
    branches/soc-2011-tomato/GNUmakefile
    branches/soc-2011-tomato/extern/bullet2/readme.txt
    branches/soc-2011-tomato/extern/bullet2/src/LinearMath/btSerializer.h
    branches/soc-2011-tomato/intern/audaspace/CMakeLists.txt
    branches/soc-2011-tomato/source/blender/blenkernel/intern/CCGSubSurf.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/icons.c
    branches/soc-2011-tomato/source/blender/blenlib/intern/fileops.c
    branches/soc-2011-tomato/source/blender/editors/include/ED_clip.h
    branches/soc-2011-tomato/source/blender/editors/space_api/spacetypes.c
    branches/soc-2011-tomato/source/blender/editors/space_clip/clip_editor.c
    branches/soc-2011-tomato/source/blender/editors/space_clip/clip_intern.h
    branches/soc-2011-tomato/source/blender/editors/space_clip/space_clip.c
    branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c
    branches/soc-2011-tomato/source/blender/editors/space_logic/logic_buttons.c
    branches/soc-2011-tomato/source/blender/editors/space_node/node_edit.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_select.c
    branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_ops.c
    branches/soc-2011-tomato/source/blender/imbuf/intern/allocimbuf.c
    branches/soc-2011-tomato/source/blender/imbuf/intern/divers.c
    branches/soc-2011-tomato/source/blender/imbuf/intern/filter.c
    branches/soc-2011-tomato/source/blender/imbuf/intern/imageprocess.c
    branches/soc-2011-tomato/source/blender/imbuf/intern/rotate.c
    branches/soc-2011-tomato/source/blender/imbuf/intern/writeimage.c
    branches/soc-2011-tomato/source/blender/windowmanager/WM_api.h
    branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2011-tomato/source/gameengine/VideoTexture/CMakeLists.txt
    branches/soc-2011-tomato/source/tools/check_style_c.py

Added Paths:
-----------
    branches/soc-2011-tomato/extern/bullet2/patches/

Property Changed:
----------------
    branches/soc-2011-tomato/
    branches/soc-2011-tomato/source/blender/editors/interface/interface.c
    branches/soc-2011-tomato/source/blender/editors/space_outliner/


Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-46612
   + /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-46629

Modified: branches/soc-2011-tomato/GNUmakefile
===================================================================
--- branches/soc-2011-tomato/GNUmakefile	2012-05-14 13:54:00 UTC (rev 46629)
+++ branches/soc-2011-tomato/GNUmakefile	2012-05-14 13:55:12 UTC (rev 46630)
@@ -216,7 +216,7 @@
 
 test_style:
 	# run our own checks on C/C++ style
-	PYTHONIOENCODING=utf_8 python3.2 $(BLENDER_DIR)/source/tools/check_style_c.py $(BLENDER_DIR)/source/blender $(BLENDER_DIR)/source/creator
+	PYTHONIOENCODING=utf_8 python3.2 $(BLENDER_DIR)/source/tools/check_style_c.py $(BLENDER_DIR)/source/blender $(BLENDER_DIR)/source/creator --no-length-check
 
 # -----------------------------------------------------------------------------
 # Project Files

Modified: branches/soc-2011-tomato/extern/bullet2/readme.txt
===================================================================
--- branches/soc-2011-tomato/extern/bullet2/readme.txt	2012-05-14 13:54:00 UTC (rev 46629)
+++ branches/soc-2011-tomato/extern/bullet2/readme.txt	2012-05-14 13:55:12 UTC (rev 46630)
@@ -15,3 +15,7 @@
 Questions? mail blender at erwincoumans.com, or check the bf-blender mailing list.
 Thanks,
 Erwin
+
+Apply patches/make_id.patch to prevent duplicated define of MAKE_ID macro in blender
+side and bullet side.
+Sergey

Modified: branches/soc-2011-tomato/extern/bullet2/src/LinearMath/btSerializer.h
===================================================================
--- branches/soc-2011-tomato/extern/bullet2/src/LinearMath/btSerializer.h	2012-05-14 13:54:00 UTC (rev 46629)
+++ branches/soc-2011-tomato/extern/bullet2/src/LinearMath/btSerializer.h	2012-05-14 13:55:12 UTC (rev 46630)
@@ -106,23 +106,23 @@
 
 #define BT_HEADER_LENGTH 12
 #if defined(__sgi) || defined (__sparc) || defined (__sparc__) || defined (__PPC__) || defined (__ppc__) || defined (__BIG_ENDIAN__)
-#	define MAKE_ID(a,b,c,d) ( (int)(a)<<24 | (int)(b)<<16 | (c)<<8 | (d) )
+#	define BT_MAKE_ID(a,b,c,d) ( (int)(a)<<24 | (int)(b)<<16 | (c)<<8 | (d) )
 #else
-#	define MAKE_ID(a,b,c,d) ( (int)(d)<<24 | (int)(c)<<16 | (b)<<8 | (a) )
+#	define BT_MAKE_ID(a,b,c,d) ( (int)(d)<<24 | (int)(c)<<16 | (b)<<8 | (a) )
 #endif
 
-#define BT_SOFTBODY_CODE		MAKE_ID('S','B','D','Y')
-#define BT_COLLISIONOBJECT_CODE MAKE_ID('C','O','B','J')
-#define BT_RIGIDBODY_CODE		MAKE_ID('R','B','D','Y')
-#define BT_CONSTRAINT_CODE		MAKE_ID('C','O','N','S')
-#define BT_BOXSHAPE_CODE		MAKE_ID('B','O','X','S')
-#define BT_QUANTIZED_BVH_CODE	MAKE_ID('Q','B','V','H')
-#define BT_TRIANLGE_INFO_MAP	MAKE_ID('T','M','A','P')
-#define BT_SHAPE_CODE			MAKE_ID('S','H','A','P')
-#define BT_ARRAY_CODE			MAKE_ID('A','R','A','Y')
-#define BT_SBMATERIAL_CODE		MAKE_ID('S','B','M','T')
-#define BT_SBNODE_CODE			MAKE_ID('S','B','N','D')
-#define BT_DNA_CODE				MAKE_ID('D','N','A','1')
+#define BT_SOFTBODY_CODE		BT_MAKE_ID('S','B','D','Y')
+#define BT_COLLISIONOBJECT_CODE BT_MAKE_ID('C','O','B','J')
+#define BT_RIGIDBODY_CODE		BT_MAKE_ID('R','B','D','Y')
+#define BT_CONSTRAINT_CODE		BT_MAKE_ID('C','O','N','S')
+#define BT_BOXSHAPE_CODE		BT_MAKE_ID('B','O','X','S')
+#define BT_QUANTIZED_BVH_CODE	BT_MAKE_ID('Q','B','V','H')
+#define BT_TRIANLGE_INFO_MAP	BT_MAKE_ID('T','M','A','P')
+#define BT_SHAPE_CODE			BT_MAKE_ID('S','H','A','P')
+#define BT_ARRAY_CODE			BT_MAKE_ID('A','R','A','Y')
+#define BT_SBMATERIAL_CODE		BT_MAKE_ID('S','B','M','T')
+#define BT_SBNODE_CODE			BT_MAKE_ID('S','B','N','D')
+#define BT_DNA_CODE				BT_MAKE_ID('D','N','A','1')
 
 
 struct	btPointerUid

Modified: branches/soc-2011-tomato/intern/audaspace/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/intern/audaspace/CMakeLists.txt	2012-05-14 13:54:00 UTC (rev 46629)
+++ branches/soc-2011-tomato/intern/audaspace/CMakeLists.txt	2012-05-14 13:55:12 UTC (rev 46630)
@@ -193,6 +193,12 @@
 		ffmpeg/AUD_FFMPEGReader.h
 		ffmpeg/AUD_FFMPEGWriter.h
 	)
+
+	remove_strict_flags_file(
+		ffmpeg/AUD_FFMPEGFactory.cpp
+		ffmpeg/AUD_FFMPEGReader.cpp
+		ffmpeg/AUD_FFMPEGWriter.cpp
+	)
 endif()
 
 if(WITH_SDL)

Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/CCGSubSurf.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/CCGSubSurf.c	2012-05-14 13:54:00 UTC (rev 46629)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/CCGSubSurf.c	2012-05-14 13:55:12 UTC (rev 46630)
@@ -2406,7 +2406,7 @@
 	CCGFace **array;
 	int i, num;
 
-	if (!*faces) {
+	if (*faces == NULL) {
 		array = MEM_mallocN(sizeof(*array) * ss->fMap->numEntries, "CCGSubsurf allFaces");
 		num = 0;
 		for (i = 0; i < ss->fMap->curSize; i++) {

Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/icons.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/icons.c	2012-05-14 13:54:00 UTC (rev 46629)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/icons.c	2012-05-14 13:55:12 UTC (rev 46630)
@@ -51,11 +51,9 @@
 
 #include "BLO_sys_types.h" // for intptr_t support
 
-#define GS(a)	(*((short *)(a)))
-
 /* GLOBALS */
 
-static GHash* gIcons = NULL;
+static GHash *gIcons = NULL;
 
 static int gNextIconId = 1;
 
@@ -64,7 +62,7 @@
 
 static void icon_free(void *val)
 {
-	Icon* icon = val;
+	Icon *icon = val;
 
 	if (icon) {
 		if (icon->drawinfo_free) {		
@@ -84,15 +82,15 @@
 	int startId = gFirstIconId;
 
 	/* if we haven't used up the int number range, we just return the next int */
-	if (gNextIconId>=gFirstIconId)
+	if (gNextIconId >= gFirstIconId)
 		return gNextIconId++;
 	
 	/* now we try to find the smallest icon id not stored in the gIcons hash */
-	while (BLI_ghash_lookup(gIcons, SET_INT_IN_POINTER(startId)) && startId>=gFirstIconId) 
+	while (BLI_ghash_lookup(gIcons, SET_INT_IN_POINTER(startId)) && startId >= gFirstIconId)
 		startId++;
 
 	/* if we found a suitable one that isn't used yet, return it */
-	if (startId>=gFirstIconId)
+	if (startId >= gFirstIconId)
 		return startId;
 
 	/* fail */
@@ -115,14 +113,14 @@
 	gIcons = NULL;
 }
 
-struct PreviewImage* BKE_previewimg_create(void) 
+PreviewImage *BKE_previewimg_create(void)
 {
-	PreviewImage* prv_img = NULL;
+	PreviewImage *prv_img = NULL;
 	int i;
 
 	prv_img = MEM_callocN(sizeof(PreviewImage), "img_prv");
 
-	for (i=0; i<NUM_ICON_SIZES; ++i) {
+	for (i = 0; i < NUM_ICON_SIZES; ++i) {
 		prv_img->changed[i] = 1;
 		prv_img->changed_timestamp[i] = 0;
 	}
@@ -135,7 +133,7 @@
 	if (prv) {
 		int i;
 
-		for (i=0; i<NUM_ICON_SIZES;++i) {
+		for (i = 0; i < NUM_ICON_SIZES; ++i) {
 			if (prv->rect[i]) {
 				MEM_freeN(prv->rect[i]);
 				prv->rect[i] = NULL;
@@ -153,14 +151,14 @@
 	}
 }
 
-struct PreviewImage* BKE_previewimg_copy(PreviewImage *prv) 
+PreviewImage *BKE_previewimg_copy(PreviewImage *prv)
 {
-	PreviewImage* prv_img = NULL;
+	PreviewImage *prv_img = NULL;
 	int i;
 
 	if (prv) {
 		prv_img = MEM_dupallocN(prv);
-		for (i=0; i < NUM_ICON_SIZES; ++i) {
+		for (i = 0; i < NUM_ICON_SIZES; ++i) {
 			if (prv->rect[i]) {
 				prv_img->rect[i] = MEM_dupallocN(prv->rect[i]);
 			}
@@ -175,62 +173,62 @@
 void BKE_previewimg_free_id(ID *id) 
 {
 	if (GS(id->name) == ID_MA) {
-		Material *mat = (Material*)id;	
+		Material *mat = (Material *)id;
 		BKE_previewimg_free(&mat->preview);
 	}
 	else if (GS(id->name) == ID_TE) {
-		Tex *tex = (Tex*)id;
+		Tex *tex = (Tex *)id;
 		BKE_previewimg_free(&tex->preview);
 	}
 	else if (GS(id->name) == ID_WO) {
-		World *wo = (World*)id;
+		World *wo = (World *)id;
 		BKE_previewimg_free(&wo->preview);
 	}
 	else if (GS(id->name) == ID_LA) {
-		Lamp *la  = (Lamp*)id;
+		Lamp *la  = (Lamp *)id;
 		BKE_previewimg_free(&la->preview);
 	}
 	else if (GS(id->name) == ID_IM) {
-		Image *img  = (Image*)id;
+		Image *img  = (Image *)id;
 		BKE_previewimg_free(&img->preview);
 	}
 	else if (GS(id->name) == ID_BR) {
-		Brush *br  = (Brush*)id;
+		Brush *br  = (Brush *)id;
 		BKE_previewimg_free(&br->preview);
 	}
 }
 
-PreviewImage* BKE_previewimg_get(ID *id) 
+PreviewImage *BKE_previewimg_get(ID *id)
 {
-	PreviewImage* prv_img = NULL;
+	PreviewImage *prv_img = NULL;
 
 	if (GS(id->name) == ID_MA) {
-		Material *mat = (Material*)id;	
+		Material *mat = (Material *)id;
 		if (!mat->preview) mat->preview = BKE_previewimg_create();
 		prv_img = mat->preview;
 	}
 	else if (GS(id->name) == ID_TE) {
-		Tex *tex = (Tex*)id;
+		Tex *tex = (Tex *)id;
 		if (!tex->preview) tex->preview = BKE_previewimg_create();
 		prv_img = tex->preview;
 	}
 	else if (GS(id->name) == ID_WO) {
-		World *wo = (World*)id;
+		World *wo = (World *)id;
 		if (!wo->preview) wo->preview = BKE_previewimg_create();
 		prv_img = wo->preview;
 	}
 	else if (GS(id->name) == ID_LA) {
-		Lamp *la  = (Lamp*)id;
+		Lamp *la  = (Lamp *)id;
 		if (!la->preview) la->preview = BKE_previewimg_create();
 		prv_img = la->preview;
 	}
 	else if (GS(id->name) == ID_IM) {
-		Image *img  = (Image*)id;
+		Image *img  = (Image *)id;
 		if (!img->preview) img->preview = BKE_previewimg_create();
 		prv_img = img->preview;
 	}
 	else if (GS(id->name) == ID_BR) {
-		Brush *br  = (Brush*)id;
+		Brush *br  = (Brush *)id;
 		if (!br->preview) br->preview = BKE_previewimg_create();
 		prv_img = br->preview;
 	}
@@ -240,19 +238,19 @@
 
 void BKE_icon_changed(int id)
 {
-	Icon* icon = NULL;
+	Icon *icon = NULL;
 	
 	if (!id || G.background) return;
 
 	icon = BLI_ghash_lookup(gIcons, SET_INT_IN_POINTER(id));
 	
 	if (icon) {
-		PreviewImage *prv = BKE_previewimg_get((ID*)icon->obj);
+		PreviewImage *prv = BKE_previewimg_get((ID *)icon->obj);
 
 		/* all previews changed */
 		if (prv) {
 			int i;

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list