8 years agoOSX: remove the applescript and env var for omp_set_treads from plist
Jens Verwiebe [Wed, 10 Apr 2013 15:22:39 +0000 (15:22 +0000)]
OSX: remove the applescript and env var for omp_set_treads from plist

8 years agopy api: path_reference_copy() use try/except when copying images, can fail for odd...
Campbell Barton [Wed, 10 Apr 2013 12:16:27 +0000 (12:16 +0000)]
py api: path_reference_copy() use try/except when copying images, can fail for odd reasons (currently fails if the dest dir is a symlink and not using expected permissions).

8 years agopy api: simple function to get an image from an objects for simple formats that only...
Campbell Barton [Wed, 10 Apr 2013 11:43:25 +0000 (11:43 +0000)]
py api: simple function to get an image from an objects for simple formats that only support one image per object.

8 years agoalternate solution for r55921 which was calling invoke() from exec(), which shouldnt...
Campbell Barton [Wed, 10 Apr 2013 09:49:44 +0000 (09:49 +0000)]
alternate solution for r55921 which was calling invoke() from exec(), which shouldnt be done.

8 years agoCode cleanup.
Thomas Dinges [Wed, 10 Apr 2013 02:58:22 +0000 (02:58 +0000)]
Code cleanup.

8 years agoFix for [#34904] and [#34913]: broken Freestyle edge/face marks with modifiers.
Tamito Kajiyama [Wed, 10 Apr 2013 01:12:37 +0000 (01:12 +0000)]
Fix for [#34904] and [#34913]: broken Freestyle edge/face marks with modifiers.

8 years agoFix for the subtype of range_min/max parameters in RNA Freestyle settings.
Tamito Kajiyama [Wed, 10 Apr 2013 00:20:05 +0000 (00:20 +0000)]
Fix for the subtype of range_min/max parameters in RNA Freestyle settings.
These parameters specify a distance in Blender units, so PROP_DISTANCE is more appropriate.
Suggested by Bastien Montagne through personal communications, thanks!

8 years agoFix for [#34934] Freestyle options are in wrong tab.
Tamito Kajiyama [Tue, 9 Apr 2013 23:54:11 +0000 (23:54 +0000)]
Fix for [#34934] Freestyle options are in wrong tab.

Added a label to guide users to line style settings in the Render Layers context
(in line with the similar labels found in the Cloth and Soft Body modifier panels),
so that Freestyle options per render layer can be more easily found.

8 years agoFix 34764: cycles issue rendering instanced mesh with NaN coordinates.
Brecht Van Lommel [Tue, 9 Apr 2013 20:48:53 +0000 (20:48 +0000)]
Fix 34764: cycles issue rendering instanced mesh with NaN coordinates.

8 years agoFix scons compile after GHOST_Sizer commit
Jens Verwiebe [Tue, 9 Apr 2013 18:58:01 +0000 (18:58 +0000)]
Fix scons compile after GHOST_Sizer commit

8 years agoFix #34938: Not freeing dynstr_cstring memory blocks when setting shape keys
Sergey Sharybin [Tue, 9 Apr 2013 17:31:34 +0000 (17:31 +0000)]
Fix #34938: Not freeing dynstr_cstring memory blocks when setting shape keys

In fact almost any rna pointer-to-string had a memory leak.

Patch by Jakub Zolcik (sftd) with minor modification.

8 years agoLive window resizing on Windows
Alexander Kuznetsov [Tue, 9 Apr 2013 17:21:05 +0000 (17:21 +0000)]
Live window resizing on Windows
Custom implementation for resizing (GHOST_SizerWin32)

Some things still don't work:
* esc cancel
* max windows size
* aero (sizing) snap on win7

hbrBackground = 0 to disable clear screen.

Thanks to dfelinto for help in finding of root cause.

8 years agoFixes for sequencer effects
Sergey Sharybin [Tue, 9 Apr 2013 16:20:24 +0000 (16:20 +0000)]
Fixes for sequencer effects

- Add and subtract effects will now affect on only RGB channels,
  and alpha of first input is used as an alpha for the result.

  Also solved creepyness with straight->premul->straight conversion
  in byte versions of add/subtract.

- Solved issue with multiply modifier, which lead to white*white
  not being white (was off by 1.0/255) due to wrong optimization
  of division by 255 with shr by 8.

  According to Ton this issue goes back to 2000!

This fixes #34811: Wrong result of add/subtract effects

8 years agoFix #34932: drivers on world nodes not updating on frame changes.
Brecht Van Lommel [Tue, 9 Apr 2013 15:30:15 +0000 (15:30 +0000)]
Fix #34932: drivers on world nodes not updating on frame changes.

8 years agoFix #34740: cycles rendering issue mixing glossy/glass BSDF's with zero or very
Brecht Van Lommel [Tue, 9 Apr 2013 15:24:20 +0000 (15:24 +0000)]
Fix #34740: cycles rendering issue mixing glossy/glass BSDF's with zero or very
low roughness and same index of refraction.

Problem was bad float precision due to low roughness, which caused the pdf for
the different closures to not match properly.

8 years agotemporary fix for saving custom template files similar to startup .blend file
Gaia Clary [Tue, 9 Apr 2013 15:18:31 +0000 (15:18 +0000)]
temporary fix for saving custom template files similar to startup .blend file

8 years agoVarious edits preparing addons' translations tools (not everything yet functionnal...
Bastien Montagne [Tue, 9 Apr 2013 08:56:35 +0000 (08:56 +0000)]
Various edits preparing addons' translations tools (not everything yet functionnal/tested, though).

Also workaround a nasty bug, where unregistered py classes remain listed in relevant __subclasses__() calls, which would lead to crash with python addons i18n tools (main translation was not affected, as messages extracting tools are executed in a brand new "factory startup" Blender ;) ).

8 years agoBGE: Non-mesh objects (lamps, empties, group instances, etc.) are now "No Collision...
Mitchell Stokes [Tue, 9 Apr 2013 05:02:10 +0000 (05:02 +0000)]
BGE: Non-mesh objects (lamps, empties, group instances, etc.) are now "No Collision" by default.

8 years agorigidbody operators poll functions were mixing up CTX_data_active_object/ED_object_ac...
Campbell Barton [Tue, 9 Apr 2013 01:43:39 +0000 (01:43 +0000)]
rigidbody operators poll functions were mixing up CTX_data_active_object/ED_object_active_context.
- replace ED_operator_rigidbody_add_poll with ED_operator_object_active_editable_mesh
- replace ED_operator_rigidbody_active_poll with ED_operator_scene_editable for operators that use the entire selection.
- remove rigid-body from objects that are converted from meshes to curves, while this isnt crashing it is confusing to see in the UI.

8 years agocode cleanup: abbreviations ob, con - aren't normally used in global identifiers.
Campbell Barton [Tue, 9 Apr 2013 01:36:44 +0000 (01:36 +0000)]
code cleanup: abbreviations ob, con - aren't normally used in global identifiers.

8 years agoPressing Ctrl+R when blender was built without bullet would crash.
Campbell Barton [Tue, 9 Apr 2013 00:57:47 +0000 (00:57 +0000)]
Pressing Ctrl+R when blender was built without bullet would crash.
- add checks so rigid-body operators only return FINISHED when they make some changes to the scene.
- remove (scene == NULL) checks, poll already catches these.

8 years agoAttempt to fix a potential name conflict between Freestyle and the compositor.
Tamito Kajiyama [Tue, 9 Apr 2013 00:46:49 +0000 (00:46 +0000)]
Attempt to fix a potential name conflict between Freestyle and the compositor.

A crash in the Freestyle renderer was reported by Ton on IRC with a stack trace
below.  Note that #2 is in Freestyle, whereas #1 is in the compositor.  The problem
was observed in a debug build on OS X 10.7 (gcc 4.2, openmp disabled, no llvm).

Program received signal EXC_BAD_ACCESS, Could not access memory.
Reason: 13 at address: 0x0000000000000000
[Switching to process 72386 thread 0xf303]
0x0000000100c129f3 in NodeBase::~NodeBase (this=0x10e501c80) at COM_NodeBase.cpp:43
43 delete (this->m_outputsockets.back());
Current language:  auto; currently c++
(gdb) where
#0  0x0000000100c129f3 in NodeBase::~NodeBase (this=0x10e501c80) at COM_NodeBase.cpp:43
#1  0x0000000100c29066 in Node::~Node (this=0x10e501c80) at COM_Node.h:49
#2  0x000000010089c273 in NodeShape::~NodeShape (this=0x10e501c80) at NodeShape.cpp:43
#3  0x000000010089910b in NodeGroup::destroy (this=0x10e501da0) at NodeGroup.cpp:61
#4  0x00000001008990cd in NodeGroup::destroy (this=0x10e5014b0) at NodeGroup.cpp:59
#5  0x00000001008990cd in NodeGroup::destroy (this=0x114e18da0) at NodeGroup.cpp:59
#6  0x00000001007e6602 in Controller::ClearRootNode (this=0x114e19640) at Controller.cpp:329
#7  0x00000001007ea52e in Controller::LoadMesh (this=0x114e19640, re=0x10aba4638, srl=0x1140f5258) at Controller.cpp:302
#8  0x00000001008030ad in prepare (re=0x10aba4638, srl=0x1140f5258) at FRS_freestyle.cpp:302
#9  0x000000010080457a in FRS_do_stroke_rendering (re=0x10aba4638, srl=0x1140f5258) at FRS_freestyle.cpp:600
#10 0x00000001006aeb9d in add_freestyle (re=0x10aba4638) at pipeline.c:1584
#11 0x00000001006aceb7 in do_render_3d (re=0x10aba4638) at pipeline.c:1094
#12 0x00000001006ae061 in do_render_fields_blur_3d (re=0x10aba4638) at pipeline.c:1367
#13 0x00000001006afa16 in do_render_composite_fields_blur_3d (re=0x10aba4638) at pipeline.c:1815
#14 0x00000001006b04e4 in do_render_all_options (re=0x10aba4638) at pipeline.c:2021

Apparently a name conflict between the two Blender modules is taking place.
The present commit hence intends to address it by putting all the Freestyle C++
classes in the namespace 'Freestyle'.  This revision will also prevent potential
name conflicts with other Blender modules in the future.

Special thanks to Lukas Toenne for the help with C++ namespace.

8 years agofix [#34902] Unicode decode error in Python console when completing a method name...
Campbell Barton [Tue, 9 Apr 2013 00:42:01 +0000 (00:42 +0000)]
fix [#34902] Unicode decode error in Python console when completing a method name of text object in edit mode

8 years agofix for error in recent changes to beautify, clear edge tags before use.
Campbell Barton [Tue, 9 Apr 2013 00:07:47 +0000 (00:07 +0000)]
fix for error in recent changes to beautify, clear edge tags before use.

8 years agoFix #34921: cycles rendered a specific scene with a small high poly object
Brecht Van Lommel [Mon, 8 Apr 2013 20:04:03 +0000 (20:04 +0000)]
Fix #34921: cycles rendered a specific scene with a small high poly object
contained in a large low poly object very slow, due to failure case of fast
multithread BVH binning. Tweaked parameter now to avoid this.

8 years agoCompatibility and robustness:
Antony Riakiotakis [Mon, 8 Apr 2013 19:56:38 +0000 (19:56 +0000)]
Compatibility and robustness:

* Make masking depend on texture mode only if there's an actual texture
* New stroke system uses diameter to calculate stroke spacing, while old
texture painting brushes and system used radius. So divide spacing of
brushes in old files to half. Since I expect trunk users to have already
adapted this, I do this for an old subversion of blender.

8 years agoFix #34875: 0 digits of precision was not supported for FloatProperty, now
Brecht Van Lommel [Mon, 8 Apr 2013 18:55:08 +0000 (18:55 +0000)]
Fix #34875: 0 digits of precision was not supported for FloatProperty, now
you can specify precision=0 for this, and use -1 for the default 2.

8 years agoBundle adjustment improvements
Sergey Sharybin [Mon, 8 Apr 2013 17:05:52 +0000 (17:05 +0000)]
Bundle adjustment improvements

- Get rid of rotation matrix parameterization,
  use angle-axis instead.

  Also Joined rotation and translation into a
  single parameter block.

  This made minimization go significantly faster,
  like 1.3x times in average.

- Fix first camera when bundling. This is to
  address orientation ambiguity.

  Reconstruction result could still vary in
  size, but that's another issue to be addressed

Additional change:

Split EuclideanBundleCommonIntrinsics into
smaller functions, so it's now a bit easier
to follow.

8 years agoUpdate ceres to current upstream version
Sergey Sharybin [Mon, 8 Apr 2013 17:05:48 +0000 (17:05 +0000)]
Update ceres to current upstream version

Brings fixes for BLAS.

8 years agoTexture tools robustness:
Antony Riakiotakis [Mon, 8 Apr 2013 15:42:13 +0000 (15:42 +0000)]
Texture tools robustness:
* Pressing x or y to scale overlay immediately presents visual feedback
instead of requiring mouse motion
* Hide the ovelay icon when stencil is active since you can't deactivate

8 years agoFix #34908: compressed DDS files did not display properly when their mipmap levels
Brecht Van Lommel [Mon, 8 Apr 2013 15:39:38 +0000 (15:39 +0000)]
Fix #34908: compressed DDS files did not display properly when their mipmap levels
did not go down to 1x1 image size, need to set GL_TEXTURE_MAX_LEVEL then.

8 years agoA few more UI messages fixes...
Bastien Montagne [Mon, 8 Apr 2013 13:19:50 +0000 (13:19 +0000)]
A few more UI messages fixes...

8 years agofix for bug where notifiers could hold pointers to freed data which listeners would...
Campbell Barton [Mon, 8 Apr 2013 13:03:04 +0000 (13:03 +0000)]
fix for bug where notifiers could hold pointers to freed data which listeners would operate on.

8 years agorewind part of r55893, smooth-view for pan was annoying with mousewheel.
Campbell Barton [Mon, 8 Apr 2013 11:45:20 +0000 (11:45 +0000)]
rewind part of r55893, smooth-view for pan was annoying with mousewheel.

8 years ago2D stabilization default filter to bilinear
Sergey Sharybin [Mon, 8 Apr 2013 11:26:56 +0000 (11:26 +0000)]
2D stabilization default filter to bilinear

8 years agoCamera stabilization fixes and improvements
Sergey Sharybin [Mon, 8 Apr 2013 10:56:50 +0000 (10:56 +0000)]
Camera stabilization fixes and improvements

- Nearest interpolation was always used when there's
  no rotation for stabilization. Was a failure of
  optimization heuristic.

- Made 2d stabilization frame acquiring threaded.
  This function is only used for display and sequencer
  which will only benefit of threads here.

- Fixed bug introduced in r48749 which lead to
  re-making stable frame on every redraw.

8 years agofix for various crashes from incorrect poll functions.
Campbell Barton [Mon, 8 Apr 2013 10:03:51 +0000 (10:03 +0000)]
fix for various crashes from incorrect poll functions.
- bevel had incorrect cancel when initialization failed which could crash (own mistake).
- main particle poll function didnt check if the area/region were NULL.
- some uv operators needed space image but didnt check for it. also use uv_ prefix for most operator functions.

8 years agocode cleanup: unused macros
Campbell Barton [Mon, 8 Apr 2013 09:52:43 +0000 (09:52 +0000)]
code cleanup: unused macros

8 years agoExposed the bNodeSocket->limit value in RNA, so it can be redefined by pynodes. All...
Lukas Toenne [Mon, 8 Apr 2013 08:59:30 +0000 (08:59 +0000)]
Exposed the bNodeSocket->limit value in RNA, so it can be redefined by pynodes. All sockets will have strict n-to-1 connectivity by default, which is fine for data sockets, but things like geometry nodes with a more data-flow based connectivity for certain socket types will need to change this.

8 years agofix for own mistake in recent adjustments to transform, local without individual...
Campbell Barton [Mon, 8 Apr 2013 08:43:16 +0000 (08:43 +0000)]
fix for own mistake in recent adjustments to transform, local without individual-origin wasn't working.

8 years agoFix [#34920] Hit Spacebar, search for freestyle, click Move Freestyle Module - crash
Bastien Montagne [Mon, 8 Apr 2013 07:07:10 +0000 (07:07 +0000)]
Fix [#34920] Hit Spacebar, search for freestyle, click Move Freestyle Module - crash

Simply add a poll func to (re)move freestyle module ops, to check whether we actually have an active module in context.

8 years agofix [#34900] Building blender as a python module is broken in trunk
Campbell Barton [Mon, 8 Apr 2013 05:01:35 +0000 (05:01 +0000)]
fix [#34900] Building blender as a python module is broken in trunk
patch provided by reporter - Martijn Berger (juicyfruit)

also quiet warnings for headless mode.

8 years agoselect-camera operator could select hidden cameras, also disable freestyle for `make...
Campbell Barton [Mon, 8 Apr 2013 04:54:57 +0000 (04:54 +0000)]
select-camera operator could select hidden cameras, also disable freestyle for `make lite` target.

8 years agofix [#34903] Lock Camera to View allows Numpad orbit, but not Numpad pan
Campbell Barton [Mon, 8 Apr 2013 04:48:34 +0000 (04:48 +0000)]
fix [#34903] Lock Camera to View allows Numpad orbit, but not Numpad pan

8 years agostyle cleanup
Campbell Barton [Mon, 8 Apr 2013 04:39:09 +0000 (04:39 +0000)]
style cleanup

8 years agoinset and bevel could both be activated when there was no selection.
Campbell Barton [Mon, 8 Apr 2013 02:14:58 +0000 (02:14 +0000)]
inset and bevel could both be activated when there was no selection.

8 years agofix [#34918] Interactive bevel doesn't accept +/- keys to change # of segments, only...
Campbell Barton [Mon, 8 Apr 2013 02:04:26 +0000 (02:04 +0000)]
fix [#34918] Interactive bevel doesn't accept +/- keys to change # of segments, only scrollwheel

Since page-up/down isnt common for this use case, replace with pad+/-

8 years agofix [#34905] Text editor: replacing matches by empty string not allowed
Campbell Barton [Mon, 8 Apr 2013 01:31:41 +0000 (01:31 +0000)]
fix [#34905] Text editor: replacing matches by empty string not allowed

8 years agofix for fix: re-activating buttons to fix [#33466], meant the icon didn't get refresh...
Campbell Barton [Mon, 8 Apr 2013 00:32:32 +0000 (00:32 +0000)]
fix for fix: re-activating buttons to fix [#33466], meant the icon didn't get refreshed immediately.

8 years agosurpport converting boundary edges to curves with BKE_mesh_to_curve(). alt+c convert.
Campbell Barton [Mon, 8 Apr 2013 00:25:44 +0000 (00:25 +0000)]
surpport converting boundary edges to curves with BKE_mesh_to_curve(). alt+c convert.

8 years agoFix for [#34901] "Add SSS Preset" gives error.
Thomas Dinges [Sun, 7 Apr 2013 15:18:12 +0000 (15:18 +0000)]
Fix for [#34901] "Add SSS Preset" gives error.
* Mark Preset operator as 'Internal' only, so it does not show up inside the search menu. We cannot be sure if we meet the context requirements otherwise (unless we add a poll to each subclass).

8 years agoFix for [#34898] Typo in error message of mathutils.Vector
Thomas Dinges [Sun, 7 Apr 2013 15:09:06 +0000 (15:09 +0000)]
Fix for [#34898] Typo in error message of mathutils.Vector
* Also fixed some more cases of "more then" -> "more than".

8 years agoRaise magic numbers for OSL and OpenCollada (should have done that much earlier)...
Bastien Montagne [Sun, 7 Apr 2013 15:02:34 +0000 (15:02 +0000)]
Raise magic numbers for OSL and OpenCollada (should have done that much earlier), this will force rebuild of those libs next time, hopefully will solve user's issues with outdated libs.

8 years agorigidbody: Fix/workaround for transforming rigid bodies with parents
Sergej Reich [Sun, 7 Apr 2013 14:09:29 +0000 (14:09 +0000)]
rigidbody: Fix/workaround for transforming rigid bodies with parents

Since we use the rigid body transform when transforming rigid bodies
things like parents and constraints add an offset because rigid body
transforms are in global space.

Now we just don't take rigid body transform into account on simulation
start frame so there are no problems when doing the initial setup.

The problem still exists when simulation is running of course.
To properly fix this we'd have to solve parenting and constratins while
taking rigid bodies into account before and after transform.
We'll have to see if it's really needed, would like to avoid it though.

8 years agotransform: Code cleanup
Sergej Reich [Sun, 7 Apr 2013 14:09:27 +0000 (14:09 +0000)]
transform: Code cleanup

Reduce scope of a variable.

8 years agoMesh Tool,
Campbell Barton [Sun, 7 Apr 2013 11:41:37 +0000 (11:41 +0000)]
Mesh Tool,
inset interpolation now works for 'inset_region', enabled by default.


8 years agouse lowercase name for freestyle module (as with all other blender modules).
Campbell Barton [Sun, 7 Apr 2013 11:22:54 +0000 (11:22 +0000)]
use lowercase name for freestyle module (as with all other blender modules).

8 years agoReverting changes from r55873 for rna_define.c, sorry about that...
Bastien Montagne [Sun, 7 Apr 2013 10:25:59 +0000 (10:25 +0000)]
Reverting changes from r55873 for rna_define.c, sorry about that...

svn merge -r55873:55872 ./source/blender/makesrna/intern/rna_define.c

8 years agoFreestyle UI:
Thomas Dinges [Sun, 7 Apr 2013 10:23:48 +0000 (10:23 +0000)]
Freestyle UI:
* Remove "Unit" prefix from line thickness property. (discussed with Tamito in IRC)

8 years agoFix for Unicode literal (causing a compile error in VS 2008).
Tamito Kajiyama [Sun, 7 Apr 2013 10:21:28 +0000 (10:21 +0000)]
Fix for Unicode literal (causing a compile error in VS 2008).

8 years agoUsual typo fixes... ;)
Bastien Montagne [Sun, 7 Apr 2013 10:21:22 +0000 (10:21 +0000)]
Usual typo fixes... ;)

8 years agoFreestyle UI / Code cleanup:
Thomas Dinges [Sun, 7 Apr 2013 10:10:00 +0000 (10:10 +0000)]
Freestyle UI / Code cleanup:
* Do not share poll with other files, create own poll classes.
* Avoid some splits() and use rows instead (less code).
* Remove some commented C code.
* layout = self.layout declarations come before variable declarations.

8 years agoRecovered factory settings for Freestyle.
Tamito Kajiyama [Sun, 7 Apr 2013 09:25:28 +0000 (09:25 +0000)]
Recovered factory settings for Freestyle.

8 years agoCycles UI:
Thomas Dinges [Sun, 7 Apr 2013 08:42:08 +0000 (08:42 +0000)]
Cycles UI:
* Revert changes from r55868, I merged that over manually with tweaks in r55858.

8 years agoReverted a change accidentally committed.
Tamito Kajiyama [Sun, 7 Apr 2013 07:06:02 +0000 (07:06 +0000)]
Reverted a change accidentally committed.

8 years agoMissing updates in the doc/ and intern/ folders during the merger in revision 55847.
Tamito Kajiyama [Sun, 7 Apr 2013 06:56:49 +0000 (06:56 +0000)]
Missing updates in the doc/ and intern/ folders during the merger in revision 55847.

8 years agoMissing build_files updates in the merger in revision 55847.
Tamito Kajiyama [Sun, 7 Apr 2013 06:44:33 +0000 (06:44 +0000)]
Missing build_files updates in the merger in revision 55847.

8 years agomesh inset tool - option to interpolate UV's vcols etc, on by default since this...
Campbell Barton [Sun, 7 Apr 2013 05:13:00 +0000 (05:13 +0000)]
mesh inset tool - option to interpolate UV's vcols etc, on by default since this is almost always what you'd want.
currently only working for inset-individual, inset-region coming next.

8 years agosimplify inset loop-customdata-copying, no real benefit in using adjacent faces as...
Campbell Barton [Sun, 7 Apr 2013 03:24:30 +0000 (03:24 +0000)]
simplify inset loop-customdata-copying, no real benefit in using adjacent faces as customdata source.

8 years agoimprove bmesh face interpolation - transforming verts into the faces plane rather...
Campbell Barton [Sun, 7 Apr 2013 02:10:15 +0000 (02:10 +0000)]
improve bmesh face interpolation - transforming verts into the faces plane rather then using dominant axis or calculating in 3d with interp_weights_poly_v3().

8 years agofreestyle lineset `tag` attribute was defined but not used, also some code cleanup.
Campbell Barton [Sun, 7 Apr 2013 01:38:03 +0000 (01:38 +0000)]
freestyle lineset `tag` attribute was defined but not used, also some code cleanup.

8 years agoremove error checks for inset, adding a faces in this instance wont fail (or if it...
Campbell Barton [Sun, 7 Apr 2013 01:18:52 +0000 (01:18 +0000)]
remove error checks for inset, adding a faces in this instance wont fail (or if it does - theres a bug elsewhere).

8 years agoBGE: KX_Camera.getScreenVect() was using glReadPixels to get a depth value, which...
Mitchell Stokes [Sun, 7 Apr 2013 00:13:04 +0000 (00:13 +0000)]
BGE: KX_Camera.getScreenVect() was using glReadPixels to get a depth value, which was causing a sync event between the gpu and cpu. glReadPixels was always returning 0, so I removed it and set depth to be a constant 0.

8 years agoCode cleanup:
Thomas Dinges [Sat, 6 Apr 2013 23:08:06 +0000 (23:08 +0000)]
Code cleanup:
* Remove commented C code from

8 years agoProperties Editor / Render Layers:
Thomas Dinges [Sat, 6 Apr 2013 23:05:32 +0000 (23:05 +0000)]
Properties Editor / Render Layers:
* Cycles Render layers UI was broken after freestyle merge (changes were not merged). Did manual edits now with some tweaks.
* Some layout fixes for Mask Layer.

8 years agofix: display weight brush strength widget only in weight paint mode
Gaia Clary [Sat, 6 Apr 2013 22:29:47 +0000 (22:29 +0000)]
fix: display weight brush strength widget only in weight paint mode

8 years agoFreestyle / Scons:
Thomas Dinges [Sat, 6 Apr 2013 22:21:42 +0000 (22:21 +0000)]
Freestyle / Scons:
* Changes in tools\ were not merged, causing compile failure.

8 years agoWhoops, revert r55854 and use r48292 as is
Dan Eicher [Sat, 6 Apr 2013 21:48:39 +0000 (21:48 +0000)]
Whoops, revert r55854 and use r48292 as is

Turns out outliner_search_back() doesn't always return a valid scene...

8 years agoClicking on an outliner object in an unselected scene switches to the scene but doesn...
Dan Eicher [Sat, 6 Apr 2013 21:37:35 +0000 (21:37 +0000)]
Clicking on an outliner object in an unselected scene switches to the scene but doesn't set it as the active object

Based on commit soc-2012-bratwurst:r48292 by Jorge Rodriquez

8 years agoFix for a heap-use-after-free issue, reported by Lockal in the IRC.
Tamito Kajiyama [Sat, 6 Apr 2013 19:42:58 +0000 (19:42 +0000)]
Fix for a heap-use-after-free issue, reported by Lockal in the IRC.

8 years agoFix freestyle compile with scons
Jens Verwiebe [Sat, 6 Apr 2013 18:06:06 +0000 (18:06 +0000)]
Fix freestyle compile with scons

8 years agoPart I of the Freestyle branch merger: new 'freestyle' folders.
Tamito Kajiyama [Sat, 6 Apr 2013 15:45:02 +0000 (15:45 +0000)]
Part I of the Freestyle branch merger: new 'freestyle' folders.

This commit is the first part of a two-part merger of the soc-2008-mxcurioni
(Freestyle) branch.  New 'freestyle' folders were added to the source/blender/
and release/script/ directories through a couple of svn copy operations
(instead of svn merge, due to broken svn:mergeinfo properties of the branch).

8 years agoRevert change made to bilinear sampler in libmv
Sergey Sharybin [Sat, 6 Apr 2013 14:47:45 +0000 (14:47 +0000)]
Revert change made to bilinear sampler in libmv

This made preview working but that broke internals
of tracking.

Namely, BlurredImageAndDerivativesChannels is giving
much more blurred image because it was assuming pixel
center is an integer position.

Guess other parts of libmv used to suffer because of
this issue.

Now pixel centering happens in blender side, and
libmv assumes integer position is a pixel center.

8 years agoPre-merger changes. soc-2008-mxcurioni
Tamito Kajiyama [Sat, 6 Apr 2013 14:45:50 +0000 (14:45 +0000)]
Pre-merger changes.

Deprecated Freestyle-specific elements were removed from the code base,
in order to address all comments from branch code reviews.

Backward compatibility won't be maintained in the following components:

- Freestyle edge/face marks in old .blend files are ignored.

Old .blend files can be converted by loading and saving the files using
a Freestyle branch build between revision 55581 and 55842.

- External style modules are no longer supported.

Instead text datablocks must be used to keep style module files within
.blend files.  A branch build between revision 55741 and 55842 is useful
for identifying the style module file names that need reconfiguring.

8 years agosvn merge ^/trunk/blender -r55815:55840
Sergey Sharybin [Sat, 6 Apr 2013 13:24:34 +0000 (13:24 +0000)]
svn merge ^/trunk/blender -r55815:55840

8 years agoNode UI:
Thomas Dinges [Sat, 6 Apr 2013 12:07:42 +0000 (12:07 +0000)]
Node UI:
* After PyNodes merge, many node sockets had sliders, instead of the arrow buttons (as the PROP_FACTOR subtype now actually was used). Change those back now, after artists feedback.

8 years agofix: #34871 Cycles/CUDA/sm_35: Build problems probably due to issues with float3...
Gaia Clary [Sat, 6 Apr 2013 11:52:40 +0000 (11:52 +0000)]
fix: #34871 Cycles/CUDA/sm_35: Build problems probably due to issues with float3 operators (on windows?)

8 years agoFix: 34874 Weight Paint UI inconsistent: removed conflicting shortcut definition...
Gaia Clary [Sat, 6 Apr 2013 10:52:52 +0000 (10:52 +0000)]
Fix: 34874 Weight Paint UI inconsistent: removed conflicting shortcut definition, added weight assign tools to specials menu

8 years agoctrl+a select all in button field
Campbell Barton [Sat, 6 Apr 2013 08:22:39 +0000 (08:22 +0000)]
ctrl+a select all in button field

8 years agoMinor white space fix.
Tamito Kajiyama [Sat, 6 Apr 2013 07:53:57 +0000 (07:53 +0000)]
Minor white space fix.

8 years agoRemoved Freestyle-specific code from DerivedMesh.c.
Tamito Kajiyama [Sat, 6 Apr 2013 06:09:08 +0000 (06:09 +0000)]
Removed Freestyle-specific code from DerivedMesh.c.

The removed code was necessary due to a logical bug in the use of CD_ORIGINDEX
layer entries.  Previously the index values were used to refer to the edges/polys
of the derived mesh, assuming that the derived mesh edges/polys consisted of those
from the original mesh plus newly added edges/polys.  This assumption was not
correct, although it worked well for several modifiers such as Mirror and Solidify.
Now the index values are specifically used to reference the edge/polys of the
original mesh.

8 years agoadd relative offset option for poke tool.
Campbell Barton [Sat, 6 Apr 2013 03:03:37 +0000 (03:03 +0000)]
add relative offset option for poke tool.

8 years agopatch [#34890] BMesh Poke Face.
Campbell Barton [Sat, 6 Apr 2013 02:45:43 +0000 (02:45 +0000)]
patch [#34890] BMesh Poke Face.
by Francisco De La Cruz (xercesblue), with some of my own changes/improvements.

Converts faces to triangle-fans (useful to run on ngons).

To access select a group of faces and press "Alt+P" or alternatively select the operator from the Faces menu (Ctrl+F)

8 years agoFix #34880: cycles motion blur render issue with some compilers. Actually is a bigger
Brecht Van Lommel [Fri, 5 Apr 2013 23:03:10 +0000 (23:03 +0000)]
Fix #34880: cycles motion blur render issue with some compilers. Actually is a bigger
problem where accessing float4 members with [] stops working due to optimizer, will
check that later.

8 years agobmesh operator rename inset -> inset_region
Campbell Barton [Fri, 5 Apr 2013 22:56:01 +0000 (22:56 +0000)]
bmesh operator rename inset -> inset_region

8 years agopatch [#34886] BMesh Individual Face Inset
Campbell Barton [Fri, 5 Apr 2013 22:21:14 +0000 (22:21 +0000)]
patch [#34886] BMesh Individual Face Inset
from Francisco De La Cruz (xercesblue) with some simplifications to the patch.

8 years agofix [#34870] bmesh.ops.* parameter lists and descriptions don't show in PyConsole...
Campbell Barton [Fri, 5 Apr 2013 19:58:18 +0000 (19:58 +0000)]
fix [#34870] bmesh.ops.* parameter lists and descriptions don't show in PyConsole on auto-complete

more a feature request then a bug but nice to have __doc__ on bmesh operators.

Tamito Kajiyama [Fri, 5 Apr 2013 19:34:26 +0000 (19:34 +0000)]
and moved them to init_render_mesh() in convertblender.c where these CustomData
layers are specifically required.

8 years agoadd BM_face_calc_center_mean_weighted() gives much better result at cost of some...
Campbell Barton [Fri, 5 Apr 2013 19:26:33 +0000 (19:26 +0000)]
add BM_face_calc_center_mean_weighted() gives much better result at cost of some speed.

8 years agoFix another part of #34877: cycles progress status text not showing correct with
Brecht Van Lommel [Fri, 5 Apr 2013 17:57:26 +0000 (17:57 +0000)]
Fix another part of #34877: cycles progress status text not showing correct with
per render layer samples in addition to the progress bar.

Also fixed job progress bar not working at all on high DPI / retina, was so small
the actual progress was not visible.