[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57726] branches/soc-2013-depsgraph_mt: Merging r57695 through r57725 from trunk into soc-2013-desgraph_mt
Sergey Sharybin
sergey.vfx at gmail.com
Tue Jun 25 09:27:59 CEST 2013
Revision: 57726
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57726
Author: nazgul
Date: 2013-06-25 07:27:59 +0000 (Tue, 25 Jun 2013)
Log Message:
-----------
Merging r57695 through r57725 from trunk into soc-2013-desgraph_mt
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57695
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57725
Modified Paths:
--------------
branches/soc-2013-depsgraph_mt/intern/cycles/blender/blender_session.cpp
branches/soc-2013-depsgraph_mt/intern/cycles/render/session.cpp
branches/soc-2013-depsgraph_mt/release/datafiles/startup.blend
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_global.h
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_lattice.h
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_particle.h
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_screen.h
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/CMakeLists.txt
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/lattice.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/mball.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/mesh.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/node.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/particle.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/particle_system.c
branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/scanfill.c
branches/soc-2013-depsgraph_mt/source/blender/collada/AnimationExporter.h
branches/soc-2013-depsgraph_mt/source/blender/collada/SkinInfo.cpp
branches/soc-2013-depsgraph_mt/source/blender/compositor/SConscript
branches/soc-2013-depsgraph_mt/source/blender/editors/include/ED_screen.h
branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface_style.c
branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface_templates.c
branches/soc-2013-depsgraph_mt/source/blender/editors/mesh/editmesh_bevel.c
branches/soc-2013-depsgraph_mt/source/blender/editors/mesh/editmesh_inset.c
branches/soc-2013-depsgraph_mt/source/blender/editors/object/object_shapekey.c
branches/soc-2013-depsgraph_mt/source/blender/editors/object/object_vgroup.c
branches/soc-2013-depsgraph_mt/source/blender/editors/render/render_internal.c
branches/soc-2013-depsgraph_mt/source/blender/editors/render/render_opengl.c
branches/soc-2013-depsgraph_mt/source/blender/editors/screen/area.c
branches/soc-2013-depsgraph_mt/source/blender/editors/sculpt_paint/paint_image_proj.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_action/space_action.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_buttons/space_buttons.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_clip/space_clip.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_console/space_console.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_file/space_file.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_graph/space_graph.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_image/space_image.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_info/space_info.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_logic/space_logic.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_nla/space_nla.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_node/node_draw.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_node/node_edit.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_node/space_node.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_outliner/space_outliner.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_script/space_script.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_sequencer/space_sequencer.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_text/space_text.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_time/space_time.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_userpref/space_userpref.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_view3d/drawobject.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2013-depsgraph_mt/source/blender/editors/transform/transform.h
branches/soc-2013-depsgraph_mt/source/blender/editors/transform/transform_conversions.c
branches/soc-2013-depsgraph_mt/source/blender/editors/transform/transform_generics.c
branches/soc-2013-depsgraph_mt/source/blender/editors/transform/transform_manipulator.c
branches/soc-2013-depsgraph_mt/source/blender/editors/transform/transform_ops.c
branches/soc-2013-depsgraph_mt/source/blender/freestyle/SConscript
branches/soc-2013-depsgraph_mt/source/blender/freestyle/intern/stroke/StrokeRep.cpp
branches/soc-2013-depsgraph_mt/source/blender/gpu/intern/gpu_codegen.c
branches/soc-2013-depsgraph_mt/source/blender/gpu/shaders/gpu_shader_material.glsl
branches/soc-2013-depsgraph_mt/source/blender/makesdna/DNA_lattice_types.h
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_lattice.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_material.c
branches/soc-2013-depsgraph_mt/source/blender/render/extern/include/RE_pipeline.h
branches/soc-2013-depsgraph_mt/source/blender/render/intern/source/pipeline.c
branches/soc-2013-depsgraph_mt/source/blender/windowmanager/WM_types.h
branches/soc-2013-depsgraph_mt/source/blender/windowmanager/intern/wm_event_system.c
Removed Paths:
-------------
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/script.c
Property Changed:
----------------
branches/soc-2013-depsgraph_mt/
branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_outliner/
Property changes on: branches/soc-2013-depsgraph_mt
___________________________________________________________________
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/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
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57395-57694
+ /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
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57395-57725
Modified: branches/soc-2013-depsgraph_mt/intern/cycles/blender/blender_session.cpp
===================================================================
--- branches/soc-2013-depsgraph_mt/intern/cycles/blender/blender_session.cpp 2013-06-25 07:22:28 UTC (rev 57725)
+++ branches/soc-2013-depsgraph_mt/intern/cycles/blender/blender_session.cpp 2013-06-25 07:27:59 UTC (rev 57726)
@@ -616,16 +616,22 @@
get_status(status, substatus);
get_progress(progress, total_time);
- timestatus = string_printf("Mem: %.2fM, Peak: %.2fM | ", mem_used, mem_peak);
+ timestatus = string_printf("Mem:%.2fM, Peak:%.2fM", mem_used, mem_peak);
- timestatus += b_scene.name();
- if(b_rlay_name != "")
- timestatus += ", " + b_rlay_name;
- timestatus += " | ";
+ if(background) {
+ timestatus += " | " + b_scene.name();
+ if(b_rlay_name != "")
+ timestatus += ", " + b_rlay_name;
+ }
+ else {
+ timestatus += " | ";
- BLI_timestr(total_time, time_str, sizeof(time_str));
- timestatus += "Elapsed: " + string(time_str) + " | ";
+ BLI_timestr(total_time, time_str, sizeof(time_str));
+ timestatus += "Time:" + string(time_str);
+ }
+ if(status.size() > 0)
+ status = " | " + status;
if(substatus.size() > 0)
status += " | " + substatus;
Modified: branches/soc-2013-depsgraph_mt/intern/cycles/render/session.cpp
===================================================================
--- branches/soc-2013-depsgraph_mt/intern/cycles/render/session.cpp 2013-06-25 07:22:28 UTC (rev 57725)
+++ branches/soc-2013-depsgraph_mt/intern/cycles/render/session.cpp 2013-06-25 07:27:59 UTC (rev 57726)
@@ -791,12 +791,16 @@
else
substatus = string_printf("Path Tracing Sample %d/%d", sample+1, tile_manager.num_samples);
- if(show_pause)
+ if(show_pause) {
status = "Paused";
- else if(show_done)
+ }
+ else if(show_done) {
status = "Done";
- else
- status = "Rendering";
+ }
+ else {
+ status = substatus;
+ substatus = "";
+ }
progress.set_status(status, substatus);
Modified: branches/soc-2013-depsgraph_mt/release/datafiles/startup.blend
===================================================================
(Binary files differ)
Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_global.h
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_global.h 2013-06-25 07:22:28 UTC (rev 57725)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_global.h 2013-06-25 07:27:59 UTC (rev 57726)
@@ -192,8 +192,7 @@
/* G.moving, signals drawing in (3d) window to denote transform */
#define G_TRANSFORM_OBJ 1
#define G_TRANSFORM_EDIT 2
-#define G_TRANSFORM_MANIP 4
-#define G_TRANSFORM_PARTICLE 8
+#define G_TRANSFORM_SEQ 4
/* G.special1 */
Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_lattice.h
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_lattice.h 2013-06-25 07:22:28 UTC (rev 57725)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_lattice.h 2013-06-25 07:27:59 UTC (rev 57726)
@@ -82,5 +82,8 @@
void BKE_lattice_center_bounds(struct Lattice *lt, float cent[3]);
void BKE_lattice_translate(struct Lattice *lt, float offset[3], int do_keys);
+int BKE_lattice_index_from_uvw(struct Lattice *lt, const int u, const int v, const int w);
+void BKE_lattice_index_to_uvw(struct Lattice *lt, const int index, int *r_u, int *r_v, int *r_w);
+
#endif
Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_particle.h
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_particle.h 2013-06-25 07:22:28 UTC (rev 57725)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_particle.h 2013-06-25 07:27:59 UTC (rev 57726)
@@ -380,6 +380,8 @@
void reset_particle(struct ParticleSimulationData *sim, struct ParticleData *pa, float dtime, float cfra);
+float psys_get_current_display_percentage(struct ParticleSystem *psys);
+
/* psys_reset */
#define PSYS_RESET_ALL 1
#define PSYS_RESET_DEPSGRAPH 2
Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_screen.h
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_screen.h 2013-06-25 07:22:28 UTC (rev 57725)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_screen.h 2013-06-25 07:27:59 UTC (rev 57726)
@@ -78,7 +78,7 @@
/* exit is called when the area is hidden or removed */
void (*exit)(struct wmWindowManager *, struct ScrArea *);
/* Listeners can react to bContext changes */
- void (*listener)(struct ScrArea *, struct wmNotifier *);
+ void (*listener)(struct bScreen *sc, struct ScrArea *, struct wmNotifier *);
/* refresh context, called after filereads, ED_area_tag_refresh() */
void (*refresh)(const struct bContext *, struct ScrArea *);
@@ -123,7 +123,7 @@
/* draw entirely, view changes should be handled here */
void (*draw)(const struct bContext *, struct ARegion *);
/* contextual changes should be handled here */
- void (*listener)(struct ARegion *, struct wmNotifier *);
+ void (*listener)(struct bScreen *sc, struct ScrArea *, struct ARegion *, struct wmNotifier *);
void (*free)(struct ARegion *);
Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/CMakeLists.txt
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/CMakeLists.txt 2013-06-25 07:22:28 UTC (rev 57725)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/CMakeLists.txt 2013-06-25 07:27:59 UTC (rev 57726)
@@ -137,7 +137,6 @@
intern/sca.c
intern/scene.c
intern/screen.c
- intern/script.c
intern/seqcache.c
intern/seqeffects.c
intern/seqmodifier.c
Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/lattice.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/lattice.c 2013-06-25 07:22:28 UTC (rev 57725)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/lattice.c 2013-06-25 07:27:59 UTC (rev 57726)
@@ -62,7 +62,20 @@
#include "BKE_deform.h"
+int BKE_lattice_index_from_uvw(struct Lattice *lt,
+ const int u, const int v, const int w)
+{
+ return (w * (lt->pntsu * lt->pntsv) + (v * lt->pntsu) + u);
+}
+void BKE_lattice_index_to_uvw(struct Lattice *lt, const int index,
+ int *r_u, int *r_v, int *r_w)
+{
+ *r_u = (index % lt->pntsu);
+ *r_v = (index / lt->pntsu) % lt->pntsv;
+ *r_w = (index / (lt->pntsu * lt->pntsv));
+}
+
void calc_lat_fudu(int flag, int res, float *r_fu, float *r_du)
{
if (res == 1) {
@@ -867,7 +880,7 @@
static BPoint *latt_bp(Lattice *lt, int u, int v, int w)
{
- return <->def[LT_INDEX(lt, u, v, w)];
+ return <->def[BKE_lattice_index_from_uvw(lt, u, v, w)];
}
void outside_lattice(Lattice *lt)
Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/mball.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/mball.c 2013-06-25 07:22:28 UTC (rev 57725)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/mball.c 2013-06-25 07:27:59 UTC (rev 57726)
@@ -2283,7 +2283,7 @@
if (process.totelem == 0) return;
if ((for_render == FALSE) && (mb->flag == MB_UPDATE_NEVER)) return;
- if (G.moving && mb->flag == MB_UPDATE_FAST) return;
+ if ((G.moving & (G_TRANSFORM_OBJ|G_TRANSFORM_EDIT)) && mb->flag == MB_UPDATE_FAST) return;
process.thresh = mb->thresh;
@@ -2325,7 +2325,7 @@
}
else {
width = mb->wiresize;
- if (G.moving && mb->flag == MB_UPDATE_HALFRES) width *= 2;
+ if ((G.moving & (G_TRANSFORM_OBJ|G_TRANSFORM_EDIT)) && mb->flag == MB_UPDATE_HALFRES) width *= 2;
}
/* nr_cubes is just for safety, minimum is totsize */
nr_cubes = (int)(0.5f + totsize / width);
Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/mesh.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/mesh.c 2013-06-25 07:22:28 UTC (rev 57725)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/mesh.c 2013-06-25 07:27:59 UTC (rev 57726)
@@ -2733,8 +2733,14 @@
}
#endif /* USE_TESSFACE_SPEEDUP */
else {
+#define USE_TESSFACE_CALCNORMAL
+
int totfilltri;
+#ifdef USE_TESSFACE_CALCNORMAL
+ float normal[3];
+ zero_v3(normal);
+#endif
ml = mloop + mp->loopstart;
BLI_scanfill_begin(&sf_ctx);
@@ -2745,16 +2751,25 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list