[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43185] branches/bmesh/blender: svn merge ^/trunk/blender -r43160:43183
Campbell Barton
ideasman42 at gmail.com
Thu Jan 5 23:30:12 CET 2012
Revision: 43185
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43185
Author: campbellbarton
Date: 2012-01-05 22:30:08 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r43160:43183
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43160
Modified Paths:
--------------
branches/bmesh/blender/release/scripts/startup/bl_operators/clip.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_curve.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_clip.py
branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/sound.c
branches/bmesh/blender/source/blender/editors/screen/screendump.c
branches/bmesh/blender/source/blender/imbuf/IMB_imbuf.h
branches/bmesh/blender/source/blender/imbuf/intern/divers.c
branches/bmesh/blender/source/blender/nodes/composite/node_composite_util.c
branches/bmesh/blender/source/blender/render/CMakeLists.txt
branches/bmesh/blender/source/blender/render/extern/include/RE_pipeline.h
branches/bmesh/blender/source/blender/render/intern/include/renderpipeline.h
branches/bmesh/blender/source/blender/render/intern/source/external_engine.c
branches/bmesh/blender/source/blender/render/intern/source/pipeline.c
branches/bmesh/blender/source/blender/render/intern/source/rayshade.c
branches/bmesh/blender/source/blender/render/intern/source/rendercore.c
branches/bmesh/blender/source/blender/render/intern/source/zbuf.c
Added Paths:
-----------
branches/bmesh/blender/source/blender/render/intern/include/render_result.h
branches/bmesh/blender/source/blender/render/intern/source/render_result.c
Property Changed:
----------------
branches/bmesh/blender/
branches/bmesh/blender/release/
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber:37517,38384,38387,38403-38404,38407,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:39992-43160
+ /branches/soc-2011-cucumber:37517,38384,38387,38403-38404,38407,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:39992-43183
Property changes on: branches/bmesh/blender/release
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release:31524-42516,42522-42548,42551-42585,42587-42655,42681-42757,42779-42870,42921-42927,42954-42957,42974-43085,43093-43160
+ /trunk/blender/release:31524-42516,42522-42548,42551-42585,42587-42655,42681-42757,42779-42870,42921-42927,42954-42957,42974-43085,43093-43183
Modified: branches/bmesh/blender/release/scripts/startup/bl_operators/clip.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_operators/clip.py 2012-01-05 22:25:14 UTC (rev 43184)
+++ branches/bmesh/blender/release/scripts/startup/bl_operators/clip.py 2012-01-05 22:30:08 UTC (rev 43185)
@@ -24,7 +24,7 @@
from mathutils import Vector, Matrix
-def CLIP_spacees_walk(context, all_screens, tarea, tspace, callback, *args):
+def CLIP_spaces_walk(context, all_screens, tarea, tspace, callback, *args):
screens = bpy.data.screens if all_screens else [context.screen]
for screen in screens:
@@ -56,7 +56,7 @@
space_v3d.show_background_images = True
- CLIP_spacees_walk(context, all_screens, 'VIEW_3D', 'VIEW_3D',
+ CLIP_spaces_walk(context, all_screens, 'VIEW_3D', 'VIEW_3D',
set_background, clip, clip_user)
@@ -529,7 +529,7 @@
def setup_space(space):
space.show_backdrop = True
- CLIP_spacees_walk(context, True, 'NODE_EDITOR', 'NODE_EDITOR',
+ CLIP_spaces_walk(context, True, 'NODE_EDITOR', 'NODE_EDITOR',
setup_space)
sc = context.space_data
Modified: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_curve.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_curve.py 2012-01-05 22:25:14 UTC (rev 43184)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_curve.py 2012-01-05 22:30:08 UTC (rev 43185)
@@ -214,12 +214,12 @@
if is_poly:
# These settings are below but its easier to have
# poly's set aside since they use so few settings
- col = split.column()
- col.label(text="Cyclic:")
- col.prop(act_spline, "use_smooth")
- col = split.column()
- col.prop(act_spline, "use_cyclic_u", text="U")
-
+ row = layout.row()
+ row.label(text="Cyclic:")
+ row.prop(act_spline, "use_cyclic_u", text="U")
+
+ layout.prop(act_spline, "use_smooth")
+
else:
col = split.column()
col.label(text="Cyclic:")
@@ -257,13 +257,13 @@
sub.prop(act_spline, "resolution_v", text="V")
if not is_surf:
- split = layout.split()
- col = split.column()
-
+ col = layout.column()
col.label(text="Interpolation:")
- colsub = col.column()
- colsub.active = (curve.dimensions == '3D')
- colsub.prop(act_spline, "tilt_interpolation", text="Tilt")
+
+ sub = col.column()
+ sub.active = (curve.dimensions == '3D')
+ sub.prop(act_spline, "tilt_interpolation", text="Tilt")
+
col.prop(act_spline, "radius_interpolation", text="Radius")
layout.prop(act_spline, "use_smooth")
Modified: branches/bmesh/blender/release/scripts/startup/bl_ui/space_clip.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/space_clip.py 2012-01-05 22:25:14 UTC (rev 43184)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/space_clip.py 2012-01-05 22:30:08 UTC (rev 43185)
@@ -317,9 +317,10 @@
return False
def draw(self, context):
+ layout = self.layout
+
sc = context.space_data
clip = sc.clip
- layout = self.layout
tracking_object = clip.tracking.objects.active
settings = sc.clip.tracking.settings
@@ -376,9 +377,9 @@
def draw(self, context):
layout = self.layout
+
sc = context.space_data
- clip = sc.clip
- tracking = clip.tracking
+ tracking = sc.clip.tracking
row = layout.row()
row.template_list(tracking, "objects",
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c 2012-01-05 22:25:14 UTC (rev 43184)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c 2012-01-05 22:30:08 UTC (rev 43185)
@@ -1661,9 +1661,6 @@
mf->flag &= ~ME_SMOOTH;
}
}
-
- mesh_calc_normals(me->mvert, me->totvert, me->mloop, me->mpoly, me->totloop,
- me->totpoly, NULL, NULL, 0, NULL, NULL);
}
void mesh_calc_normals(MVert *mverts, int numVerts, MLoop *mloop, MPoly *mpolys,
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/sound.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/sound.c 2012-01-05 22:25:14 UTC (rev 43184)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/sound.c 2012-01-05 22:30:08 UTC (rev 43185)
@@ -490,9 +490,11 @@
void sound_move_scene_sound_defaults(struct Scene *scene, struct Sequence* sequence)
{
- sound_move_scene_sound(scene, sequence->scene_sound,
- sequence->startdisp, sequence->enddisp,
- sequence->startofs + sequence->anim_startofs);
+ if (sequence->scene_sound) {
+ sound_move_scene_sound(scene, sequence->scene_sound,
+ sequence->startdisp, sequence->enddisp,
+ sequence->startofs + sequence->anim_startofs);
+ }
}
void sound_update_scene_sound(void* handle, struct bSound* sound)
Modified: branches/bmesh/blender/source/blender/editors/screen/screendump.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/screen/screendump.c 2012-01-05 22:25:14 UTC (rev 43184)
+++ branches/bmesh/blender/source/blender/editors/screen/screendump.c 2012-01-05 22:30:08 UTC (rev 43185)
@@ -278,7 +278,6 @@
ScreenshotJob *sj= sjv;
RenderData rd= sj->scene->r;
bMovieHandle *mh= BKE_get_movie_handle(sj->scene->r.im_format.imtype);
- int cfra= 1;
/* we need this as local variables for renderdata */
rd.frs_sec= U.scrcastfps;
@@ -303,9 +302,9 @@
if(sj->dumprect) {
if(mh) {
- if(mh->append_movie(&rd, cfra, (int *)sj->dumprect, sj->dumpsx, sj->dumpsy, &sj->reports)) {
- BKE_reportf(&sj->reports, RPT_INFO, "Appended frame: %d", cfra);
- printf("Appended frame %d\n", cfra);
+ if(mh->append_movie(&rd, rd.cfra, (int *)sj->dumprect, sj->dumpsx, sj->dumpsy, &sj->reports)) {
+ BKE_reportf(&sj->reports, RPT_INFO, "Appended frame: %d", rd.cfra);
+ printf("Appended frame %d\n", rd.cfra);
} else
break;
}
@@ -314,7 +313,7 @@
char name[FILE_MAX];
int ok;
- BKE_makepicstring(name, rd.pic, sj->bmain->name, cfra, rd.im_format.imtype, rd.scemode & R_EXTENSION, TRUE);
+ BKE_makepicstring(name, rd.pic, sj->bmain->name, rd.cfra, rd.im_format.imtype, rd.scemode & R_EXTENSION, TRUE);
ibuf->rect= sj->dumprect;
ok= BKE_write_ibuf(ibuf, name, &rd.im_format);
@@ -338,7 +337,7 @@
*do_update= 1;
- cfra++;
+ rd.cfra++;
}
else
Modified: branches/bmesh/blender/source/blender/imbuf/IMB_imbuf.h
===================================================================
--- branches/bmesh/blender/source/blender/imbuf/IMB_imbuf.h 2012-01-05 22:25:14 UTC (rev 43184)
+++ branches/bmesh/blender/source/blender/imbuf/IMB_imbuf.h 2012-01-05 22:30:08 UTC (rev 43185)
@@ -380,7 +380,7 @@
/* converting pixel buffers */
void IMB_buffer_byte_from_float(unsigned char *rect_to, const float *rect_from,
- int channels_from, int dither, int profile_to, int profile_from, int predivide,
+ int channels_from, float dither, int profile_to, int profile_from, int predivide,
int width, int height, int stride_to, int stride_from);
void IMB_buffer_float_from_byte(float *rect_to, const unsigned char *rect_from,
int profile_to, int profile_from, int predivide,
Modified: branches/bmesh/blender/source/blender/imbuf/intern/divers.c
===================================================================
--- branches/bmesh/blender/source/blender/imbuf/intern/divers.c 2012-01-05 22:25:14 UTC (rev 43184)
+++ branches/bmesh/blender/source/blender/imbuf/intern/divers.c 2012-01-05 22:30:08 UTC (rev 43185)
@@ -123,7 +123,7 @@
/* float to byte pixels, output 4-channel RGBA */
void IMB_buffer_byte_from_float(uchar *rect_to, const float *rect_from,
- int channels_from, int dither, int profile_to, int profile_from, int predivide,
+ int channels_from, float dither, int profile_to, int profile_from, int predivide,
int width, int height, int stride_to, int stride_from)
{
float tmp[4];
Modified: branches/bmesh/blender/source/blender/nodes/composite/node_composite_util.c
===================================================================
--- branches/bmesh/blender/source/blender/nodes/composite/node_composite_util.c 2012-01-05 22:25:14 UTC (rev 43184)
+++ branches/bmesh/blender/source/blender/nodes/composite/node_composite_util.c 2012-01-05 22:30:08 UTC (rev 43185)
@@ -427,6 +427,18 @@
/* **************************************************** */
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list