[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45307] branches/soc-2011-avocado/blender: merge latest version of trunk into avocado branch, rev.
Andrea Weikert
elubie at gmx.net
Sat Mar 31 15:21:02 CEST 2012
Revision: 45307
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45307
Author: elubie
Date: 2012-03-31 13:20:50 +0000 (Sat, 31 Mar 2012)
Log Message:
-----------
merge latest version of trunk into avocado branch, rev. 45300-45306
preparing for a detailed diff with current trunk
Modified Paths:
--------------
branches/soc-2011-avocado/blender/release/scripts/modules/addon_utils.py
branches/soc-2011-avocado/blender/release/scripts/modules/bpy/utils.py
branches/soc-2011-avocado/blender/release/scripts/modules/console_python.py
branches/soc-2011-avocado/blender/source/blender/blenfont/intern/blf_lang.c
branches/soc-2011-avocado/blender/source/blender/blenkernel/BKE_global.h
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/blender.c
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/bmfont.c
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/constraint.c
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/fcurve.c
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/fmodifier.c
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/gpencil.c
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/ipo.c
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/library.c
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/mesh.c
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/nla.c
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/object.c
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/ocean.c
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/particle_system.c
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/pointcache.c
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/softbody.c
branches/soc-2011-avocado/blender/source/blender/blenlib/intern/noise.c
branches/soc-2011-avocado/blender/source/blender/blenlib/intern/path_util.c
branches/soc-2011-avocado/blender/source/blender/blenloader/intern/readblenentry.c
branches/soc-2011-avocado/blender/source/blender/blenloader/intern/readfile.c
branches/soc-2011-avocado/blender/source/blender/bmesh/operators/bmo_dupe.c
branches/soc-2011-avocado/blender/source/blender/collada/AnimationImporter.cpp
branches/soc-2011-avocado/blender/source/blender/collada/DocumentImporter.cpp
branches/soc-2011-avocado/blender/source/blender/collada/ImageExporter.cpp
branches/soc-2011-avocado/blender/source/blender/collada/MeshImporter.cpp
branches/soc-2011-avocado/blender/source/blender/editors/animation/anim_channels_edit.c
branches/soc-2011-avocado/blender/source/blender/editors/animation/anim_filter.c
branches/soc-2011-avocado/blender/source/blender/editors/animation/anim_markers.c
branches/soc-2011-avocado/blender/source/blender/editors/animation/fmodifier_ui.c
branches/soc-2011-avocado/blender/source/blender/editors/animation/keyframes_draw.c
branches/soc-2011-avocado/blender/source/blender/editors/animation/keyframing.c
branches/soc-2011-avocado/blender/source/blender/editors/armature/editarmature.c
branches/soc-2011-avocado/blender/source/blender/editors/armature/editarmature_retarget.c
branches/soc-2011-avocado/blender/source/blender/editors/armature/reeb.c
branches/soc-2011-avocado/blender/source/blender/editors/curve/editcurve.c
branches/soc-2011-avocado/blender/source/blender/editors/gpencil/drawgpencil.c
branches/soc-2011-avocado/blender/source/blender/editors/gpencil/gpencil_buttons.c
branches/soc-2011-avocado/blender/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2011-avocado/blender/source/blender/editors/interface/interface_anim.c
branches/soc-2011-avocado/blender/source/blender/editors/interface/interface_handlers.c
branches/soc-2011-avocado/blender/source/blender/editors/interface/interface_icons.c
branches/soc-2011-avocado/blender/source/blender/editors/interface/interface_ops.c
branches/soc-2011-avocado/blender/source/blender/editors/interface/interface_style.c
branches/soc-2011-avocado/blender/source/blender/editors/interface/view2d.c
branches/soc-2011-avocado/blender/source/blender/editors/object/object_constraint.c
branches/soc-2011-avocado/blender/source/blender/editors/object/object_relations.c
branches/soc-2011-avocado/blender/source/blender/editors/physics/particle_edit.c
branches/soc-2011-avocado/blender/source/blender/editors/physics/particle_object.c
branches/soc-2011-avocado/blender/source/blender/editors/physics/physics_fluid.c
branches/soc-2011-avocado/blender/source/blender/editors/render/render_internal.c
branches/soc-2011-avocado/blender/source/blender/editors/screen/area.c
branches/soc-2011-avocado/blender/source/blender/editors/screen/screen_edit.c
branches/soc-2011-avocado/blender/source/blender/editors/screen/screen_ops.c
branches/soc-2011-avocado/blender/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2011-avocado/blender/source/blender/editors/sculpt_paint/paint_undo.c
branches/soc-2011-avocado/blender/source/blender/editors/space_action/action_select.c
branches/soc-2011-avocado/blender/source/blender/editors/space_graph/graph_draw.c
branches/soc-2011-avocado/blender/source/blender/editors/space_graph/graph_edit.c
branches/soc-2011-avocado/blender/source/blender/editors/space_nla/nla_channels.c
branches/soc-2011-avocado/blender/source/blender/editors/space_nla/nla_edit.c
branches/soc-2011-avocado/blender/source/blender/editors/space_nla/nla_select.c
branches/soc-2011-avocado/blender/source/blender/editors/space_node/node_edit.c
branches/soc-2011-avocado/blender/source/blender/editors/space_text/space_text.c
branches/soc-2011-avocado/blender/source/blender/editors/space_text/text_draw.c
branches/soc-2011-avocado/blender/source/blender/editors/space_text/text_header.c
branches/soc-2011-avocado/blender/source/blender/editors/space_text/text_ops.c
branches/soc-2011-avocado/blender/source/blender/editors/space_text/text_python.c
branches/soc-2011-avocado/blender/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-avocado/blender/source/blender/editors/util/editmode_undo.c
branches/soc-2011-avocado/blender/source/blender/editors/util/undo.c
branches/soc-2011-avocado/blender/source/blender/gpu/intern/gpu_codegen.c
branches/soc-2011-avocado/blender/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2011-avocado/blender/source/blender/imbuf/intern/cineon/cineon_dpx.c
branches/soc-2011-avocado/blender/source/blender/imbuf/intern/radiance_hdr.c
branches/soc-2011-avocado/blender/source/blender/imbuf/intern/tiff.c
branches/soc-2011-avocado/blender/source/blender/imbuf/intern/util.c
branches/soc-2011-avocado/blender/source/blender/makesdna/intern/dna_genfile.c
branches/soc-2011-avocado/blender/source/blender/makesdna/intern/makesdna.c
branches/soc-2011-avocado/blender/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2011-avocado/blender/source/blender/makesrna/intern/rna_screen.c
branches/soc-2011-avocado/blender/source/blender/modifiers/intern/MOD_array.c
branches/soc-2011-avocado/blender/source/blender/nodes/composite/node_composite_tree.c
branches/soc-2011-avocado/blender/source/blender/nodes/composite/node_composite_util.c
branches/soc-2011-avocado/blender/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
branches/soc-2011-avocado/blender/source/blender/python/bmesh/bmesh_py_types.c
branches/soc-2011-avocado/blender/source/blender/python/intern/bpy_app.c
branches/soc-2011-avocado/blender/source/blender/python/intern/bpy_interface.c
branches/soc-2011-avocado/blender/source/blender/python/intern/bpy_rna.c
branches/soc-2011-avocado/blender/source/blender/python/intern/bpy_rna_array.c
branches/soc-2011-avocado/blender/source/blender/render/intern/raytrace/rayobject_octree.cpp
branches/soc-2011-avocado/blender/source/blender/render/intern/raytrace/rayobject_vbvh.cpp
branches/soc-2011-avocado/blender/source/blender/render/intern/raytrace/reorganize.h
branches/soc-2011-avocado/blender/source/blender/render/intern/raytrace/svbvh.h
branches/soc-2011-avocado/blender/source/blender/render/intern/source/convertblender.c
branches/soc-2011-avocado/blender/source/blender/render/intern/source/sunsky.c
branches/soc-2011-avocado/blender/source/blender/render/intern/source/volume_precache.c
branches/soc-2011-avocado/blender/source/blender/windowmanager/intern/wm_cursors.c
branches/soc-2011-avocado/blender/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2011-avocado/blender/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2011-avocado/blender/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2011-avocado/blender/source/blender/windowmanager/intern/wm_subwindow.c
branches/soc-2011-avocado/blender/source/blender/windowmanager/intern/wm_window.c
branches/soc-2011-avocado/blender/source/creator/creator.c
branches/soc-2011-avocado/blender/source/gameengine/GamePlayer/common/bmfont.cpp
branches/soc-2011-avocado/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2011-avocado/blender/source/gameengine/GamePlayer/xembed/UnixShell.c
branches/soc-2011-avocado/blender/source/gameengine/Ketsji/KX_NavMeshObject.cpp
Property Changed:
----------------
branches/soc-2011-avocado/blender/
branches/soc-2011-avocado/blender/release/
branches/soc-2011-avocado/blender/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-avocado/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/bmesh/blender:36841-39505,39507-45292
/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
/trunk/blender:39992-44252,44257-45298
+ /branches/bmesh/blender:36841-39505,39507-45292
/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
/trunk/blender:39992-44252,44257-45298,45300-45306
Property changes on: branches/soc-2011-avocado/blender/release
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/bmesh/blender/release:36841-39505,39507-45292
/branches/soc-2011-cucumber/release: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/release: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
/trunk/blender/release:31524-44252,44257-45298
+ /branches/bmesh/blender/release:36841-39505,39507-45292
/branches/soc-2011-cucumber/release: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/release: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
/trunk/blender/release:31524-44252,44257-45298,45300-45306
Modified: branches/soc-2011-avocado/blender/release/scripts/modules/addon_utils.py
===================================================================
--- branches/soc-2011-avocado/blender/release/scripts/modules/addon_utils.py 2012-03-31 12:29:41 UTC (rev 45306)
+++ branches/soc-2011-avocado/blender/release/scripts/modules/addon_utils.py 2012-03-31 13:20:50 UTC (rev 45307)
@@ -65,7 +65,7 @@
def fake_module(mod_name, mod_path, speedy=True, force_support=None):
global error_encoding
- if _bpy.app.debug:
+ if _bpy.app.debug_python:
print("fake_module", mod_path, mod_name)
import ast
ModuleType = type(ast)
@@ -284,7 +284,7 @@
mod.__addon_enabled__ = True
- if _bpy.app.debug:
+ if _bpy.app.debug_python:
print("\taddon_utils.enable", mod.__name__)
return mod
@@ -323,7 +323,7 @@
if addon:
addons.remove(addon)
- if _bpy.app.debug:
+ if _bpy.app.debug_python:
print("\taddon_utils.disable", module_name)
Modified: branches/soc-2011-avocado/blender/release/scripts/modules/bpy/utils.py
===================================================================
--- branches/soc-2011-avocado/blender/release/scripts/modules/bpy/utils.py 2012-03-31 12:29:41 UTC (rev 45306)
+++ branches/soc-2011-avocado/blender/release/scripts/modules/bpy/utils.py 2012-03-31 13:20:50 UTC (rev 45307)
@@ -57,7 +57,7 @@
def _test_import(module_name, loaded_modules):
- use_time = _bpy.app.debug
+ use_time = _bpy.app.debug_python
if module_name in loaded_modules:
return None
@@ -126,7 +126,7 @@
as modules.
:type refresh_scripts: bool
"""
- use_time = _bpy.app.debug
+ use_time = _bpy.app.debug_python
prefs = _bpy.context.user_preferences
@@ -426,7 +426,7 @@
def keyconfig_set(filepath):
from os.path import basename, splitext
- if _bpy.app.debug:
+ if _bpy.app.debug_python:
print("loading preset:", filepath)
keyconfigs = _bpy.context.window_manager.keyconfigs
Modified: branches/soc-2011-avocado/blender/release/scripts/modules/console_python.py
===================================================================
--- branches/soc-2011-avocado/blender/release/scripts/modules/console_python.py 2012-03-31 12:29:41 UTC (rev 45306)
+++ branches/soc-2011-avocado/blender/release/scripts/modules/console_python.py 2012-03-31 13:20:50 UTC (rev 45307)
@@ -246,7 +246,7 @@
line=line,
cursor=current_line.current_character,
namespace=console.locals,
- private=bpy.app.debug)
+ private=bpy.app.debug_python)
line_new = result[0]
current_line.body, current_line.current_character, scrollback = result
Modified: branches/soc-2011-avocado/blender/source/blender/blenfont/intern/blf_lang.c
===================================================================
--- branches/soc-2011-avocado/blender/source/blender/blenfont/intern/blf_lang.c 2012-03-31 12:29:41 UTC (rev 45306)
+++ branches/soc-2011-avocado/blender/source/blender/blenfont/intern/blf_lang.c 2012-03-31 13:20:50 UTC (rev 45307)
@@ -192,7 +192,7 @@
locreturn = setlocale(LC_ALL, long_locale);
if (locreturn == NULL) {
- if (G.f & G_DEBUG)
+ if (G.debug & G_DEBUG)
printf("Could not change locale to %s\n", long_locale);
ok = 0;
@@ -209,14 +209,14 @@
get_language_variable("LANGUAGE", default_language, sizeof(default_language));
if (short_locale[0]) {
- if (G.f & G_DEBUG)
+ if (G.debug & G_DEBUG)
printf("Setting LANG= and LANGUAGE to %s\n", short_locale);
BLI_setenv("LANG", short_locale);
BLI_setenv("LANGUAGE", short_locale);
}
else {
- if (G.f & G_DEBUG)
+ if (G.debug & G_DEBUG)
printf("Setting LANG=%s and LANGUAGE=%s\n", default_lang, default_language);
BLI_setenv("LANG", default_lang);
@@ -238,7 +238,7 @@
get_language(long_locale, default_lang, language, sizeof(language));
- if (G.f & G_DEBUG) {
+ if (G.debug & G_DEBUG) {
if (short_locale[0])
printf("Could not change locale to %s nor %s\n", short_locale, short_locale_utf8);
else
Modified: branches/soc-2011-avocado/blender/source/blender/blenkernel/BKE_global.h
===================================================================
--- branches/soc-2011-avocado/blender/source/blender/blenkernel/BKE_global.h 2012-03-31 12:29:41 UTC (rev 45306)
+++ branches/soc-2011-avocado/blender/source/blender/blenkernel/BKE_global.h 2012-03-31 13:20:50 UTC (rev 45307)
@@ -69,6 +69,7 @@
short rt;
int f;
+ int debug;
/* Used for BMesh transformations */
struct BME_Glob *editBMesh;
@@ -104,16 +105,26 @@
/* #define G_FACESELECT (1 << 8) use (mesh->editflag & ME_EDIT_PAINT_MASK) */
-#define G_DEBUG (1 << 12)
#define G_SCRIPT_AUTOEXEC (1 << 13)
#define G_SCRIPT_OVERRIDE_PREF (1 << 14) /* when this flag is set ignore the userprefs */
-#define G_DEBUG_FFMPEG (1 << 15)
/* #define G_NOFROZEN (1 << 17) also removed */
/* #define G_GREASEPENCIL (1 << 17) also removed */
/* #define G_AUTOMATKEYS (1 << 30) also removed */
+/* G.debug */
+enum {
+ G_DEBUG = (1 << 0), /* general debug flag, print more info in unexpected cases */
+ G_DEBUG_FFMPEG = (1 << 1),
+ G_DEBUG_PYTHON = (1 << 2), /* extra python info */
+ G_DEBUG_EVENTS = (1 << 3), /* input/window/screen events */
+ G_DEBUG_WM = (1 << 4) /* operator, undo */
+};
+
+#define G_DEBUG_ALL (G_DEBUG | G_DEBUG_FFMPEG | G_DEBUG_PYTHON | G_DEBUG_EVENTS | G_DEBUG_WM)
+
+
/* G.fileflags */
#define G_AUTOPACK (1 << 0)
Modified: branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/DerivedMesh.c 2012-03-31 12:29:41 UTC (rev 45306)
+++ branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/DerivedMesh.c 2012-03-31 13:20:50 UTC (rev 45307)
@@ -445,7 +445,7 @@
numTex, numCol, hasPCol, hasOrigSpace);
}
- if (G.f & G_DEBUG)
+ if (G.debug & G_DEBUG)
printf("Updated tessellated customdata of dm %p\n", dm);
dm->dirty &= ~DM_DIRTY_TESS_CDLAYERS;
Modified: branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/anim_sys.c
===================================================================
--- branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/anim_sys.c 2012-03-31 12:29:41 UTC (rev 45306)
+++ branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/anim_sys.c 2012-03-31 13:20:50 UTC (rev 45307)
@@ -399,7 +399,7 @@
/* sanity checks */
if (ELEM3(NULL, srcAct, dstAct, basepath)) {
- if (G.f & G_DEBUG) {
+ if (G.debug & G_DEBUG) {
printf("ERROR: action_partition_fcurves_by_basepath(%p, %p, %p) has insufficient info to work with\n",
(void *)srcAct, (void *)dstAct, (void *)basepath);
}
@@ -480,7 +480,7 @@
/* sanity checks */
if (ELEM(NULL, srcID, dstID)) {
- if (G.f & G_DEBUG)
+ if (G.debug & G_DEBUG)
printf("ERROR: no source or destination ID to separate AnimData with\n");
return;
}
@@ -490,7 +490,7 @@
dstAdt = BKE_id_add_animdata(dstID);
if (ELEM(NULL, srcAdt, dstAdt)) {
- if (G.f & G_DEBUG)
+ if (G.debug & G_DEBUG)
printf("ERROR: no AnimData for this pair of ID's\n");
return;
}
@@ -980,20 +980,20 @@
/* sanity checks */
if (ELEM(NULL, ks, rna_path)) {
- printf("ERROR: no Keying Set and/or RNA Path to add path with \n");
+ printf("ERROR: no Keying Set and/or RNA Path to add path with\n");
return NULL;
}
/* ID is required for all types of KeyingSets */
if (id == NULL) {
- printf("ERROR: No ID provided for Keying Set Path. \n");
+ printf("ERROR: No ID provided for Keying Set Path\n");
return NULL;
}
/* don't add if there is already a matching KS_Path in the KeyingSet */
if (BKE_keyingset_find_path(ks, id, group_name, rna_path, array_index, groupmode)) {
- if (G.f & G_DEBUG)
- printf("ERROR: destination already exists in Keying Set \n");
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list