[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50625] branches/soc-2011-tomato: Merging r50618 through r50624 from trunk into soc-2011-tomato

Sergey Sharybin sergey.vfx at gmail.com
Sat Sep 15 09:53:35 CEST 2012


Revision: 50625
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50625
Author:   nazgul
Date:     2012-09-15 07:53:34 +0000 (Sat, 15 Sep 2012)
Log Message:
-----------
Merging r50618 through r50624 from trunk into soc-2011-tomato

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

Modified Paths:
--------------
    branches/soc-2011-tomato/source/blender/avi/intern/avi.c
    branches/soc-2011-tomato/source/blender/blenfont/intern/blf_font.c
    branches/soc-2011-tomato/source/blender/blenfont/intern/blf_internal.h
    branches/soc-2011-tomato/source/blender/blenfont/intern/blf_lang.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/object.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/text.c
    branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
    branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_MovieDistortionOperation.h
    branches/soc-2011-tomato/source/blender/editors/armature/editarmature.c
    branches/soc-2011-tomato/source/blender/editors/armature/meshlaplacian.c
    branches/soc-2011-tomato/source/blender/editors/armature/poseobject.c
    branches/soc-2011-tomato/source/blender/editors/interface/interface_regions.c
    branches/soc-2011-tomato/source/blender/editors/interface/view2d.c
    branches/soc-2011-tomato/source/blender/editors/object/object_hook.c
    branches/soc-2011-tomato/source/blender/editors/space_node/node_header.c
    branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_select.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/drawmesh.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2011-tomato/source/blender/gpu/intern/gpu_draw.c
    branches/soc-2011-tomato/source/blender/imbuf/intern/IMB_metadata.h
    branches/soc-2011-tomato/source/blender/imbuf/intern/metadata.c
    branches/soc-2011-tomato/source/blender/imbuf/intern/targa.c
    branches/soc-2011-tomato/source/blender/makesdna/DNA_meshdata_types.h
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_particlesystem.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_image.c

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-50617
   + /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-50624

Modified: branches/soc-2011-tomato/source/blender/avi/intern/avi.c
===================================================================
--- branches/soc-2011-tomato/source/blender/avi/intern/avi.c	2012-09-15 07:50:14 UTC (rev 50624)
+++ branches/soc-2011-tomato/source/blender/avi/intern/avi.c	2012-09-15 07:53:34 UTC (rev 50625)
@@ -734,16 +734,15 @@
 
 	fclose(movie->fp);
 
-	for (i = 0; movie->header && (i < movie->header->Streams); i++) {
-		if (movie->streams && (movie->streams[i].sf != NULL)) {
+	for (i = 0; i < movie->header->Streams; i++) {
+		if (movie->streams[i].sf != NULL) {
 			MEM_freeN(movie->streams[i].sf);
 		}
 	}
 
-	if (movie->header != NULL)
-		MEM_freeN(movie->header);
-	if (movie->streams != NULL)
-		MEM_freeN(movie->streams);
+	MEM_freeN(movie->header);
+	MEM_freeN(movie->streams);
+
 	if (movie->entries != NULL)
 		MEM_freeN(movie->entries);
 	if (movie->offset_table != NULL)
@@ -1082,15 +1081,15 @@
 
 	fclose(movie->fp);
 
-	for (i = 0; movie->header && (i < movie->header->Streams); i++) {
+	for (i = 0; i < movie->header->Streams; i++) {
 		if (movie->streams && (movie->streams[i].sf != NULL)) {
 			MEM_freeN(movie->streams[i].sf);
 		}
 	}
-	if (movie->header != NULL)
-		MEM_freeN(movie->header);
-	if (movie->entries != NULL)
-		MEM_freeN(movie->entries);
+
+	MEM_freeN(movie->header);
+	MEM_freeN(movie->entries);
+
 	if (movie->streams != NULL)
 		MEM_freeN(movie->streams);
 	if (movie->offset_table != NULL)

Modified: branches/soc-2011-tomato/source/blender/blenfont/intern/blf_font.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenfont/intern/blf_font.c	2012-09-15 07:50:14 UTC (rev 50624)
+++ branches/soc-2011-tomato/source/blender/blenfont/intern/blf_font.c	2012-09-15 07:53:34 UTC (rev 50625)
@@ -161,7 +161,7 @@
 	}                                                                            \
 } (void)0
 
-void blf_font_draw(FontBLF *font, const char *str, unsigned int len)
+void blf_font_draw(FontBLF *font, const char *str, size_t len)
 {
 	unsigned int c;
 	GlyphBLF *g, *g_prev = NULL;
@@ -193,7 +193,7 @@
 }
 
 /* faster version of blf_font_draw, ascii only for view dimensions */
-void blf_font_draw_ascii(FontBLF *font, const char *str, unsigned int len)
+void blf_font_draw_ascii(FontBLF *font, const char *str, size_t len)
 {
 	unsigned char c;
 	GlyphBLF *g, *g_prev = NULL;

Modified: branches/soc-2011-tomato/source/blender/blenfont/intern/blf_internal.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenfont/intern/blf_internal.h	2012-09-15 07:50:14 UTC (rev 50624)
+++ branches/soc-2011-tomato/source/blender/blenfont/intern/blf_internal.h	2012-09-15 07:53:34 UTC (rev 50625)
@@ -51,8 +51,8 @@
 void blf_font_attach_from_mem(struct FontBLF *font, const unsigned char *mem, int mem_size);
 
 void blf_font_size(struct FontBLF *font, int size, int dpi);
-void blf_font_draw(struct FontBLF *font, const char *str, unsigned int len);
-void blf_font_draw_ascii(struct FontBLF *font, const char *str, unsigned int len);
+void blf_font_draw(struct FontBLF *font, const char *str, size_t len);
+void blf_font_draw_ascii(struct FontBLF *font, const char *str, size_t len);
 void blf_font_buffer(struct FontBLF *font, const char *str);
 void blf_font_boundbox(struct FontBLF *font, const char *str, struct rctf *box);
 void blf_font_width_and_height(struct FontBLF *font, const char *str, float *width, float *height);

Modified: branches/soc-2011-tomato/source/blender/blenfont/intern/blf_lang.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenfont/intern/blf_lang.c	2012-09-15 07:50:14 UTC (rev 50624)
+++ branches/soc-2011-tomato/source/blender/blenfont/intern/blf_lang.c	2012-09-15 07:53:34 UTC (rev 50625)
@@ -129,7 +129,7 @@
 }
 
 /* get LANG/LANGUAGE environment variable */
-static void get_language_variable(const char *varname, char *var, int maxlen)
+static void get_language_variable(const char *varname, char *var, const size_t maxlen)
 {
 	char *env = getenv(varname);
 
@@ -149,7 +149,7 @@
 /* get language to be used based on locale(which might be empty when using default language) and
  * LANG environment variable
  */
-static void get_language(const char *locale, const char *lang, char *language, int maxlen)
+static void get_language(const char *locale, const char *lang, char *language, const size_t maxlen)
 {
 	if (locale[0]) {
 		BLI_strncpy(language, locale, maxlen);

Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/DerivedMesh.c	2012-09-15 07:50:14 UTC (rev 50624)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/DerivedMesh.c	2012-09-15 07:53:34 UTC (rev 50625)
@@ -384,7 +384,7 @@
 		}
 	}
 
-	else if (dm->dirty && DM_DIRTY_TESS_CDLAYERS) {
+	else if (dm->dirty & DM_DIRTY_TESS_CDLAYERS) {
 		BLI_assert(CustomData_has_layer(&dm->faceData, CD_POLYINDEX));
 		DM_update_tessface_data(dm);
 	}

Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/object.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/object.c	2012-09-15 07:50:14 UTC (rev 50624)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/object.c	2012-09-15 07:53:34 UTC (rev 50625)
@@ -3288,7 +3288,7 @@
 {
 	Group *group = NULL;
 
-	BLI_assert(base->object == object);
+	BLI_assert((base == NULL) || (base->object == object));
 
 	if (scene && base == NULL) {
 		base = BKE_scene_base_find(scene, object);

Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/text.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/text.c	2012-09-15 07:50:14 UTC (rev 50624)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/text.c	2012-09-15 07:53:34 UTC (rev 50625)
@@ -3070,7 +3070,6 @@
 	const char *comm = "#";
 	const char indent = (text->flags & TXT_TABSTOSPACES) ? ' ' : '\t';
 	static const char *back_words[] = {"return", "break", "continue", "pass", "yield", NULL};
-	if (!text) return 0;
 	if (!text->curl) return 0;
 
 	while (text->curl->line[i] == indent) {

Modified: branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c	2012-09-15 07:50:14 UTC (rev 50624)
+++ branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c	2012-09-15 07:53:34 UTC (rev 50625)
@@ -7821,7 +7821,7 @@
 					MovieTrackingMarker *marker = &track->markers[i];
 
 					if (is_zero_v2(marker->pattern_corners[0]) && is_zero_v2(marker->pattern_corners[1]) &&
-					    is_zero_v2(marker->pattern_corners[3]) && is_zero_v2(marker->pattern_corners[3]))
+					    is_zero_v2(marker->pattern_corners[2]) && is_zero_v2(marker->pattern_corners[3]))
 					{
 						marker->pattern_corners[0][0] = track->pat_min[0];
 						marker->pattern_corners[0][1] = track->pat_min[1];

Modified: branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp	2012-09-15 07:50:14 UTC (rev 50624)
+++ branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp	2012-09-15 07:53:34 UTC (rev 50625)
@@ -79,14 +79,10 @@
 
 Node *ExecutionSystemHelper::addNode(vector<Node *>& nodes, bNode *b_node, bool inActiveGroup, bool fast)
 {
-	Node *node;
-	node = Converter::convert(b_node, fast);
+	Node *node = Converter::convert(b_node, fast);
 	node->setIsInActiveGroup(inActiveGroup);
-	if (node != NULL) {
-		addNode(nodes, node);
-		return node;
-	}
-	return NULL;
+	addNode(nodes, node);
+	return node;
 }
 void ExecutionSystemHelper::addOperation(vector<NodeOperation *>& operations, NodeOperation *operation)
 {

Modified: branches/soc-2011-tomato/source/blender/compositor/operations/COM_MovieDistortionOperation.h
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/operations/COM_MovieDistortionOperation.h	2012-09-15 07:50:14 UTC (rev 50624)
+++ branches/soc-2011-tomato/source/blender/compositor/operations/COM_MovieDistortionOperation.h	2012-09-15 07:53:34 UTC (rev 50625)
@@ -99,8 +99,8 @@
 		       this->m_inverted == inverted &&
 		       this->m_width == width &&
 		       this->m_height == height &&
-		       this->m_calibration_width == this->m_calibration_width &&
-		       this->m_calibration_height == this->m_calibration_height;
+		       this->m_calibration_width == calibration_width &&
+		       this->m_calibration_height == claibration_height;
 	}
 	
 	void getUV(MovieTracking *trackingData, int x, int y, float *u, float *v)

Modified: branches/soc-2011-tomato/source/blender/editors/armature/editarmature.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/armature/editarmature.c	2012-09-15 07:50:14 UTC (rev 50624)
+++ branches/soc-2011-tomato/source/blender/editors/armature/editarmature.c	2012-09-15 07:53:34 UTC (rev 50625)
@@ -4589,7 +4589,9 @@
 	int selectmode = 0;
 	
 	/* we call this from outliner too */

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list