[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58668] branches/soc-2013-cycles_mblur: Merged trunk into branch.

Gavin Howard gavin.d.howard at gmail.com
Sat Jul 27 18:28:43 CEST 2013


Revision: 58668
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58668
Author:   gdh
Date:     2013-07-27 16:28:43 +0000 (Sat, 27 Jul 2013)
Log Message:
-----------
Merged trunk into branch. Includes r58634 to r58666.

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

Modified Paths:
--------------
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_context.h
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_sequencer.h
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/context.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/mesh_validate.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/pointcache.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/text.c
    branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_string.h
    branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/string.c
    branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_mods.c
    branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_beautify.c
    branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_join_triangles.c
    branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_subdivide_edgering.c
    branches/soc-2013-cycles_mblur/source/blender/collada/ArmatureImporter.cpp
    branches/soc-2013-cycles_mblur/source/blender/editors/animation/anim_intern.h
    branches/soc-2013-cycles_mblur/source/blender/editors/animation/keyframes_general.c
    branches/soc-2013-cycles_mblur/source/blender/editors/include/BIF_glutil.h
    branches/soc-2013-cycles_mblur/source/blender/editors/include/UI_interface.h
    branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface.c
    branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface_handlers.c
    branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface_regions.c
    branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2013-cycles_mblur/source/blender/editors/object/object_add.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_graph/graph_buttons.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_outliner/outliner_tree.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/space_view3d.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/view3d_edit.c
    branches/soc-2013-cycles_mblur/source/blender/imbuf/intern/thumbs.c
    branches/soc-2013-cycles_mblur/source/blender/nodes/texture/node_texture_tree.c

Property Changed:
----------------
    branches/soc-2013-cycles_mblur/
    branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_outliner/


Property changes on: branches/soc-2013-cycles_mblur
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/ge_dev:58091-58422
/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/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/branches/soc-2013-depsgraph_mt:57516
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-58633
   + /branches/ge_dev:58091-58422
/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/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/branches/soc-2013-depsgraph_mt:57516
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-58666

Modified: branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_context.h
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_context.h	2013-07-27 16:21:07 UTC (rev 58667)
+++ branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_context.h	2013-07-27 16:28:43 UTC (rev 58668)
@@ -200,8 +200,8 @@
 void CTX_data_type_set(struct bContextDataResult *result, short type);
 short CTX_data_type_get(struct bContextDataResult *result);
 
-int CTX_data_equals(const char *member, const char *str);
-int CTX_data_dir(const char *member);
+bool CTX_data_equals(const char *member, const char *str);
+bool CTX_data_dir(const char *member);
 
 #if 0
 void CTX_data_pointer_set(bContextDataResult *result, void *data);

Modified: branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_sequencer.h
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_sequencer.h	2013-07-27 16:21:07 UTC (rev 58667)
+++ branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_sequencer.h	2013-07-27 16:28:43 UTC (rev 58668)
@@ -265,7 +265,7 @@
 /* **********************************************************************
  * seqeffects.c
  *
- * Sequencer effect strip managment functions
+ * Sequencer effect strip management functions
  *  **********************************************************************
  */
 

Modified: branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/context.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/context.c	2013-07-27 16:21:07 UTC (rev 58667)
+++ branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/context.c	2013-07-27 16:28:43 UTC (rev 58668)
@@ -531,12 +531,12 @@
 	return CTX_data_dir_get_ex(C, TRUE, FALSE, FALSE);
 }
 
-int CTX_data_equals(const char *member, const char *str)
+bool CTX_data_equals(const char *member, const char *str)
 {
 	return (strcmp(member, str) == 0);
 }
 
-int CTX_data_dir(const char *member)
+bool CTX_data_dir(const char *member)
 {
 	return member[0] == '\0';
 }

Modified: branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/mesh_validate.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/mesh_validate.c	2013-07-27 16:21:07 UTC (rev 58667)
+++ branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/mesh_validate.c	2013-07-27 16:28:43 UTC (rev 58668)
@@ -294,7 +294,7 @@
 #		define CHECK_FACE_EDGE(a, b) \
 					if (!BLI_edgehash_haskey(edge_hash, mf->a, mf->b)) { \
 						PRINT("    face %u: edge " STRINGIFY(a) "/" STRINGIFY(b) \
-						      " (%u,%u) is missing egde data\n", i, mf->a, mf->b); \
+						      " (%u,%u) is missing edge data\n", i, mf->a, mf->b); \
 						do_edge_recalc = TRUE; \
 					} (void)0
 

Modified: branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/pointcache.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/pointcache.c	2013-07-27 16:21:07 UTC (rev 58667)
+++ branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/pointcache.c	2013-07-27 16:28:43 UTC (rev 58668)
@@ -928,7 +928,7 @@
 	/* version header */
 	ptcache_file_read(pf, version, 1, sizeof(char) * 4);
 	if (strncmp(version, DPAINT_CACHE_VERSION, 4)) {
-		printf("Dynamic Paint: Invalid cache version: %s!\n", version);
+		printf("Dynamic Paint: Invalid cache version: '%c%c%c%c'!\n", UNPACK4(version));
 		return 0;
 	}
 

Modified: branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/text.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/text.c	2013-07-27 16:21:07 UTC (rev 58667)
+++ branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/text.c	2013-07-27 16:28:43 UTC (rev 58668)
@@ -2624,10 +2624,6 @@
 		return;
 	}
 
-	if (!text) return;
-	if (!text->curl) return;
-	if (!text->sell) return;
-
 	/* insert spaces rather than tabs */
 	if (text->flags & TXT_TABSTOSPACES) {
 		add = tab_to_spaces;
@@ -2687,9 +2683,9 @@
 	/* hardcoded: TXT_TABSIZE = 4 spaces: */
 	int spaceslen = TXT_TABSIZE;
 
-	if (!text) return;
-	if (!text->curl) return;
-	if (!text->sell) return;
+	if (ELEM3(NULL, text, text->curl, text->sell)) {
+		return;
+	}
 
 	/* insert spaces rather than tabs */
 	if (text->flags & TXT_TABSTOSPACES) {

Modified: branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_string.h
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_string.h	2013-07-27 16:21:07 UTC (rev 58667)
+++ branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_string.h	2013-07-27 16:28:43 UTC (rev 58668)
@@ -86,7 +86,7 @@
 #endif
 ;
 
-char *BLI_replacestr(char *__restrict str, const char *__restrict oldText, const char *__restrict newText)
+char *BLI_replacestrN(const char *__restrict str, const char *__restrict substr_old, const char *__restrict substr_new)
 #ifdef __GNUC__
 __attribute__((warn_unused_result))
 __attribute__((nonnull))

Modified: branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/string.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/string.c	2013-07-27 16:21:07 UTC (rev 58667)
+++ branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/string.c	2013-07-27 16:28:43 UTC (rev 58668)
@@ -305,34 +305,30 @@
 }
 
 /**
+ * string with all instances of substr_old replaced with substr_new,
  * Returns a copy of the cstring \a str into a newly mallocN'd
- * string with all instances of oldText replaced with newText,
  * and returns it.
  *
  * \note A rather wasteful string-replacement utility, though this shall do for now...
  * Feel free to replace this with an even safe + nicer alternative
  *
- * \param str The string to replace occurrences of oldText in
- * \param oldText The text in the string to find and replace
- * \param newText The text in the string to find and replace
+ * \param str The string to replace occurrences of substr_old in
+ * \param substr_old The text in the string to find and replace
+ * \param substr_new The text in the string to find and replace
  * \retval Returns the duplicated string
  */
-char *BLI_replacestr(char *__restrict str, const char *__restrict oldText, const char *__restrict newText)
+char *BLI_replacestrN(const char *__restrict str, const char *__restrict substr_old, const char *__restrict substr_new)
 {
 	DynStr *ds = NULL;
-	size_t lenOld = strlen(oldText);
-	char *match;
-	
-	/* sanity checks */
-	if ((str == NULL) || (str[0] == 0))
-		return NULL;
-	else if ((oldText == NULL) || (newText == NULL) || (oldText[0] == 0))
-		return BLI_strdup(str);
-	
+	size_t len_old = strlen(substr_old);
+	const char *match;
+
+	BLI_assert(substr_old[0] != '\0');
+
 	/* while we can still find a match for the old substring that we're searching for, 
 	 * keep dicing and replacing
 	 */
-	while ( (match = strstr(str, oldText)) ) {
+	while ((match = strstr(str, substr_old))) {
 		/* the assembly buffer only gets created when we actually need to rebuild the string */
 		if (ds == NULL)
 			ds = BLI_dynstr_new();
@@ -341,27 +337,24 @@
 		 * copy the text up to this position and advance the current position in the string
 		 */
 		if (str != match) {
-			/* replace the token at the 'match' position with \0 so that the copied string will be ok,
-			 * add the segment of the string from str to match to the buffer, then restore the value at match
+			/* add the segment of the string from str to match to the buffer, then restore the value at match
 			 */
-			match[0] = 0;
-			BLI_dynstr_append(ds, str);
-			match[0] = oldText[0];
+			BLI_dynstr_nappend(ds, str, (match - str));
 			
 			/* now our current position should be set on the start of the match */
 			str = match;
 		}
 		
 		/* add the replacement text to the accumulation buffer */
-		BLI_dynstr_append(ds, newText);
+		BLI_dynstr_append(ds, substr_new);
 		
 		/* advance the current position of the string up to the end of the replaced segment */
-		str += lenOld;
+		str += len_old;
 	}
 	
 	/* finish off and return a new string that has had all occurrences of */
 	if (ds) {
-		char *newStr;
+		char *str_new;
 		
 		/* add what's left of the string to the assembly buffer 
 		 *	- we've been adjusting str to point at the end of the replaced segments
@@ -370,10 +363,10 @@

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list