[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49738] branches/soc-2011-tomato: Merging r49711 through r49737 from trunk into soc-2011-tomato
Sergey Sharybin
sergey.vfx at gmail.com
Thu Aug 9 19:03:33 CEST 2012
Revision: 49738
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49738
Author: nazgul
Date: 2012-08-09 17:03:33 +0000 (Thu, 09 Aug 2012)
Log Message:
-----------
Merging r49711 through r49737 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49711
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49737
Modified Paths:
--------------
branches/soc-2011-tomato/CMakeLists.txt
branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_object_constraint.py
branches/soc-2011-tomato/source/blender/blenkernel/BKE_context.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_fcurve.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_global.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/anim.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/blender.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/camera.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/cloth.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/constraint.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/curve.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/displist.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/image.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/implicit.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/mball.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/object.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/particle.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/particle_system.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/pointcache.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/sequencer.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/softbody.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/writeframeserver.c
branches/soc-2011-tomato/source/blender/blenlib/BLI_array.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_utildefines.h
branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_OpenCLKernels.cl
branches/soc-2011-tomato/source/blender/compositor/operations/COM_OpenCLKernels.cl.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
branches/soc-2011-tomato/source/blender/editors/animation/anim_channels_edit.c
branches/soc-2011-tomato/source/blender/editors/animation/anim_draw.c
branches/soc-2011-tomato/source/blender/editors/animation/anim_markers.c
branches/soc-2011-tomato/source/blender/editors/animation/anim_ops.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_templates.c
branches/soc-2011-tomato/source/blender/editors/interface/view2d_ops.c
branches/soc-2011-tomato/source/blender/editors/mask/mask_select.c
branches/soc-2011-tomato/source/blender/editors/mesh/editface.c
branches/soc-2011-tomato/source/blender/editors/object/object_bake.c
branches/soc-2011-tomato/source/blender/editors/object/object_modifier.c
branches/soc-2011-tomato/source/blender/editors/physics/dynamicpaint_ops.c
branches/soc-2011-tomato/source/blender/editors/physics/physics_fluid.c
branches/soc-2011-tomato/source/blender/editors/physics/physics_pointcache.c
branches/soc-2011-tomato/source/blender/editors/render/render_internal.c
branches/soc-2011-tomato/source/blender/editors/render/render_preview.c
branches/soc-2011-tomato/source/blender/editors/render/render_view.c
branches/soc-2011-tomato/source/blender/editors/screen/area.c
branches/soc-2011-tomato/source/blender/editors/screen/screen_edit.c
branches/soc-2011-tomato/source/blender/editors/screen/screen_ops.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_hide.c
branches/soc-2011-tomato/source/blender/editors/space_action/action_select.c
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_graph_ops.c
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_ops.c
branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_select.c
branches/soc-2011-tomato/source/blender/editors/space_file/file_ops.c
branches/soc-2011-tomato/source/blender/editors/space_graph/graph_select.c
branches/soc-2011-tomato/source/blender/editors/space_image/image_buttons.c
branches/soc-2011-tomato/source/blender/editors/space_info/info_report.c
branches/soc-2011-tomato/source/blender/editors/space_logic/logic_window.c
branches/soc-2011-tomato/source/blender/editors/space_nla/nla_select.c
branches/soc-2011-tomato/source/blender/editors/space_node/drawnode.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_add.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_buttons.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_draw.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_edit.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_header.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_relationships.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_select.c
branches/soc-2011-tomato/source/blender/editors/space_node/space_node.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_select.c
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_select.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2011-tomato/source/blender/editors/transform/transform.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_manipulator.c
branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_constraint_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_space_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_object_api.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_space.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_cloth.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_collision.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_meshdeform.c
branches/soc-2011-tomato/source/blender/nodes/composite/node_composite_tree.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_defocus.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_outputFile.c
branches/soc-2011-tomato/source/blender/nodes/intern/node_util.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_app.c
branches/soc-2011-tomato/source/blender/render/intern/source/convertblender.c
branches/soc-2011-tomato/source/blender/render/intern/source/external_engine.c
branches/soc-2011-tomato/source/blender/render/intern/source/pipeline.c
branches/soc-2011-tomato/source/blender/render/intern/source/render_texture.c
branches/soc-2011-tomato/source/blender/render/intern/source/shadbuf.c
branches/soc-2011-tomato/source/blender/render/intern/source/texture_ocean.c
branches/soc-2011-tomato/source/blender/render/intern/source/zbuf.c
branches/soc-2011-tomato/source/blender/windowmanager/WM_api.h
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2011-tomato/source/blenderplayer/CMakeLists.txt
branches/soc-2011-tomato/source/creator/CMakeLists.txt
branches/soc-2011-tomato/source/creator/creator.c
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/release/scripts/startup/bl_operators/node.py
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-49710
+ /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-49737
Modified: branches/soc-2011-tomato/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/CMakeLists.txt 2012-08-09 16:57:02 UTC (rev 49737)
+++ branches/soc-2011-tomato/CMakeLists.txt 2012-08-09 17:03:33 UTC (rev 49738)
@@ -248,7 +248,7 @@
option(WITH_CYCLES_TEST "Build cycles test application" OFF)
option(WITH_CYCLES_OSL "Build Cycles with OSL support" OFF)
option(WITH_CYCLES_CUDA_BINARIES "Build cycles CUDA binaries" OFF)
-set(CYCLES_CUDA_BINARIES_ARCH sm_13 sm_20 sm_21 CACHE STRING "CUDA architectures to build binaries for")
+set(CYCLES_CUDA_BINARIES_ARCH sm_13 sm_20 sm_21 sm_30 CACHE STRING "CUDA architectures to build binaries for")
mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH)
unset(PLATFORM_DEFAULT)
Modified: branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemCocoa.mm
===================================================================
--- branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemCocoa.mm 2012-08-09 16:57:02 UTC (rev 49737)
+++ branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemCocoa.mm 2012-08-09 17:03:33 UTC (rev 49738)
@@ -527,7 +527,7 @@
// So WM_exit needs to be called directly, as the event loop will never run before termination
- (void)applicationWillTerminate:(NSNotification *)aNotification
{
- /*G.afbreek = 0; //Let Cocoa perform the termination at the end
+ /*G.is_break = FALSE; //Let Cocoa perform the termination at the end
WM_exit(C);*/
}
Property changes on: branches/soc-2011-tomato/release/scripts/startup/bl_operators/node.py
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_object_constraint.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_object_constraint.py 2012-08-09 16:57:02 UTC (rev 49737)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_object_constraint.py 2012-08-09 17:03:33 UTC (rev 49738)
@@ -773,16 +773,21 @@
row.prop(con, "use_active_clip")
row.prop(con, "use_3d_position")
+ col = layout.column()
+
if not con.use_active_clip:
- layout.prop(con, "clip")
+ col.prop(con, "clip")
+ row = col.row()
+ row.prop(con, "frame_method", expand=True)
+
if clip:
- layout.prop_search(con, "object", clip.tracking, "objects", icon='OBJECT_DATA')
- layout.prop_search(con, "track", clip.tracking, "tracks", icon='ANIM_DATA')
+ col.prop_search(con, "object", clip.tracking, "objects", icon='OBJECT_DATA')
+ col.prop_search(con, "track", clip.tracking, "tracks", icon='ANIM_DATA')
- layout.prop(con, "camera")
+ col.prop(con, "camera")
- row = layout.row()
+ row = col.row()
row.active = not con.use_3d_position
row.prop(con, "depth_object")
Modified: branches/soc-2011-tomato/source/blender/blenkernel/BKE_context.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_context.h 2012-08-09 16:57:02 UTC (rev 49737)
+++ branches/soc-2011-tomato/source/blender/blenkernel/BKE_context.h 2012-08-09 17:03:33 UTC (rev 49738)
@@ -221,7 +221,7 @@
#define CTX_DATA_END \
} \
BLI_freelistN(&ctx_data_list); \
- }
+} (void)0
int ctx_data_list_count(const bContext *C, int (*func)(const bContext *, ListBase *));
Modified: branches/soc-2011-tomato/source/blender/blenkernel/BKE_fcurve.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_fcurve.h 2012-08-09 16:57:02 UTC (rev 49737)
+++ branches/soc-2011-tomato/source/blender/blenkernel/BKE_fcurve.h 2012-08-09 17:03:33 UTC (rev 49738)
@@ -83,7 +83,7 @@
/* tidy up for driver targets loopers */
#define DRIVER_TARGETS_LOOPER_END \
- }
+}
/* ---------------------- */
Modified: branches/soc-2011-tomato/source/blender/blenkernel/BKE_global.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_global.h 2012-08-09 16:57:02 UTC (rev 49737)
+++ branches/soc-2011-tomato/source/blender/blenkernel/BKE_global.h 2012-08-09 17:03:33 UTC (rev 49738)
@@ -60,20 +60,31 @@
/* strings of recent opened files */
struct ListBase recent_files;
-
- short afbreek, moving, file_loaded;
+
+ /* has escape been pressed or Ctrl+C pressed in background mode, used for render quit */
+ short is_break;
+
+ short moving, file_loaded;
char background;
char factory_startup;
short winpos, displaymode; /* used to be in Render */
- short rendering; /* to indicate render is busy, prevent renderwindow events etc */
- short rt;
+ /* to indicate render is busy, prevent renderwindow events etc */
+ short is_rendering;
+
+ /* debug value, can be set from the UI and python, used for testing nonstandard features */
+ short debug_value;
+
+ /* saved to the blend file as FileGlobal.globalf,
+ * however this is now only used for runtime options */
int f;
+
+ /* debug flag, G_DEBUG, G_DEBUG_PYTHON & friends, set python or command line args */
int debug;
/* Used for BMesh transformations */
struct BME_Glob *editBMesh;
-
+
/* Frank's variables */
int save_over;
@@ -88,7 +99,7 @@
/* this variable is written to / read from FileGlobal->fileflags */
int fileflags;
-
+
/* save the allowed windowstate of blender when using -W or -w */
int windowstate;
} Global;
@@ -123,7 +134,7 @@
G_DEBUG_JOBS = (1 << 5) /* jobs time profiling */
};
-#define G_DEBUG_ALL (G_DEBUG | G_DEBUG_FFMPEG | G_DEBUG_PYTHON | G_DEBUG_EVENTS | G_DEBUG_WM)
+#define G_DEBUG_ALL (G_DEBUG | G_DEBUG_FFMPEG | G_DEBUG_PYTHON | G_DEBUG_EVENTS | G_DEBUG_WM | G_DEBUG_JOBS)
/* G.fileflags */
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/anim.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/anim.c 2012-08-09 16:57:02 UTC (rev 49737)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/anim.c 2012-08-09 17:03:33 UTC (rev 49738)
@@ -755,8 +755,8 @@
/* check the group instance and object layers match, also that the object visible flags are ok. */
if ((dob->origlay & group->layer) == 0 ||
- (G.rendering == 0 && dob->ob->restrictflag & OB_RESTRICT_VIEW) ||
- (G.rendering && dob->ob->restrictflag & OB_RESTRICT_RENDER))
+ ((G.is_rendering == FALSE) && dob->ob->restrictflag & OB_RESTRICT_VIEW) ||
+ ((G.is_rendering == TRUE) && dob->ob->restrictflag & OB_RESTRICT_RENDER))
{
dob->no_draw = TRUE;
}
@@ -934,7 +934,7 @@
else
dm = mesh_get_derived_deform(scene, par, CD_MASK_BAREMESH);
- if (G.rendering) {
+ if (G.is_rendering) {
vdd.orco = (float(*)[3])BKE_mesh_orco_verts_get(par);
BKE_mesh_orco_verts_transform(me, vdd.orco, me->totvert, 0);
}
@@ -1066,7 +1066,7 @@
mloop = dm->getLoopArray(dm);
mvert = dm->getVertArray(dm);
- if (G.rendering) {
+ if (G.is_rendering) {
orco = (float(*)[3])BKE_mesh_orco_verts_get(par);
BKE_mesh_orco_verts_transform(me, orco, me->totvert, 0);
@@ -1177,7 +1177,7 @@
mul_m4_m4m3(obmat, tmat, mat);
dob = new_dupli_object(lb, ob, obmat, par->lay, a, par_index, OB_DUPLIFACES, animated);
- if (G.rendering) {
+ if (G.is_rendering) {
w = 1.0f / (float)mp->totloop;
if (orco) {
@@ -1251,7 +1251,7 @@
if (!psys_check_enabled(par, psys))
return;
- if (G.rendering == 0)
+ if (G.is_rendering == FALSE)
no_draw_flag |= PARS_NO_DISP;
ctime = BKE_scene_frame_get(scene); /* NOTE: in old animsys, used parent object's timeoffset... */
@@ -1445,7 +1445,7 @@
dob = new_dupli_object(lb, go->ob, mat, par->lay, counter, index, OB_DUPLIPARTS, animated);
copy_m4_m4(dob->omat, obcopylist[b].obmat);
- if (G.rendering)
+ if (G.is_rendering)
psys_get_dupli_texture(psys, part, sim.psmd, pa, cpa, dob->uv, dob->orco);
}
}
@@ -1493,7 +1493,7 @@
dob = new_dupli_object(lb, ob, mat, ob->lay, counter, index, GS(id->name) == ID_GR ? OB_DUPLIGROUP : OB_DUPLIPARTS, animated);
copy_m4_m4(dob->omat, oldobmat);
- if (G.rendering)
+ if (G.is_rendering)
psys_get_dupli_texture(psys, part, sim.psmd, pa, cpa, dob->uv, dob->orco);
}
@@ -1599,7 +1599,7 @@
return;
/* Should the dupli's be generated for this object? - Respect restrict flags */
- if (G.rendering) {
+ if (G.is_rendering) {
if (ob->restrictflag & OB_RESTRICT_RENDER) {
return;
}
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/blender.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/blender.c 2012-08-09 16:57:02 UTC (rev 49737)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/blender.c 2012-08-09 17:03:33 UTC (rev 49738)
@@ -463,7 +463,7 @@
blender_test_break_cb();
}
- return (G.afbreek == 1);
+ return (G.is_break == TRUE);
}
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/camera.c
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list