blender.git
5 years agofix: visual studio 2010 project built with cmake could not find libjpeg soc-2013-viewport_fx
Jason Wilkins [Sat, 31 May 2014 04:08:27 +0000 (23:08 -0500)]
fix: visual studio 2010 project built with cmake could not find libjpeg

5 years agoFixed compile errors associated with merge from soc-2013-viewport_fx and MSVC2010
Jason Wilkins [Fri, 30 May 2014 03:56:55 +0000 (22:56 -0500)]
Fixed compile errors associated with merge from soc-2013-viewport_fx and MSVC2010

not tested

5 years agoMerge branch 'soc-2014-viewport' into soc-2013-viewport_fx
Jason Wilkins [Thu, 22 May 2014 00:02:02 +0000 (19:02 -0500)]
Merge branch 'soc-2014-viewport' into soc-2013-viewport_fx

Conflicts:
intern/cycles/device/device_cuda.cpp
intern/ghost/intern/GHOST_WindowCocoa.mm
source/blender/blenfont/intern/blf_font.c
source/blender/blenfont/intern/blf_translation.c
source/blender/blenkernel/BKE_brush.h
source/blender/blenkernel/BKE_pbvh.h
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/editderivedmesh.c
source/blender/blenkernel/intern/mesh.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/blenlib/BLI_fileops.h
source/blender/blenlib/BLI_math_matrix.h
source/blender/blenlib/intern/fileops.c
source/blender/blenlib/intern/math_matrix.c
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/animation/anim_draw.c
source/blender/editors/animation/keyframes_draw.c
source/blender/editors/include/ED_armature.h
source/blender/editors/interface/interface.c
source/blender/editors/interface/interface_draw.c
source/blender/editors/interface/interface_icons.c
source/blender/editors/interface/interface_panel.c
source/blender/editors/interface/interface_widgets.c
source/blender/editors/interface/view2d.c
source/blender/editors/mask/mask_draw.c
source/blender/editors/mesh/editmesh_select.c
source/blender/editors/render/render_opengl.c
source/blender/editors/screen/area.c
source/blender/editors/screen/glutil.c
source/blender/editors/sculpt_paint/paint_cursor.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/sculpt_paint/paint_image_proj.c
source/blender/editors/sculpt_paint/paint_utils.c
source/blender/editors/sculpt_paint/sculpt_intern.h
source/blender/editors/space_buttons/space_buttons.c
source/blender/editors/space_clip/clip_dopesheet_draw.c
source/blender/editors/space_clip/clip_draw.c
source/blender/editors/space_clip/clip_graph_draw.c
source/blender/editors/space_clip/clip_utils.c
source/blender/editors/space_console/console_draw.c
source/blender/editors/space_file/file_draw.c
source/blender/editors/space_file/file_ops.c
source/blender/editors/space_graph/graph_draw.c
source/blender/editors/space_info/info_draw.c
source/blender/editors/space_info/textview.c
source/blender/editors/space_logic/logic_window.c
source/blender/editors/space_nla/nla_draw.c
source/blender/editors/space_outliner/outliner_draw.c
source/blender/editors/space_sequencer/sequencer_draw.c
source/blender/editors/space_view3d/drawanimviz.c
source/blender/editors/space_view3d/drawarmature.c
source/blender/editors/space_view3d/drawmesh.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/editors/space_view3d/view3d_fly.c
source/blender/editors/space_view3d/view3d_intern.h
source/blender/editors/space_view3d/view3d_walk.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_manipulator.c
source/blender/editors/util/ed_util.c
source/blender/editors/uvedit/uvedit_draw.c
source/blender/gpu/GPU_buffers.h
source/blender/gpu/intern/gpu_buffers.c
source/blender/gpu/intern/gpu_codegen.c
source/blender/gpu/intern/gpu_codegen.h
source/blender/gpu/intern/gpu_draw.c
source/blender/render/intern/source/convertblender.c
source/blender/windowmanager/intern/wm_operators.c
source/blender/windowmanager/intern/wm_subwindow.c
source/blender/windowmanager/intern/wm_window.c

5 years agofixed compile errors on MacOSX Clang 5.1 after previous merge
Jason Wilkins [Tue, 20 May 2014 05:08:13 +0000 (00:08 -0500)]
fixed compile errors on MacOSX Clang 5.1 after previous merge

5 years agoerror fix: missing definition of offsetof when compiling with clang 5.1 on MacOS...
Jason Wilkins [Tue, 20 May 2014 04:50:18 +0000 (23:50 -0500)]
error fix: missing definition of offsetof when compiling with clang 5.1 on MacOS 10 Mavericks

5 years agowarning fix: removed unused function f_to_char
Jason Wilkins [Tue, 20 May 2014 03:52:05 +0000 (22:52 -0500)]
warning fix: removed unused function f_to_char

5 years agowarning fix: typedef of incomplete struct type forces redefinition of the typedef...
Jason Wilkins [Tue, 20 May 2014 03:03:20 +0000 (22:03 -0500)]
warning fix: typedef of incomplete struct type forces redefinition of the typedef later, which is illegal except in C++ 11

5 years agoCleanup: Remove unused hardcoded variables in the integrator.
Thomas Dinges [Mon, 12 May 2014 08:45:11 +0000 (10:45 +0200)]
Cleanup: Remove unused hardcoded variables in the integrator.

Differential Revision: https://developer.blender.org/D525

5 years agoCleanup: Some else if for attribute code.
Thomas Dinges [Mon, 12 May 2014 08:20:20 +0000 (10:20 +0200)]
Cleanup: Some else if for attribute code.

5 years agoFix T40142: Objects restricted in render/view don't produce duplis in
Lukas Tönne [Mon, 12 May 2014 06:55:47 +0000 (08:55 +0200)]
Fix T40142: Objects restricted in render/view don't produce duplis in
with correct transform for Blender Internal.

According to previous code the obmat must be modified even if the
duplicated object itself is filtered later. TBH i have no idea how/why
this works, but nobody else does either ... All obmats are restored
after BI messes with them during render, so should be fine ...

5 years agoA bit more helpful doc strings on the curve render resolution properties.
Lukas Tönne [Mon, 12 May 2014 06:07:33 +0000 (08:07 +0200)]
A bit more helpful doc strings on the curve render resolution properties.

5 years agoFix for crash when doing "make local object+data" on an empty.
Lukas Tönne [Mon, 12 May 2014 05:49:31 +0000 (07:49 +0200)]
Fix for crash when doing "make local object+data" on an empty.

This commit added object data loop, without checking ob->data for NULL:
rB6e5e3b73f37f952420d87a3d8acd07a7f68dd5a3

5 years agoFix crash removing objects rigid body constraints
Campbell Barton [Mon, 12 May 2014 04:55:54 +0000 (14:55 +1000)]
Fix crash removing objects rigid body constraints

5 years agoFix/Workaround T40102: RMB on vertex & GKey, acts as double-G
Campbell Barton [Mon, 12 May 2014 02:54:29 +0000 (12:54 +1000)]
Fix/Workaround T40102: RMB on vertex & GKey, acts as double-G

5 years agoFix for numpad orbit ignoring auto-perspective
Campbell Barton [Mon, 12 May 2014 01:27:59 +0000 (11:27 +1000)]
Fix for numpad orbit ignoring auto-perspective

5 years agoFix for rotate-around-selection in text-edit mode
Campbell Barton [Mon, 12 May 2014 01:19:55 +0000 (11:19 +1000)]
Fix for rotate-around-selection in text-edit mode

This wasn't supported and would print an error message.

5 years agoFix T40144: Font rendering problems
Campbell Barton [Sun, 11 May 2014 23:08:02 +0000 (09:08 +1000)]
Fix T40144: Font rendering problems

5 years agoVFont: de-duplicate checks for next/prev handles
Campbell Barton [Sun, 11 May 2014 23:02:14 +0000 (09:02 +1000)]
VFont: de-duplicate checks for next/prev handles

5 years agoVFont: avoid allocating an array for storing total contours.
Campbell Barton [Sun, 11 May 2014 22:45:19 +0000 (08:45 +1000)]
VFont: avoid allocating an array for storing total contours.

5 years agoFix cycles baking code build errors with OpenCL on some platforms.
Brecht Van Lommel [Sun, 11 May 2014 14:36:18 +0000 (16:36 +0200)]
Fix cycles baking code build errors with OpenCL on some platforms.

5 years agoFix T40117: cycles sobol RNG issue when disabling __CAMERA_MOTION__.
Brecht Van Lommel [Sun, 11 May 2014 13:36:28 +0000 (15:36 +0200)]
Fix T40117: cycles sobol RNG issue when disabling __CAMERA_MOTION__.

This doesn't affect any actual release code since camera motion blur is enabled.

5 years agoRemove unneeded comment.
IRIE Shinsuke [Sun, 11 May 2014 13:26:20 +0000 (22:26 +0900)]
Remove unneeded comment.

5 years agoQuiet warnings
Campbell Barton [Sun, 11 May 2014 10:21:00 +0000 (20:21 +1000)]
Quiet warnings

5 years agoFreestyle: Added handling of a user-specified name for creating a new line set.
Tamito Kajiyama [Sun, 11 May 2014 08:50:16 +0000 (17:50 +0900)]
Freestyle: Added handling of a user-specified name for creating a new line set.

5 years agoFreestyle: Fix for the active line set index possibly invalidated after deleting...
Tamito Kajiyama [Sun, 11 May 2014 08:48:55 +0000 (17:48 +0900)]
Freestyle: Fix for the active line set index possibly invalidated after deleting a line set.

5 years agoFreestyle: Added .new() and .remove() methods to the Linesets collection type.
Tamito Kajiyama [Sat, 10 May 2014 14:35:17 +0000 (23:35 +0900)]
Freestyle: Added .new() and .remove() methods to the Linesets collection type.

5 years agoAdded BKE_freestyle_lineset_delete() by generalizing FRS_delete_active_lineset().
Tamito Kajiyama [Sat, 10 May 2014 14:32:22 +0000 (23:32 +0900)]
Added BKE_freestyle_lineset_delete() by generalizing FRS_delete_active_lineset().

5 years agoCode cleanup: comment typos
Campbell Barton [Sun, 11 May 2014 06:22:05 +0000 (16:22 +1000)]
Code cleanup: comment typos

5 years agoCMake: use project name when generating project files
Campbell Barton [Sun, 11 May 2014 06:21:38 +0000 (16:21 +1000)]
CMake: use project name when generating project files

5 years agoQuiet warnings with __CUDA_ARCH__ use
Campbell Barton [Sun, 11 May 2014 06:17:02 +0000 (16:17 +1000)]
Quiet warnings with __CUDA_ARCH__ use

5 years agoCycles / CUDA: Increase maximum image textures on GPU.
Thomas Dinges [Sun, 11 May 2014 01:38:39 +0000 (03:38 +0200)]
Cycles / CUDA: Increase maximum image textures on GPU.
Instead of 95, we can use 145 images now. This only affects Kepler and above (sm30, sm_35 and sm_50).

This can be increased further if needed, but let's first test if this does not come with a performance impact.

Originally developed during my GSoC 2013.

5 years agoFix T40107: painting on a psd image crashes blender + style cleanup in file
Dalai Felinto [Sat, 10 May 2014 13:58:35 +0000 (10:58 -0300)]
Fix T40107: painting on a psd image crashes blender + style cleanup in file

The issue was that we can't assume we support the colorspace from the file. The reported file had an invalid colorspace in fact, which was leading to the segfault in Blender.

Thanks for Sergey Sharybin for the help here.

5 years agoBake API: selected to active needs differentials or it renders black when bump/displa...
Dalai Felinto [Sat, 10 May 2014 13:01:51 +0000 (10:01 -0300)]
Bake API: selected to active needs differentials or it renders black when bump/displacement (fix T40101)

5 years agoReplace inefficient use of strstr with STRPREFIX macro
Campbell Barton [Fri, 9 May 2014 23:27:44 +0000 (09:27 +1000)]
Replace inefficient use of strstr with STRPREFIX macro

5 years agoUtility macros for linklist stack & asserts for bmesh
Campbell Barton [Fri, 9 May 2014 22:46:35 +0000 (08:46 +1000)]
Utility macros for linklist stack & asserts for bmesh

5 years agoFix T40119, CUDA Toolkit version mismatch
Thomas Dinges [Fri, 9 May 2014 23:26:04 +0000 (01:26 +0200)]
Fix T40119, CUDA Toolkit version mismatch

5 years agoFix T40113: Skinned meshes with non-animated shape keys crashes the BGE.
Mitchell Stokes [Fri, 9 May 2014 23:05:23 +0000 (16:05 -0700)]
Fix T40113: Skinned meshes with non-animated shape keys crashes the BGE.

5 years agoBGE: Fixing shape key animations on meshes with no armature.
Mitchell Stokes [Fri, 9 May 2014 23:03:54 +0000 (16:03 -0700)]
BGE: Fixing shape key animations on meshes with no armature.

Their transverts were not being updated after code changes for
multi-threaded skinning.

5 years agoBGE VideoTexture: Fix for loading PNG (and possibly other) files.
Mitchell Stokes [Fri, 9 May 2014 20:51:57 +0000 (13:51 -0700)]
BGE VideoTexture: Fix for loading PNG (and possibly other) files.

5 years agoFix access violation when painting with tiled textured brushes +
Antony Riakiotakis [Fri, 9 May 2014 20:29:57 +0000 (23:29 +0300)]
Fix access violation when painting with tiled textured brushes +
airbrush + small brush size.

Fast textured strokes meant that sometimes the update width (calculated
from stroke distance) would be greater than the new ibuf width. This
meant out of bounds access for the new ibuf.

It's totally strange that I couldn't reproduce this issue on older
versions since the logic here has not really changed much between
versions.

5 years agoRevert "Fix wrong job type used in cycles bake operator, could cause crashes."
Dalai Felinto [Fri, 9 May 2014 15:32:26 +0000 (12:32 -0300)]
Revert "Fix wrong job type used in cycles bake operator, could cause crashes."

This reverts commit 97823f604796fb008fef03653974473ece75d18e.

I was to push a fix based on Brecht's solution (this commit) when he did
the same.

This fix is correct, but it misses replacing WM_JOB_TYPE_OBJECT_BAKE
with WM_JOB_OBJECT_BAKE_TEXTURE in the rest of the file, which may lead
to problems when calling the operator in a quickly sucession -
WM_jobs_test also tests for the same type of JOB.

I created WM_JOB_TYPE_OBJECT_BAKE elsewhere, may as well use it. Unless we revert 20c90ea and f194da3.

I'm fine with either way, just trying to get master to work again ;)

5 years agoBake API: reports were used after being freed leading to random crashes (fix T40077)
Dalai Felinto [Fri, 9 May 2014 15:29:50 +0000 (12:29 -0300)]
Bake API: reports were used after being freed leading to random crashes (fix T40077)

5 years agoFix wrong job type used in cycles bake operator, could cause crashes.
Brecht Van Lommel [Fri, 9 May 2014 13:11:57 +0000 (15:11 +0200)]
Fix wrong job type used in cycles bake operator, could cause crashes.

Ref T40077.

5 years agoFix T39585: cycles motion vector pass problem with curves.
Brecht Van Lommel [Fri, 9 May 2014 15:02:08 +0000 (17:02 +0200)]
Fix T39585: cycles motion vector pass problem with curves.

5 years agoFix cycles motion pass for hair curves showing a bit of motion when there isn't any.
Brecht Van Lommel [Fri, 9 May 2014 13:32:13 +0000 (15:32 +0200)]
Fix cycles motion pass for hair curves showing a bit of motion when there isn't any.

5 years agoFix T40108: Copying materials leaves a shared Action datablock in nested
Lukas Tönne [Fri, 9 May 2014 12:59:14 +0000 (14:59 +0200)]
Fix T40108: Copying materials leaves a shared Action datablock in nested
bNodeTree blocks.

This was broken by rB6e99fb0 (own commit). I expected the `do_action`
argument to be of no importance in this case due to node trees using
material animation, but this is not the case.

Anyway, this patch adds back a do_action to the BKE_libblock_copy_nolib
function as well to restore the previous behavior.

5 years agoFix for random crashes when grabbing (rmb-drag) NLA strips
Joshua Leung [Fri, 9 May 2014 12:18:47 +0000 (00:18 +1200)]
Fix for random crashes when grabbing (rmb-drag) NLA strips

Although these crashes were quite sporadic, they seemed to happen most when
rmb-dragging strips randomly in quick succession. The most likely cause seems
to be a null check I accidentally took out during one of my commits yesterday.

5 years agoFreestyle: Fix for dashed lines when applied to invisible stroke segments.
Tamito Kajiyama [Fri, 9 May 2014 11:47:05 +0000 (20:47 +0900)]
Freestyle: Fix for dashed lines when applied to invisible stroke segments.

Dashed lines were resetting stroke segment visibility by mistake (making invisible segments
visible, for example when applied to the results of square blueprint geometry modifier).

5 years agoFreestyle: Fix for a wrong interpolation of stroke segment visibility.
Tamito Kajiyama [Fri, 9 May 2014 11:43:40 +0000 (20:43 +0900)]
Freestyle: Fix for a wrong interpolation of stroke segment visibility.

5 years agoMetaball transform, support active-only option
Campbell Barton [Fri, 9 May 2014 10:23:04 +0000 (20:23 +1000)]
Metaball transform, support active-only option

5 years agoCode cleanup: style
Campbell Barton [Fri, 9 May 2014 08:29:21 +0000 (18:29 +1000)]
Code cleanup: style

5 years agoFix T36973: Active snapping fails for edges/faces
Campbell Barton [Fri, 9 May 2014 06:52:09 +0000 (16:52 +1000)]
Fix T36973: Active snapping fails for edges/faces

also add snap-active support for armatures, pose & metas

5 years agoFix T40094 Faulty resizing behavior of frame node.
Lukas Tönne [Fri, 9 May 2014 06:51:37 +0000 (08:51 +0200)]
Fix T40094 Faulty resizing behavior of frame node.

Frame nodes still have the "hidden" flag like all other nodes, but this
has to be ignored during resizing. width/height range for the frame
nodes must be unlimited for this to work correctly.

5 years agoTweaking tooltip for NLA tweakmode enter to be a bit more descriptive
Joshua Leung [Fri, 9 May 2014 04:18:28 +0000 (16:18 +1200)]
Tweaking tooltip for NLA tweakmode enter to be a bit more descriptive

5 years agoNLA Editor Bugfix: Select NLA tracks too when selecting strips
Joshua Leung [Fri, 9 May 2014 04:17:04 +0000 (16:17 +1200)]
NLA Editor Bugfix: Select NLA tracks too when selecting strips

5 years agoNLA Editor: View selected also recenters the view now (as in the DopeSheet Editor)
Joshua Leung [Fri, 9 May 2014 04:05:34 +0000 (16:05 +1200)]
NLA Editor: View selected also recenters the view now (as in the DopeSheet Editor)

5 years agoCode cleanup: Define a dedicated "channel_role" field for animchannel types
Joshua Leung [Fri, 9 May 2014 03:46:21 +0000 (15:46 +1200)]
Code cleanup: Define a dedicated "channel_role" field for animchannel types

This makes it easier for finding the active or first selected channel
(where actual data channels need to be favoured over expanders - which come
first), as previously, long switch statements were needed everytime.

5 years agoDopeSheet: View Selected recenters the view vertically to display the active channel
Joshua Leung [Fri, 9 May 2014 03:07:52 +0000 (15:07 +1200)]
DopeSheet: View Selected recenters the view vertically to display the active channel

5 years agoFreestyle: Stroke rendering optimization.
Tamito Kajiyama [Fri, 9 May 2014 02:58:25 +0000 (11:58 +0900)]
Freestyle: Stroke rendering optimization.

Previously mesh objects were created for individual visible stroke segments (recalling that
a stroke may consist of alternate visible and invisible segments).  This could result in an
excessive memory consumption in stroke rendering when strokes are composed of many
short visible segments (for instance by means of dashed lines and/or blueprint geometry
modifiers).

Now mesh objects represent individual strokes instead of stroke segments, which tends to
reduce the number of generated mesh objects by an order of magnitude.

5 years agoDe-duplicated #includes.
Tamito Kajiyama [Fri, 9 May 2014 02:40:51 +0000 (11:40 +0900)]
De-duplicated #includes.

5 years agoIndentation fix.
Tamito Kajiyama [Fri, 9 May 2014 02:40:10 +0000 (11:40 +0900)]
Indentation fix.

5 years agoFix for an occasional crash in Freestyle stroke rendering.
Tamito Kajiyama [Fri, 9 May 2014 02:38:36 +0000 (11:38 +0900)]
Fix for an occasional crash in Freestyle stroke rendering.

Materials were freed before releasing meshes that may have references to the materials.

5 years agoBake API: small change, forcing Render to not have reports
Dalai Felinto [Fri, 9 May 2014 01:52:56 +0000 (22:52 -0300)]
Bake API: small change, forcing Render to not have reports

Again, no functional change, just trying to narrow down the possible
reasons for the random crashes in OSX.

5 years agoBake API: renaming WM_JOB_RENDER_BAKE to WM_JOB_OBJECT_BAKE and use it consistently
Dalai Felinto [Fri, 9 May 2014 00:46:51 +0000 (21:46 -0300)]
Bake API: renaming WM_JOB_RENDER_BAKE to WM_JOB_OBJECT_BAKE and use it consistently

Note: that doesnt change much. It definitively doesnt change the random crash OSX is experiencing sometimes.

5 years agoFix double promotion to scene linear in 2s painting.
Antony Riakiotakis [Thu, 8 May 2014 21:12:18 +0000 (00:12 +0300)]
Fix double promotion to scene linear in 2s painting.

5 years agoammend to [31cb7e39] Bake API: calculating differentials
Dalai Felinto [Thu, 8 May 2014 18:05:12 +0000 (15:05 -0300)]
ammend to [31cb7e39] Bake API: calculating differentials

5 years agoCycles-Bake: displacement support (fix T40068)
Dalai Felinto [Wed, 7 May 2014 20:26:24 +0000 (17:26 -0300)]
Cycles-Bake: displacement support (fix T40068)

Code with contribution from Brecht Van Lommel.

Reviewers: brecht

Differential Revision: https://developer.blender.org/D510

5 years agoBake API: calculating differentials
Dalai Felinto [Wed, 7 May 2014 22:23:38 +0000 (19:23 -0300)]
Bake API: calculating differentials

Code with contribution from Brecht Van Lommel (he wrote the
bake_differentials actually ;)

Reviewers: brecht

Differential Revision: https://developer.blender.org/D510

5 years agoClarification of UI messages:
Antony Riakiotakis [Thu, 8 May 2014 16:25:46 +0000 (19:25 +0300)]
Clarification of UI messages:

Show that modifier may not be supported in dyntopo rather than sculpt
mode in general. This is useful information since users may confuse the
two. Multires for instance is surely supported in sculpt mode, but not
in dyntopo.

5 years agoFix T39950, part 2.
Antony Riakiotakis [Thu, 8 May 2014 16:15:36 +0000 (19:15 +0300)]
Fix T39950, part 2.

Warn when a modifier does not support optimal drawing and mask/hidden
parts display.

User report was that hidden parts became visible after adding a new
modifier subdivision. Subdivision was added with the Ctrl+number keys.
First part of the fix was to make sure we add a multires instead of the
subsurf modifier in sculpt mode with the PageUp/Down Ctrl+number keys.

We can't really stop users from having added a subsurf modifier already.
We could be "smart" and convert subsurf to mulrires upon entering sculpt
mode maybe but that can easily backfire - or users may actually want
that. For now, just warn that the modifier won't support Hiding/Masking
and optimal drawing.

5 years agoFix T40074: Autosmooth option causes assert failure when selected.
Bastien Montagne [Thu, 8 May 2014 15:48:00 +0000 (17:48 +0200)]
Fix T40074: Autosmooth option causes assert failure when selected.

No need to call `dm_ensure_display_normals()` when using loop normals,
poly/vert ones have already been computed!

5 years agoFix regression from 2.70:
Antony Riakiotakis [Thu, 8 May 2014 14:58:55 +0000 (17:58 +0300)]
Fix regression from 2.70:

Multires did not support hiding in zero level. It's a case of PBVH not
being used in drawing due to code reporting active modifiers being used.

However multires level zero can be treated as effectively no modifier
and we can use mesh PBVH.

5 years agoFix T40079: cycles crash with objects that have hair motion blur, but no triangle...
Brecht Van Lommel [Thu, 8 May 2014 13:25:16 +0000 (15:25 +0200)]
Fix T40079: cycles crash with objects that have hair motion blur, but no triangle motion.

5 years agoFix typo
Campbell Barton [Thu, 8 May 2014 09:54:04 +0000 (19:54 +1000)]
Fix typo

5 years agoWorkaround T40046: Undo/redo crashes properties editor
Campbell Barton [Thu, 8 May 2014 09:44:53 +0000 (19:44 +1000)]
Workaround T40046: Undo/redo crashes properties editor

Clear the path for now on undo

5 years agoRemoved a Freestyle hack for DAG updates introduced in commit rBae58968e0a61.
Tamito Kajiyama [Thu, 8 May 2014 09:42:03 +0000 (18:42 +0900)]
Removed a Freestyle hack for DAG updates introduced in commit rBae58968e0a61.

Now that Freestyle employs a separate Main, this workaround is no longer necessary.

Reviewers: sergey

Reviewed By: sergey

Differential Revision: https://developer.blender.org/D513

5 years agoBugfix T40082: NLA Meta strips were no longer evaluating correctly
Joshua Leung [Thu, 8 May 2014 09:00:59 +0000 (21:00 +1200)]
Bugfix T40082: NLA Meta strips were no longer evaluating correctly

It seems that since the changes to how new NLA strips are handled, accumulating
these in a temporary buffer and then trying to combine the results didn't
work that great anymore.

5 years agoRemove 'Autosmooth' settings from Item 3DView panel.
Bastien Montagne [Thu, 8 May 2014 07:18:19 +0000 (09:18 +0200)]
Remove 'Autosmooth' settings from Item 3DView panel.

Not that happy with this, but this Item panel is a bit stupid, and we could add more
useful settings as well. So better get a design decision first, here.

5 years agoFix T40080: forcefield_toggle_exec() doesn't always enable force field.
Lukas Tönne [Thu, 8 May 2014 06:11:53 +0000 (08:11 +0200)]
Fix T40080: forcefield_toggle_exec() doesn't always enable force field.

Kudos to Brent Baccala for investigating and suggesting a fix.

5 years agoDrivers: When editing expressions from UI buttons, "invalid" flags now get cleared...
Joshua Leung [Thu, 8 May 2014 05:57:11 +0000 (17:57 +1200)]
Drivers: When editing expressions from UI buttons, "invalid" flags now get cleared from the drivers

With this change, there should hopefully be less need to hit "Update Dependencies"
on drivers so often.

5 years agoBugfix: "Lock time to frame range" didn't work in the Graph Editor
Joshua Leung [Thu, 8 May 2014 05:43:11 +0000 (17:43 +1200)]
Bugfix: "Lock time to frame range" didn't work in the Graph Editor

This uses a different operator than the other time editors (as it needs to support
the setting of the value-cursor too), so the changes here didn't get propagated through.

5 years agoCode Cleanup: remove unused m_contactProcessingThreshold
Campbell Barton [Thu, 8 May 2014 04:22:47 +0000 (14:22 +1000)]
Code Cleanup: remove unused m_contactProcessingThreshold

5 years agoRemove unused scons config files
Campbell Barton [Thu, 8 May 2014 04:16:26 +0000 (14:16 +1000)]
Remove unused scons config files

5 years agoAdd missing context member for doc gen
Campbell Barton [Wed, 7 May 2014 21:08:54 +0000 (07:08 +1000)]
Add missing context member for doc gen

5 years agoBGE: Dynamically-allocated action layers
Mitchell Stokes [Thu, 8 May 2014 01:14:36 +0000 (18:14 -0700)]
BGE: Dynamically-allocated action layers

This patch removes the limitations on the number of action layers in the BGE.

BL_ActionManager currently uses a fixed array to keep track of the action layers. This patch replaces the fixed array with a map which allows for dynamic allocation of action layers. Layers (map items) are automatically removed on BL_ActionManager's update function. The maximum number of layers is roughly the value of a short. Backwards functionality is maintained and there are no changes to the Python API.

Task Discussion:
https://developer.blender.org/T39572

Author: Kevin Ednalino

Reviewers: moguri

Differential Revision: https://developer.blender.org/D491

5 years agoFreestyle: hide the Line Style tab from the Texture properties context when WITH_FREE...
Tamito Kajiyama [Thu, 8 May 2014 01:01:49 +0000 (10:01 +0900)]
Freestyle: hide the Line Style tab from the Texture properties context when WITH_FREESTYLE build flag is off.

5 years agoFreestyle: hide line styles from a scene in the Outliner when WITH_FREESTYLE build...
Tamito Kajiyama [Thu, 8 May 2014 01:00:49 +0000 (10:00 +0900)]
Freestyle: hide line styles from a scene in the Outliner when WITH_FREESTYLE build flag is off.

The Datablocks display mode still shows line style ID datablocks to keep track of line styles
hidden from user interactions in the Properties window.

5 years agoFix for crash when userprefs fails to read.
Campbell Barton [Wed, 7 May 2014 20:35:38 +0000 (06:35 +1000)]
Fix for crash when userprefs fails to read.

5 years agoCode cleanup: spelling/indentation
Campbell Barton [Wed, 7 May 2014 18:53:05 +0000 (04:53 +1000)]
Code cleanup: spelling/indentation

5 years agoFix some nodes showing up as undefined after the fix in 79c345acc21b.
Brecht Van Lommel [Wed, 7 May 2014 18:24:01 +0000 (20:24 +0200)]
Fix some nodes showing up as undefined after the fix in 79c345acc21b.

A bunch of nodes had invalid storage definitions that don't refer to an actual
DNA struct. Ref T40033.

5 years agoFix cycles crash after recent use alpha commit.
Brecht Van Lommel [Wed, 7 May 2014 17:00:15 +0000 (19:00 +0200)]
Fix cycles crash after recent use alpha commit.

5 years agoCycles-Bake: Subsurface Scattering support (fix T40060)
Dalai Felinto [Wed, 7 May 2014 14:55:09 +0000 (11:55 -0300)]
Cycles-Bake: Subsurface Scattering support (fix T40060)

This fixes the SSS Direct/Indirect passes as well as the Combined pass.
Patch reviewed and with fixes and contributions from Brecht van Lommel.

Note: displacement/bump map (related to the report) will be handled separately

Reviewers: brecht

Differential Revision: https://developer.blender.org/D503

5 years agoNodes: add absolute value operation to all math nodes
Matt Heimlich [Wed, 7 May 2014 14:20:17 +0000 (16:20 +0200)]
Nodes: add absolute value operation to all math nodes

Reviewed By: dingto, brecht

Differential Revision: https://developer.blender.org/D507

5 years agoCycles: add support for "Use Alpha" option on image datablocks.
Carlo Andreacchio [Wed, 7 May 2014 14:36:44 +0000 (16:36 +0200)]
Cycles: add support for "Use Alpha" option on image datablocks.

Reviewed By: brecht

Differential Revision: https://developer.blender.org/D486

5 years agoFreestyle: minor code clean-up.
Tamito Kajiyama [Wed, 7 May 2014 14:15:05 +0000 (23:15 +0900)]
Freestyle: minor code clean-up.

5 years agoFreestyle: time/space optimization in stroke rendering without textures.
Tamito Kajiyama [Wed, 7 May 2014 14:14:36 +0000 (23:14 +0900)]
Freestyle: time/space optimization in stroke rendering without textures.

When strokes do not have textures assigned, UV coordinates are not computed now.
This will save a bit of time and space in stroke rendering.

5 years agoFreestyle: debug statistics on stroke rendering.
Tamito Kajiyama [Wed, 7 May 2014 14:08:43 +0000 (23:08 +0900)]
Freestyle: debug statistics on stroke rendering.

5 years agoCycles-Bake: Ambient Occlusion needs to be computed for COMBINED
Dalai Felinto [Wed, 7 May 2014 13:17:56 +0000 (10:17 -0300)]
Cycles-Bake: Ambient Occlusion needs to be computed for COMBINED

Now the COMBINED pass includes the Ambient Occlusion.

This was not reported anywhere, but while working in the Subsurface Scattering I realize we needed this fix for combined.

5 years agoFix T40033: Jumping between versions can lead to loss of node storage
Lukas Tönne [Wed, 7 May 2014 09:42:38 +0000 (11:42 +0200)]
Fix T40033: Jumping between versions can lead to loss of node storage
data.

Saving a file with a new blender node that uses bNode->storage data and
then loading that in an older version will make the node undefined, but
still retain the original type identifier (in case it is defined later).

If the file is then saved over and loaded again in the newer version,
where the node type is defined, it won't have a valid storage struct.
To handle such cases gracefully, check if storage data is expected but
doesn't exist when initializing node types. User then at least get a
chance of fixing the problem manually.

Suggested fix by @brecht.

5 years agoplayanim: check for escape key while loading images
Campbell Barton [Wed, 7 May 2014 08:18:21 +0000 (18:18 +1000)]
playanim: check for escape key while loading images

(todo from 2.4x)