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

Antony Riakiotakis kalast at gmail.com
Tue Jan 17 19:27:41 CET 2012


Revision: 43470
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43470
Author:   psy-fi
Date:     2012-01-17 18:27:38 +0000 (Tue, 17 Jan 2012)
Log Message:
-----------
merge with trunk 43466

Modified Paths:
--------------
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_clip.py
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_text.h
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/CMakeLists.txt
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/text.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface_regions.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/mesh/editmesh_loop.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/mesh/loopcut.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_info/info_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/transform/transform_conversions.c
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_ui.c

Removed Paths:
-------------
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_array_mallocn.h

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
   - /branches/soc-2011-cucumber:37517,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998
/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
/trunk/blender:39665-43453
   + /branches/soc-2011-cucumber:37517,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998
/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
/trunk/blender:39665-43466

Modified: branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_clip.py
===================================================================
--- branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_clip.py	2012-01-17 18:11:17 UTC (rev 43469)
+++ branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_clip.py	2012-01-17 18:27:38 UTC (rev 43470)
@@ -162,22 +162,25 @@
 
     def draw(self, context):
         layout = self.layout
-        # clip = context.space_data.clip  # UNUSED
 
         row = layout.row(align=True)
 
-        row.operator("clip.track_markers", text="", icon='FRAME_PREV').backwards = True
+        props = row.operator("clip.track_markers", text="", icon='FRAME_PREV')
+        props.backwards = True
         props = row.operator("clip.track_markers", text="",
                              icon='PLAY_REVERSE')
         props.backwards = True
         props.sequence = True
-        row.operator("clip.track_markers", text="", icon='PLAY').sequence = True
+        props = row.operator("clip.track_markers", text="", icon='PLAY')
+        props.sequence = True
         row.operator("clip.track_markers", text="", icon='FRAME_NEXT')
 
         col = layout.column(align=True)
-        col.operator("clip.clear_track_path", text="Clear After").action = 'REMAINED'
+        props = col.operator("clip.clear_track_path", text="Clear After")
+        props.action = 'REMAINED'
 
-        col.operator("clip.clear_track_path", text="Clear Before").action = 'UPTO'
+        props = col.operator("clip.clear_track_path", text="Clear Before")
+        props.action = 'UPTO'
         col.operator("clip.clear_track_path", text="Clear").action = 'ALL'
 
         layout.operator("clip.join_tracks", text="Join")
@@ -371,7 +374,7 @@
 
     def draw(self, context):
         layout = self.layout
-        
+
         sc = context.space_data
         tracking = sc.clip.tracking
 
@@ -478,7 +481,8 @@
         label = bpy.types.CLIP_MT_camera_presets.bl_label
         row.menu('CLIP_MT_camera_presets', text=label)
         row.operator("clip.camera_preset_add", text="", icon='ZOOMIN')
-        row.operator("clip.camera_preset_add", text="", icon='ZOOMOUT').remove_active = True
+        props = row.operator("clip.camera_preset_add", text="", icon='ZOOMOUT')
+        props.remove_active = True
 
         row = layout.row(align=True)
         sub = row.split(percentage=0.65)
@@ -942,7 +946,8 @@
 
         layout.separator()
 
-        layout.operator("clip.select_all", text="Select/Deselect all").action = 'TOGGLE'
+        props = layout.operator("clip.select_all", text="Select/Deselect all")
+        props.action = 'TOGGLE'
         layout.operator("clip.select_all", text="Inverse").action = 'INVERT'
 
         layout.menu("CLIP_MT_select_grouped")
@@ -967,9 +972,13 @@
     def draw(self, context):
         layout = self.layout
 
-        layout.operator("clip.disable_markers", text="Enable Markers").action = 'ENABLE'
-        layout.operator("clip.disable_markers", text="Disable markers").action = 'DISABLE'
+        props = layout.operator("clip.disable_markers",
+                                text="Enable Markers")
+        props.action = 'ENABLE'
 
+        props = layout.operator("clip.disable_markers", text="Disable markers")
+        props.action = 'DISABLE'
+
         layout.separator()
         layout.operator("clip.set_origin")
 

Deleted: branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_array_mallocn.h
===================================================================
--- branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_array_mallocn.h	2012-01-17 18:11:17 UTC (rev 43469)
+++ branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_array_mallocn.h	2012-01-17 18:27:38 UTC (rev 43470)
@@ -1,85 +0,0 @@
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-#ifndef BKE_ARRAY_MALLOCN_H
-#define BKE_ARRAY_MALLOCN_H
-
-/** \file BKE_array_mallocn.h
- *  \ingroup bke
- *  \brief little array macro library.
- */
-
-/* example of usage:
- *
- * int *arr = NULL;
- * V_DECLARE(arr);
- * int i;
- *
- * for (i=0; i<10; i++) {
- * 	V_GROW(arr);
- * 	arr[i] = something;
- * }
- * V_FREE(arr);
- *
- * arrays are buffered, using double-buffering (so on each reallocation,
- * the array size is doubled).  supposedly this should give good Big Oh
- * behaviour, though it may not be the best in practice.
- */
-
-#define V_DECLARE(vec) int _##vec##_count=0; void *_##vec##_tmp
-
-/* in the future, I plan on having V_DECLARE allocate stack memory it'll
- * use at first, and switch over to heap when it needs more.  that'll mess
- * up cases where you'd want to use this API to build a dynamic list for
- * non-local use, so all such cases should use this macro.*/
-#define V_DYNDECLARE(vec) V_DECLARE(vec)
-
-/*this returns the entire size of the array, including any buffering.*/
-#define V_SIZE(vec) ((signed int)((vec)==NULL ? 0 : MEM_allocN_len(vec) / sizeof(*vec)))
-
-/*this returns the logical size of the array, not including buffering.*/
-#define V_COUNT(vec) _##vec##_count
-
-/*grow the array by one.  zeroes the new elements.*/
-#define V_GROW(vec) \
-	V_SIZE(vec) > _##vec##_count ? _##vec##_count++ : \
-	((_##vec##_tmp = MEM_callocN(sizeof(*vec)*(_##vec##_count*2+2), #vec " " __FILE__ " ")),\
-	(void)(vec && memcpy(_##vec##_tmp, vec, sizeof(*vec) * _##vec##_count)),\
-	(void)(vec && (MEM_freeN(vec),1)),\
-	(vec = _##vec##_tmp),\
-	_##vec##_count++)
-
-#define V_FREE(vec) if (vec) MEM_freeN(vec);
-
-/*resets the logical size of an array to zero, but doesn't
-  free the memory.*/
-#define V_RESET(vec) _##vec##_count=0
-
-/*set the count of the array*/
-#define V_SETCOUNT(vec, count) _##vec##_count = (count)
-
-#endif // BKE_ARRAY_MALLOCN_H

Modified: branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_text.h
===================================================================
--- branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_text.h	2012-01-17 18:11:17 UTC (rev 43469)
+++ branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_text.h	2012-01-17 18:27:38 UTC (rev 43470)
@@ -46,8 +46,8 @@
 void 			txt_set_undostate	(int u);
 int 			txt_get_undostate	(void);
 struct Text*	add_empty_text	(const char *name);
-int             txt_extended_ascii_as_utf8(char **str);
-int	            reopen_text		(struct Text *text);
+int				txt_extended_ascii_as_utf8(char **str);
+int				reopen_text		(struct Text *text);
 struct Text*	add_text		(const char *file, const char *relpath); 
 struct Text*	copy_text		(struct Text *ta);
 void			unlink_text		(struct Main *bmain, struct Text *text);
@@ -60,8 +60,8 @@
 int		txt_find_string		(struct Text *text, const char *findstr, int wrap, int match_case);
 int		txt_has_sel			(struct Text *text);
 int		txt_get_span		(struct TextLine *from, struct TextLine *to);
-int     txt_utf8_offset_to_index(char *str, int offset);
-int     txt_utf8_index_to_offset(char *str, int index);
+int		txt_utf8_offset_to_index(char *str, int offset);
+int		txt_utf8_index_to_offset(char *str, int index);
 void	txt_move_up			(struct Text *text, short sel);
 void	txt_move_down		(struct Text *text, short sel);
 void	txt_move_left		(struct Text *text, short sel);
@@ -162,8 +162,8 @@
  * by 4 character length ID + the text
  * block itself + the 4 character length
  * ID (repeat) and opcode (repeat)) */
-#define UNDO_DBLOCK	    027 /* Delete block */
-#define UNDO_IBLOCK	    030 /* Insert block */
+#define UNDO_DBLOCK     027 /* Delete block */
+#define UNDO_IBLOCK     030 /* Insert block */
 
 /* Misc */
 #define UNDO_SWAP       031	/* Swap cursors */

Modified: branches/soc-2011-onion-uv-tools/source/blender/blenkernel/CMakeLists.txt
===================================================================
--- branches/soc-2011-onion-uv-tools/source/blender/blenkernel/CMakeLists.txt	2012-01-17 18:11:17 UTC (rev 43469)
+++ branches/soc-2011-onion-uv-tools/source/blender/blenkernel/CMakeLists.txt	2012-01-17 18:27:38 UTC (rev 43470)
@@ -156,7 +156,6 @@
 	BKE_anim.h
 	BKE_animsys.h
 	BKE_armature.h
-	BKE_array_mallocn.h
 	BKE_blender.h
 	BKE_bmesh.h
 	BKE_bmeshCustomData.h

Modified: branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/text.c
===================================================================
--- branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/text.c	2012-01-17 18:11:17 UTC (rev 43469)
+++ branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/text.c	2012-01-17 18:27:38 UTC (rev 43470)
@@ -226,7 +226,7 @@
 
 	while ((*str)[i]) {
 		if((bad_char= BLI_utf8_invalid_byte(*str+i, length)) == -1)
-		    break;
+			break;
 
 		added++;
 		i+= bad_char + 1;


@@ Diff output truncated at 10240 characters. @@


More information about the Bf-blender-cvs mailing list