[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40967] branches/soc-2011-onion-uv-tools: merge with trunk 40965

Antony Riakiotakis kalast at gmail.com
Wed Oct 12 18:38:09 CEST 2011


Revision: 40967
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40967
Author:   psy-fi
Date:     2011-10-12 16:38:09 +0000 (Wed, 12 Oct 2011)
Log Message:
-----------
merge with trunk 40965

Modified Paths:
--------------
    branches/soc-2011-onion-uv-tools/doc/build_systems/scons-dev.txt
    branches/soc-2011-onion-uv-tools/doc/python_api/sphinx_doc_gen.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_sequencer.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/font.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/material.c
    branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/path_util.c
    branches/soc-2011-onion-uv-tools/source/blender/blenloader/intern/readfile.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/curve/editfont.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/gpencil/drawgpencil.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_modifier.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/render/render_shading.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/sound/sound_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_buttons/buttons_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_file/filesel.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_image/image_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_sequencer/sequencer_add.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/uvedit/uvedit_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/imbuf/intern/anim_movie.c
    branches/soc-2011-onion-uv-tools/source/blender/imbuf/intern/indexer.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_sculpt_paint.c
    branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_image.c
    branches/soc-2011-onion-uv-tools/source/blender/nodes/intern/node_common.c
    branches/soc-2011-onion-uv-tools/source/blender/nodes/intern/node_exec.c
    branches/soc-2011-onion-uv-tools/source/blender/windowmanager/intern/wm_operators.c

Property Changed:
----------------
    branches/soc-2011-onion-uv-tools/
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_outliner/


Property changes on: branches/soc-2011-onion-uv-tools
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender:39665-40934
   + /trunk/blender:39665-40965

Modified: branches/soc-2011-onion-uv-tools/doc/build_systems/scons-dev.txt
===================================================================
--- branches/soc-2011-onion-uv-tools/doc/build_systems/scons-dev.txt	2011-10-12 16:33:46 UTC (rev 40966)
+++ branches/soc-2011-onion-uv-tools/doc/build_systems/scons-dev.txt	2011-10-12 16:38:09 UTC (rev 40967)
@@ -189,6 +189,6 @@
     need changes elsewhere in the system, as it is handled automatically
     with the central library repository.
 
-    Enjoy the new system!
+    Enjoy the new system!!
 
     /Nathan Letwory (jesterKing)

Modified: branches/soc-2011-onion-uv-tools/doc/python_api/sphinx_doc_gen.py
===================================================================
--- branches/soc-2011-onion-uv-tools/doc/python_api/sphinx_doc_gen.py	2011-10-12 16:33:46 UTC (rev 40966)
+++ branches/soc-2011-onion-uv-tools/doc/python_api/sphinx_doc_gen.py	2011-10-12 16:38:09 UTC (rev 40967)
@@ -1042,7 +1042,9 @@
         fw("html_theme = 'blender-org'\n")
         fw("html_theme_path = ['../']\n")
 
-    fw("html_favicon = 'favicon.ico'\n")
+        # copied with the theme, exclude else we get an error [#28873]
+        fw("html_favicon = 'favicon.ico'\n")
+
     # not helpful since the source us generated, adds to upload size.
     fw("html_copy_source = False\n")
     fw("\n")

Modified: branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_sequencer.py
===================================================================
--- branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_sequencer.py	2011-10-12 16:33:46 UTC (rev 40966)
+++ branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_sequencer.py	2011-10-12 16:38:09 UTC (rev 40967)
@@ -60,7 +60,6 @@
 
             layout.separator()
             layout.operator("sequencer.refresh_all")
-            layout.template_running_jobs()
         elif st.view_type == 'SEQUENCER_PREVIEW':
             layout.separator()
             layout.operator("sequencer.refresh_all")
@@ -76,7 +75,9 @@
                     row.prop(ed, "overlay_frame", text="")
                     row.prop(ed, "overlay_lock", text="", icon='LOCKED')
 
+        layout.template_running_jobs()
 
+
 class SEQUENCER_MT_view_toggle(Menu):
     bl_label = "View Type"
 

Modified: branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_view3d_toolbar.py
===================================================================
--- branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_view3d_toolbar.py	2011-10-12 16:33:46 UTC (rev 40966)
+++ branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_view3d_toolbar.py	2011-10-12 16:38:09 UTC (rev 40967)
@@ -484,16 +484,18 @@
 
         # XXX This needs a check if psys is editable.
         if context.particle_edit_object:
+            tool = settings.tool
+
             # XXX Select Particle System
             layout.column().prop(settings, "tool", expand=True)
 
-            if settings.tool != 'NONE':
+            if tool != 'NONE':
                 col = layout.column()
                 col.prop(brush, "size", slider=True)
-                if settings.tool != 'ADD':
+                if tool != 'ADD':
                     col.prop(brush, "strength", slider=True)
 
-            if settings.tool == 'ADD':
+            if tool == 'ADD':
                 col.prop(brush, "count")
                 col = layout.column()
                 col.prop(settings, "use_default_interpolate")
@@ -501,15 +503,16 @@
                 sub.active = settings.use_default_interpolate
                 sub.prop(brush, "steps", slider=True)
                 sub.prop(settings, "default_key_count", slider=True)
-            elif settings.tool == 'LENGTH':
+            elif tool == 'LENGTH':
                 layout.prop(brush, "length_mode", expand=True)
-            elif settings.tool == 'PUFF':
+            elif tool == 'PUFF':
                 layout.prop(brush, "puff_mode", expand=True)
                 layout.prop(brush, "use_puff_volume")
 
         # Sculpt Mode #
 
         elif context.sculpt_object and brush:
+            tool = brush.sculpt_tool
 
             col = layout.column()
 
@@ -526,12 +529,12 @@
 
             row.prop(brush, "use_pressure_size", toggle=True, text="")
 
-            if brush.sculpt_tool not in {'SNAKE_HOOK', 'GRAB', 'ROTATE'}:
+            if tool not in {'SNAKE_HOOK', 'GRAB', 'ROTATE'}:
                 col.separator()
 
                 row = col.row(align=True)
 
-                if brush.use_space and brush.sculpt_tool not in {'SMOOTH'}:
+                if brush.use_space and tool != 'SMOOTH':
                     if brush.use_space_atten:
                         row.prop(brush, "use_space_atten", toggle=True, text="", icon='LOCKED')
                     else:
@@ -540,26 +543,26 @@
                 row.prop(brush, "strength", text="Strength", slider=True)
                 row.prop(brush, "use_pressure_strength", text="")
 
-            if brush.sculpt_tool not in {'SMOOTH'}:
+            if tool != 'SMOOTH':
                 col.separator()
 
                 row = col.row(align=True)
                 row.prop(brush, "auto_smooth_factor", slider=True)
                 row.prop(brush, "use_inverse_smooth_pressure", toggle=True, text="")
 
-            if brush.sculpt_tool in {'GRAB', 'SNAKE_HOOK'}:
+            if tool in {'GRAB', 'SNAKE_HOOK'}:
                 col.separator()
 
                 row = col.row(align=True)
                 row.prop(brush, "normal_weight", slider=True)
 
-            if brush.sculpt_tool in {'CREASE', 'BLOB'}:
+            if tool in {'CREASE', 'BLOB'}:
                 col.separator()
 
                 row = col.row(align=True)
                 row.prop(brush, "crease_pinch_factor", slider=True, text="Pinch")
 
-            if brush.sculpt_tool not in {'PINCH', 'INFLATE', 'SMOOTH'}:
+            if tool not in {'PINCH', 'INFLATE', 'SMOOTH'}:
                 row = col.row(align=True)
 
                 col.separator()
@@ -571,8 +574,8 @@
 
                 row.prop(brush, "sculpt_plane", text="")
 
-            #if brush.sculpt_tool in {'CLAY', 'CLAY_TUBES', 'FLATTEN', 'FILL', 'SCRAPE'}:
-            if brush.sculpt_tool in {'CLAY', 'FLATTEN', 'FILL', 'SCRAPE'}:
+            #if tool in {'CLAY', 'CLAY_TUBES', 'FLATTEN', 'FILL', 'SCRAPE'}:
+            if tool in {'CLAY', 'FLATTEN', 'FILL', 'SCRAPE'}:
                 row = col.row(align=True)
                 row.prop(brush, "plane_offset", slider=True)
                 row.prop(brush, "use_offset_pressure", text="")
@@ -585,7 +588,7 @@
                 row.active = brush.use_plane_trim
                 row.prop(brush, "plane_trim", slider=True, text="Distance")
 
-            if brush.sculpt_tool == 'LAYER':
+            if tool == 'LAYER':
                 row = col.row()
                 row.prop(brush, "height", slider=True, text="Height")
 
@@ -597,12 +600,12 @@
             col.separator()
             col.row().prop(brush, "direction", expand=True)
 
-            if brush.sculpt_tool in {'DRAW', 'CREASE', 'BLOB', 'INFLATE', 'LAYER', 'CLAY'}:
+            if tool in {'DRAW', 'CREASE', 'BLOB', 'INFLATE', 'LAYER', 'CLAY'}:
                 col.separator()
 
                 col.prop(brush, "use_accumulate")
 
-            if brush.sculpt_tool == 'LAYER':
+            if tool == 'LAYER':
                 col.separator()
 
                 ob = context.sculpt_object

Modified: branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/font.c
===================================================================
--- branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/font.c	2011-10-12 16:33:46 UTC (rev 40966)
+++ branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/font.c	2011-10-12 16:38:09 UTC (rev 40967)
@@ -546,7 +546,7 @@
 			nu2->knotsu = nu2->knotsv = NULL;
 			nu2->flag= CU_SMOOTH;
 			nu2->charidx = charidx;
-			if (info->mat_nr) {
+			if (info->mat_nr > 0) {
 				nu2->mat_nr= info->mat_nr-1;
 			}
 			else {

Modified: branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/material.c
===================================================================
--- branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/material.c	2011-10-12 16:33:46 UTC (rev 40966)
+++ branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/material.c	2011-10-12 16:38:09 UTC (rev 40967)
@@ -1105,8 +1105,17 @@
 	short *totcolp;
 	short a, actcol;
 	
-	if(ob==NULL || ob->totcol==0) return FALSE;
-	
+	if (ob==NULL || ob->totcol==0) {
+		return FALSE;
+	}
+
+	/* this should never happen and used to crash */
+	if (ob->actcol <= 0) {
+		printf("%s: invalid material index %d, report a bug!\n", __func__, ob->actcol);
+		BLI_assert(0);
+		return FALSE;
+	}
+
 	/* take a mesh/curve/mball as starting point, remove 1 index,
 	 * AND with all objects that share the ob->data
 	 * 
@@ -1119,10 +1128,8 @@
 	if(*matarar==NULL) return FALSE;
 
 	/* we delete the actcol */
-	if(ob->totcol) {
-		mao= (*matarar)[ob->actcol-1];
-		if(mao) mao->id.us--;
-	}
+	mao= (*matarar)[ob->actcol-1];
+	if(mao) mao->id.us--;
 	
 	for(a=ob->actcol; a<ob->totcol; a++)
 		(*matarar)[a-1]= (*matarar)[a];

Modified: branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/path_util.c
===================================================================
--- branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/path_util.c	2011-10-12 16:33:46 UTC (rev 40966)
+++ branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/path_util.c	2011-10-12 16:38:09 UTC (rev 40967)
@@ -1430,21 +1430,40 @@
 }
 
 /* simple appending of filename to dir, does not check for valid path! */
-void BLI_join_dirfile(char *string, const size_t maxlen, const char *dir, const char *file)
+void BLI_join_dirfile(char *dst, const size_t maxlen, const char *dir, const char *file)
 {
-	int sl_dir;
+	size_t dirlen= BLI_strnlen(dir, maxlen);
 
-	if(string != dir) /* compare pointers */
-		BLI_strncpy(string, dir, maxlen -(file ? 1 : 0));
+	if (dst != dir) {
+		if(dirlen  == maxlen) {
+			memcpy(dst, dir, dirlen);
+			dst[dirlen - 1]= '\0';
+			return; /* dir fills the path */
+		}
+		else {
+			memcpy(dst, dir, dirlen + 1);
+		}
+	}
 
-	if (!file)

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list