[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58272] branches/soc-2013-paint: Merge trunk -r58222 into soc-2013-paint
Antony Riakiotakis
kalast at gmail.com
Mon Jul 15 17:08:30 CEST 2013
Revision: 58272
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58272
Author: psy-fi
Date: 2013-07-15 15:08:30 +0000 (Mon, 15 Jul 2013)
Log Message:
-----------
Merge trunk -r58222 into soc-2013-paint
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58222
Modified Paths:
--------------
branches/soc-2013-paint/intern/cycles/blender/addon/ui.py
branches/soc-2013-paint/source/blender/blenfont/intern/blf_font.c
branches/soc-2013-paint/source/blender/blenkernel/BKE_object.h
branches/soc-2013-paint/source/blender/blenkernel/intern/boids.c
branches/soc-2013-paint/source/blender/blenkernel/intern/brush.c
branches/soc-2013-paint/source/blender/blenkernel/intern/constraint.c
branches/soc-2013-paint/source/blender/blenkernel/intern/dynamicpaint.c
branches/soc-2013-paint/source/blender/blenkernel/intern/fcurve.c
branches/soc-2013-paint/source/blender/blenkernel/intern/image.c
branches/soc-2013-paint/source/blender/blenkernel/intern/lattice.c
branches/soc-2013-paint/source/blender/blenkernel/intern/linestyle.c
branches/soc-2013-paint/source/blender/blenkernel/intern/mask_rasterize.c
branches/soc-2013-paint/source/blender/blenkernel/intern/material.c
branches/soc-2013-paint/source/blender/blenkernel/intern/mball.c
branches/soc-2013-paint/source/blender/blenkernel/intern/movieclip.c
branches/soc-2013-paint/source/blender/blenkernel/intern/node.c
branches/soc-2013-paint/source/blender/blenkernel/intern/object.c
branches/soc-2013-paint/source/blender/blenkernel/intern/particle_system.c
branches/soc-2013-paint/source/blender/blenkernel/intern/tracking.c
branches/soc-2013-paint/source/blender/blenlib/BLI_math_geom.h
branches/soc-2013-paint/source/blender/blenlib/intern/math_geom.c
branches/soc-2013-paint/source/blender/blenlib/intern/math_matrix.c
branches/soc-2013-paint/source/blender/blenloader/intern/versioning_legacy.c
branches/soc-2013-paint/source/blender/bmesh/operators/bmo_connect_pair.c
branches/soc-2013-paint/source/blender/compositor/nodes/COM_ZCombineNode.cpp
branches/soc-2013-paint/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cpp
branches/soc-2013-paint/source/blender/editors/animation/anim_markers.c
branches/soc-2013-paint/source/blender/editors/interface/interface.c
branches/soc-2013-paint/source/blender/editors/interface/interface_handlers.c
branches/soc-2013-paint/source/blender/editors/interface/interface_layout.c
branches/soc-2013-paint/source/blender/editors/interface/interface_regions.c
branches/soc-2013-paint/source/blender/editors/mesh/editmesh_loopcut.c
branches/soc-2013-paint/source/blender/editors/mesh/editmesh_utils.c
branches/soc-2013-paint/source/blender/editors/object/object_add.c
branches/soc-2013-paint/source/blender/editors/render/render_internal.c
branches/soc-2013-paint/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2013-paint/source/blender/editors/space_buttons/space_buttons.c
branches/soc-2013-paint/source/blender/editors/space_clip/space_clip.c
branches/soc-2013-paint/source/blender/editors/space_file/filelist.c
branches/soc-2013-paint/source/blender/editors/space_node/drawnode.c
branches/soc-2013-paint/source/blender/editors/space_node/node_select.c
branches/soc-2013-paint/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2013-paint/source/blender/editors/space_time/space_time.c
branches/soc-2013-paint/source/blender/editors/space_view3d/view3d_ruler.c
branches/soc-2013-paint/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2013-paint/source/blender/editors/transform/transform_manipulator.c
branches/soc-2013-paint/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/soc-2013-paint/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
branches/soc-2013-paint/source/blender/freestyle/intern/view_map/ArbitraryGridDensityProvider.cpp
branches/soc-2013-paint/source/blender/freestyle/intern/view_map/AverageAreaGridDensityProvider.cpp
branches/soc-2013-paint/source/blender/freestyle/intern/view_map/BoxGrid.cpp
branches/soc-2013-paint/source/blender/freestyle/intern/view_map/GridDensityProvider.h
branches/soc-2013-paint/source/blender/freestyle/intern/view_map/Pow23GridDensityProvider.cpp
branches/soc-2013-paint/source/blender/freestyle/intern/view_map/SphericalGrid.cpp
branches/soc-2013-paint/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
branches/soc-2013-paint/source/blender/imbuf/intern/colormanagement.c
branches/soc-2013-paint/source/blender/imbuf/intern/util.c
branches/soc-2013-paint/source/blender/makesdna/intern/makesdna.c
branches/soc-2013-paint/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2013-paint/source/blender/makesrna/intern/rna_object.c
branches/soc-2013-paint/source/blender/modifiers/intern/MOD_screw.c
branches/soc-2013-paint/source/blender/modifiers/intern/MOD_solidify.c
branches/soc-2013-paint/source/blender/render/extern/include/RE_engine.h
branches/soc-2013-paint/source/blender/render/intern/source/convertblender.c
branches/soc-2013-paint/source/blender/render/intern/source/external_engine.c
branches/soc-2013-paint/source/blender/render/intern/source/render_texture.c
branches/soc-2013-paint/source/blender/windowmanager/intern/wm_playanim.c
Modified: branches/soc-2013-paint/intern/cycles/blender/addon/ui.py
===================================================================
--- branches/soc-2013-paint/intern/cycles/blender/addon/ui.py 2013-07-15 15:06:14 UTC (rev 58271)
+++ branches/soc-2013-paint/intern/cycles/blender/addon/ui.py 2013-07-15 15:08:30 UTC (rev 58272)
@@ -213,23 +213,25 @@
subsub.enabled = not rd.use_border
subsub.prop(rd, "use_save_buffers")
- col = split.column()
+ col = split.column(align=True)
- sub = col.column(align=True)
- sub.label(text="Acceleration structure:")
- sub.prop(cscene, "debug_bvh_type", text="")
- sub.prop(cscene, "debug_use_spatial_splits")
- sub.prop(cscene, "use_cache")
+ col.label(text="Viewport:")
+ col.prop(cscene, "debug_bvh_type", text="")
+ col.separator()
+ col.prop(cscene, "preview_start_resolution")
- sub = col.column(align=True)
- sub.label(text="Viewport:")
- sub.prop(cscene, "preview_start_resolution")
+ col.separator()
- sub = col.column(align=True)
- sub.label(text="Final Render:")
- sub.prop(rd, "use_persistent_data", text="Persistent Images")
+ col.label(text="Final Render:")
+ col.prop(cscene, "use_cache")
+ col.prop(rd, "use_persistent_data", text="Persistent Images")
+ col.separator()
+ col.label(text="Acceleration structure:")
+ col.prop(cscene, "debug_use_spatial_splits")
+
+
class CyclesRender_PT_opengl(CyclesButtonsPanel, Panel):
bl_label = "OpenGL Render"
bl_options = {'DEFAULT_CLOSED'}
Modified: branches/soc-2013-paint/source/blender/blenfont/intern/blf_font.c
===================================================================
--- branches/soc-2013-paint/source/blender/blenfont/intern/blf_font.c 2013-07-15 15:06:14 UTC (rev 58271)
+++ branches/soc-2013-paint/source/blender/blenfont/intern/blf_font.c 2013-07-15 15:08:30 UTC (rev 58272)
@@ -87,7 +87,7 @@
err = FT_Set_Char_Size(font->face, 0, (FT_F26Dot6)(size * 64), dpi, dpi);
if (err) {
/* FIXME: here we can go through the fixed size and choice a close one */
- printf("The current font don't support the size, %d and dpi, %d\n", size, dpi);
+ printf("The current font don't support the size, %u and dpi, %u\n", size, dpi);
return;
}
Modified: branches/soc-2013-paint/source/blender/blenkernel/BKE_object.h
===================================================================
--- branches/soc-2013-paint/source/blender/blenkernel/BKE_object.h 2013-07-15 15:06:14 UTC (rev 58271)
+++ branches/soc-2013-paint/source/blender/blenkernel/BKE_object.h 2013-07-15 15:08:30 UTC (rev 58272)
@@ -95,15 +95,16 @@
void BKE_object_to_mat3(struct Object *ob, float mat[3][3]);
void BKE_object_to_mat4(struct Object *ob, float mat[4][4]);
void BKE_object_apply_mat4(struct Object *ob, float mat[4][4], const bool use_compat, const bool use_parent);
+void BKE_object_matrix_local_get(struct Object *ob, float mat[4][4]);
bool BKE_object_pose_context_check(struct Object *ob);
struct Object *BKE_object_pose_armature_get(struct Object *ob);
void BKE_object_where_is_calc(struct Scene *scene, struct Object *ob);
-void BKE_object_where_is_calc_ex(struct Scene *scene, struct RigidBodyWorld *rbw, struct Object *ob);
+void BKE_object_where_is_calc_ex(struct Scene *scene, struct RigidBodyWorld *rbw, struct Object *ob, float r_originmat[3][3]);
void BKE_object_where_is_calc_time(struct Scene *scene, struct Object *ob, float ctime);
void BKE_object_where_is_calc_time_ex(struct Scene *scene, struct Object *ob, float ctime,
- struct RigidBodyWorld *rbw);
+ struct RigidBodyWorld *rbw, float r_originmat[3][3]);
void BKE_object_where_is_calc_simul(struct Scene *scene, struct Object *ob);
void BKE_object_where_is_calc_mat4(struct Scene *scene, struct Object *ob, float obmat[4][4]);
Modified: branches/soc-2013-paint/source/blender/blenkernel/intern/boids.c
===================================================================
--- branches/soc-2013-paint/source/blender/blenkernel/intern/boids.c 2013-07-15 15:06:14 UTC (rev 58271)
+++ branches/soc-2013-paint/source/blender/blenkernel/intern/boids.c 2013-07-15 15:08:30 UTC (rev 58272)
@@ -981,6 +981,7 @@
rule = BLI_findlink(&state->rules, rand % BLI_countlist(&state->rules));
apply_boid_rule(bbd, rule, &val, pa, -1.0);
+ break;
}
case eBoidRulesetType_Average:
{
Modified: branches/soc-2013-paint/source/blender/blenkernel/intern/brush.c
===================================================================
--- branches/soc-2013-paint/source/blender/blenkernel/intern/brush.c 2013-07-15 15:06:14 UTC (rev 58271)
+++ branches/soc-2013-paint/source/blender/blenkernel/intern/brush.c 2013-07-15 15:08:30 UTC (rev 58272)
@@ -545,7 +545,7 @@
else if (mtex->brush_map_mode == MTEX_MAP_MODE_STENCIL) {
float rotation = -mtex->rot;
float point_2d[2] = {point[0], point[1]};
- float x = 0.0f, y = 0.0f; /* Quite warnings */
+ float x, y;
float co[3];
x = point_2d[0] - br->stencil_pos[0];
@@ -664,7 +664,7 @@
if (mtex->brush_map_mode == MTEX_MAP_MODE_STENCIL) {
float rotation = -mtex->rot;
float point_2d[2] = {point[0], point[1]};
- float x = 0.0f, y = 0.0f; /* Quite warnings */
+ float x, y;
float co[3];
x = point_2d[0] - br->mask_stencil_pos[0];
Modified: branches/soc-2013-paint/source/blender/blenkernel/intern/constraint.c
===================================================================
--- branches/soc-2013-paint/source/blender/blenkernel/intern/constraint.c 2013-07-15 15:06:14 UTC (rev 58271)
+++ branches/soc-2013-paint/source/blender/blenkernel/intern/constraint.c 2013-07-15 15:08:30 UTC (rev 58272)
@@ -2519,7 +2519,7 @@
/* only evaluate if there is a target */
if (VALID_CONS_TARGET(ct)) {
- float dvec[3], dist = 0.0f, sfac = 1.0f;
+ float dvec[3], dist, sfac = 1.0f;
short clamp_surf = 0;
/* calculate our current distance from the target */
Modified: branches/soc-2013-paint/source/blender/blenkernel/intern/dynamicpaint.c
===================================================================
--- branches/soc-2013-paint/source/blender/blenkernel/intern/dynamicpaint.c 2013-07-15 15:06:14 UTC (rev 58271)
+++ branches/soc-2013-paint/source/blender/blenkernel/intern/dynamicpaint.c 2013-07-15 15:08:30 UTC (rev 58272)
@@ -1942,6 +1942,7 @@
/* loop through surfaces */
for (; surface; surface = surface->next) {
int current_frame = (int)scene->r.cfra;
+ bool no_surface_data;
/* free bake data if not required anymore */
surface_freeUnusedData(surface);
@@ -1951,12 +1952,13 @@
if (!(surface->flags & MOD_DPAINT_ACTIVE)) continue;
/* make sure surface is valid */
+ no_surface_data = surface->data == NULL;
if (!dynamicPaint_checkSurfaceData(surface)) continue;
/* limit frame range */
CLAMP(current_frame, surface->start_frame, surface->end_frame);
- if (current_frame != surface->current_frame || (int)scene->r.cfra == surface->start_frame) {
+ if (no_surface_data || current_frame != surface->current_frame || (int)scene->r.cfra == surface->start_frame) {
PointCache *cache = surface->pointcache;
PTCacheID pid;
surface->current_frame = current_frame;
Modified: branches/soc-2013-paint/source/blender/blenkernel/intern/fcurve.c
===================================================================
--- branches/soc-2013-paint/source/blender/blenkernel/intern/fcurve.c 2013-07-15 15:06:14 UTC (rev 58271)
+++ branches/soc-2013-paint/source/blender/blenkernel/intern/fcurve.c 2013-07-15 15:08:30 UTC (rev 58272)
@@ -1697,7 +1697,7 @@
/* perform operations on the total if appropriate */
if (driver->type == DRIVER_TYPE_AVERAGE)
- driver->curval = (value / (float)tot);
+ driver->curval = tot ? (value / (float)tot) : 0.0f;
else
driver->curval = value;
}
Modified: branches/soc-2013-paint/source/blender/blenkernel/intern/image.c
===================================================================
--- branches/soc-2013-paint/source/blender/blenkernel/intern/image.c 2013-07-15 15:06:14 UTC (rev 58271)
+++ branches/soc-2013-paint/source/blender/blenkernel/intern/image.c 2013-07-15 15:08:30 UTC (rev 58272)
@@ -2718,8 +2718,8 @@
re = RE_GetRender(iuser->scene->id.name);
channels = 4;
- layer = (iuser) ? iuser->layer : 0;
- pass = (iuser) ? iuser->pass : 0;
+ layer = iuser->layer;
+ pass = iuser->pass;
if (from_render) {
RE_AcquireResultImage(re, &rres);
Modified: branches/soc-2013-paint/source/blender/blenkernel/intern/lattice.c
===================================================================
--- branches/soc-2013-paint/source/blender/blenkernel/intern/lattice.c 2013-07-15 15:06:14 UTC (rev 58271)
+++ branches/soc-2013-paint/source/blender/blenkernel/intern/lattice.c 2013-07-15 15:08:30 UTC (rev 58272)
@@ -681,7 +681,7 @@
* we want either a Mesh with no derived data, or derived data with
* deformverts
*/
- if (target && target->type == OB_MESH) {
+ if (target->type == OB_MESH) {
/* if there's derived data without deformverts, don't use vgroups */
if (dm) {
use_vgroups = (dm->getVertData(dm, 0, CD_MDEFORMVERT) != NULL);
Modified: branches/soc-2013-paint/source/blender/blenkernel/intern/linestyle.c
===================================================================
--- branches/soc-2013-paint/source/blender/blenkernel/intern/linestyle.c 2013-07-15 15:06:14 UTC (rev 58271)
+++ branches/soc-2013-paint/source/blender/blenkernel/intern/linestyle.c 2013-07-15 15:08:30 UTC (rev 58272)
@@ -183,7 +183,7 @@
m = (LineStyleModifier *)MEM_callocN(size, "line style modifier");
m->type = type;
- strcpy(m->name, modifier_name[type]);
+ BLI_strncpy(m->name, modifier_name[type], sizeof(m->name));
m->influence = 1.0f;
m->flags = LS_MODIFIER_ENABLED | LS_MODIFIER_EXPANDED;
Modified: branches/soc-2013-paint/source/blender/blenkernel/intern/mask_rasterize.c
===================================================================
--- branches/soc-2013-paint/source/blender/blenkernel/intern/mask_rasterize.c 2013-07-15 15:06:14 UTC (rev 58271)
+++ branches/soc-2013-paint/source/blender/blenkernel/intern/mask_rasterize.c 2013-07-15 15:08:30 UTC (rev 58272)
@@ -530,7 +530,7 @@
if (1) {
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list