9 years agoAdd a glClear() in GHOST/X11 between creating the GLX context and
Nicholas Bishop [Mon, 26 Dec 2011 19:12:13 +0000 (19:12 +0000)]
Add a glClear() in GHOST/X11 between creating the GLX context and
displaying the window.

This fixes a brief flash of random data on Blender startup on my
system (Ubuntu 11.10, ATI Mobility Radeon HD 5650, Gallium drivers.)

Code review link:

9 years ago[#29611] Crash when scale one vertex with snap.
Martin Poirier [Mon, 26 Dec 2011 19:03:32 +0000 (19:03 +0000)]
[#29611] Crash when scale one vertex with snap.
Reported by Andrey Penyaz
Scale snap defaults to 1 when snapping is impossible (distance to center of transformation is zero).

9 years agoAnother fix for #29494: Problem loading translations at Blender's startup
Sergey Sharybin [Mon, 26 Dec 2011 14:52:36 +0000 (14:52 +0000)]
Another fix for #29494: Problem loading translations at Blender's startup

Reset only LANG variable to it's default value when setting locale to
short/long name failed and set LANGUAGE to value calculated from LANG
or value in user preferences (depending on if Default language is set)
so correct language ill be used for messages even if locale files aren't

Also disabled i18n prints in non-debug run so console wouldn't be polluted
by messages which aren't really informative for user now and might confuse.

9 years agoAdded WITH_BF_LIBMV to command line options
Sergey Sharybin [Mon, 26 Dec 2011 14:52:21 +0000 (14:52 +0000)]
Added WITH_BF_LIBMV to command line options

9 years agoformatting edits only to use more consisted style
Campbell Barton [Mon, 26 Dec 2011 12:26:11 +0000 (12:26 +0000)]
formatting edits only to use more consisted style

9 years agoformatting edits & minor corrections
Campbell Barton [Mon, 26 Dec 2011 00:42:35 +0000 (00:42 +0000)]
formatting edits & minor corrections

9 years agopatch from debian from Kevin 'kiniou' Roy
Campbell Barton [Mon, 26 Dec 2011 00:13:03 +0000 (00:13 +0000)]
patch from debian from Kevin 'kiniou' Roy

added __GNU__ and __GLIBC__ to conditional defined in order to compile on KFreeBSD

9 years agofix for a bug in mathutils when a vector was accessing a matrix and the matrix size...
Campbell Barton [Mon, 26 Dec 2011 00:05:41 +0000 (00:05 +0000)]
fix for a bug in mathutils when a vector was accessing a matrix and the matrix size increased, future access too the vector would write past the allocated bounds. now raise an exception.

9 years agoinclude BLO_sys_types in customdata header rather than stdint directly.
Campbell Barton [Sun, 25 Dec 2011 21:27:23 +0000 (21:27 +0000)]
include BLO_sys_types in customdata header rather than stdint directly.

9 years agoCycles Test App:
Thomas Dinges [Sun, 25 Dec 2011 13:34:18 +0000 (13:34 +0000)]
Cycles Test App:
* Added some new integrator parameters to the xml reading.
* Added ability to specify window width/height, if not set it uses film/camera width/height.
* Added back the xml exporter script from cycles branch, with modifications to hock up into the UI. To use it, copy the script into 2.61/scripts/startup.

Note: This is intended for developers for now, but the standalone Cycles app has potential to be used as benchmark for example.

9 years agouse docstrings for mathutils getset's, also some formatting edits, no functional...
Campbell Barton [Sun, 25 Dec 2011 11:36:26 +0000 (11:36 +0000)]
use docstrings for mathutils getset's, also some formatting edits, no functional changes.

9 years agopicky formatting of mathutils
Campbell Barton [Sat, 24 Dec 2011 13:26:30 +0000 (13:26 +0000)]
picky formatting of mathutils

9 years agoRe-enable CYCLES and OpenEXR since they work for MInGW. IMPORTANT: Only use the lates...
Antony Riakiotakis [Sat, 24 Dec 2011 11:56:13 +0000 (11:56 +0000)]
Re-enable CYCLES and OpenEXR since they work for MInGW. IMPORTANT: Only use the latest MinGW to compile blender.

9 years agoOSX/gcc-4.6, fix for typedef uin64_t
Jens Verwiebe [Sat, 24 Dec 2011 08:03:43 +0000 (08:03 +0000)]
OSX/gcc-4.6, fix for typedef uin64_t

9 years agoupdate bpy_extras.view3d_utils for matrix changes
Campbell Barton [Sat, 24 Dec 2011 07:11:40 +0000 (07:11 +0000)]
update bpy_extras.view3d_utils for matrix changes

AFAIK all trunk scripts are now updated for changes to matrix row/col.

9 years agomathtils, convenience attributes added 'row' and 'col', this makes the row/col swap...
Campbell Barton [Sat, 24 Dec 2011 07:03:19 +0000 (07:03 +0000)]
mathtils, convenience attributes added 'row' and 'col', this makes the row/col swap a lot easier to deal with, since
 now you can still use column access

  mat[2] = 1, 2, 3

needed to be converted into...
  mat[0][2] = 1
  mat[1][2] = 2
  mat[2][2] = 3

but with column access you can do...
  mat.col[2] = 1, 2, 3

Having 'row' attribute is a bit redundant since direct indexing on a matrix uses row but included for completeness.

9 years agofix for error with matrix access and negative indices with recent row/col swap.
Campbell Barton [Sat, 24 Dec 2011 06:13:58 +0000 (06:13 +0000)]
fix for error with matrix access and negative indices with recent row/col swap.

9 years agomathutils get/set function rename + minor changes to matrix functions (no functional...
Campbell Barton [Sat, 24 Dec 2011 04:58:01 +0000 (04:58 +0000)]
mathutils get/set function rename + minor changes to matrix functions (no functional changes)

9 years agoreplace u_int64_t with cc99's uint64_t as suggested by Nicholas Bishop.
Campbell Barton [Sat, 24 Dec 2011 03:03:42 +0000 (03:03 +0000)]
replace u_int64_t with cc99's uint64_t as suggested by Nicholas Bishop.

9 years agominor edits to cycles c/python module
Campbell Barton [Sat, 24 Dec 2011 02:47:13 +0000 (02:47 +0000)]
minor edits to cycles c/python module

- rename 'bcycles' --> '_cycles', since this is the python convention when a py module uses a C module internally.
- use macros for returning None
- make with_osl an attribute rather then a function.
- changes methods METH_VARARGS --> METH_O when single args are used.

9 years agoformatting edits 120 line length
Campbell Barton [Sat, 24 Dec 2011 02:37:42 +0000 (02:37 +0000)]
formatting edits 120 line length

9 years agoFormatting edits <120 length lines
Campbell Barton [Sat, 24 Dec 2011 02:32:08 +0000 (02:32 +0000)]
Formatting edits <120 length lines

9 years agoBugfix for [#29684] Output video presets messed up
Thomas Dinges [Fri, 23 Dec 2011 22:07:34 +0000 (22:07 +0000)]
Bugfix for [#29684] Output video presets messed up
* This was caused ny the ImageType refactor.
* Problem persisted with Quicktime too, could not test that, but should fix presets there too.

9 years agochange customdata mask from an 'unsigned int' to an 'u_int64_t', since BMesh branch...
Campbell Barton [Fri, 23 Dec 2011 20:30:23 +0000 (20:30 +0000)]
change customdata mask from an 'unsigned int' to an 'u_int64_t', since BMesh branch has run out of bits

9 years agofix [#29683] OpenEXR Output Appears to be broken
Campbell Barton [Fri, 23 Dec 2011 20:26:37 +0000 (20:26 +0000)]
fix [#29683] OpenEXR Output Appears to be broken

own error with moving image settings.

9 years agoUI: small further tweak to last region expand/collapse fix, when moving the
Brecht Van Lommel [Fri, 23 Dec 2011 13:53:21 +0000 (13:53 +0000)]
UI: small further tweak to last region expand/collapse fix, when moving the
operator redo panel up now it no longer hides the region, just stops it at
max size.

9 years agoFix test key conflict operator error, due to missing scripts window.
Brecht Van Lommel [Fri, 23 Dec 2011 13:53:09 +0000 (13:53 +0000)]
Fix test key conflict operator error, due to missing scripts window.

9 years agoMoving back sr locales to sr_RS (else, with recent changes (42830), loading sr was...
Bastien Montagne [Fri, 23 Dec 2011 13:36:07 +0000 (13:36 +0000)]
Moving back sr locales to sr_RS (else, with recent changes (42830), loading sr was no more working). My mistake, using only sr wasn't useful here (unlike spanish, we only have one version of serbian, in cyrilic and latin forms...)!

9 years agoFix #29652: operator tab can not be maximised
Sergey Sharybin [Fri, 23 Dec 2011 12:56:48 +0000 (12:56 +0000)]
Fix #29652: operator tab can not be maximised

Clamp region's size on expand to max allowed size, so it wouldn't
be automatically hidden just after expand.

9 years agogive errors when using unsupported configurations with mingw`
Campbell Barton [Fri, 23 Dec 2011 07:37:51 +0000 (07:37 +0000)]
give errors when using unsupported configurations with mingw`

9 years agoCleaning up the GPU_extensions_init/exit() code a bit to keep the Blenderplayer from...
Mitchell Stokes [Fri, 23 Dec 2011 07:10:01 +0000 (07:10 +0000)]
Cleaning up the GPU_extensions_init/exit() code a bit to keep the Blenderplayer from crashing on exit and restart.

9 years agofix for own mistake [#29031] Importing BGL Can Crash the BGE and Blender
Campbell Barton [Fri, 23 Dec 2011 05:42:06 +0000 (05:42 +0000)]
fix for own mistake [#29031] Importing BGL Can Crash the BGE and Blender

was adding the Buffer type to the module without increffing

9 years agoadd DNA support for int64_t. nothing uses this currently.
Campbell Barton [Fri, 23 Dec 2011 04:40:07 +0000 (04:40 +0000)]
add DNA support for int64_t. nothing uses this currently.

9 years agorecent matrix row/col swap broke matrix assignment in the BGE, fix provided by Andrew...
Campbell Barton [Fri, 23 Dec 2011 00:51:54 +0000 (00:51 +0000)]
recent matrix row/col swap broke matrix assignment in the BGE, fix provided by Andrew Hale

9 years agoDNA genfile - de-duplicate some checks and replace magic type numbers with an enum
Campbell Barton [Thu, 22 Dec 2011 23:18:43 +0000 (23:18 +0000)]
DNA genfile - de-duplicate some checks and replace magic type numbers with an enum

9 years agoAnother Fix after Cucumber Merge:
Thomas Dinges [Thu, 22 Dec 2011 22:34:23 +0000 (22:34 +0000)]
Another Fix after Cucumber Merge:
* Cycles did not displayed the Scene panels anymore, due to addition of COMPAT_ENGINE to them.

9 years agoupdate the api changelog 2.60 --> 2.61
Campbell Barton [Thu, 22 Dec 2011 21:44:52 +0000 (21:44 +0000)]
update the api changelog 2.60 --> 2.61

9 years agoCode cleanup: fix some clang static checker warnings.
Brecht Van Lommel [Thu, 22 Dec 2011 20:29:44 +0000 (20:29 +0000)]
Code cleanup: fix some clang static checker warnings.

9 years agoFix #29494: Problem loading translations at Blender's startup
Sergey Sharybin [Thu, 22 Dec 2011 19:09:21 +0000 (19:09 +0000)]
Fix #29494: Problem loading translations at Blender's startup

Problem was caused by trying to set locale to short named "es" locale
which failed. It's not really obvious which full locale name should
be used here (there are plenty of dialects), so rather than keeping
locale stuff on state when both of locale and utf-8 locale names
failed, restore default settings (restore environment variables and
use default locale for gettext).

This will resolve cases when spanish language is native on the system,
but it will fail in cases when somebody will want to have spanish
interface in non-spanish system. This might be worked around by setting
LANG and LANGUAGE environment variables to es_<dialect>.UTF-8 and it
should work fine,

9 years agoTranslation context for RNA properties
Sergey Sharybin [Thu, 22 Dec 2011 18:25:59 +0000 (18:25 +0000)]
Translation context for RNA properties

This commit implements a way to define context of property which is used by
localization stuff and which is needed to resolve translation context when
some word wit the same english spelling is used in different meanings
(like Manual in meaning of tutorial, and Manual in meaning of something is
setting up by hand).

To define property's context there's a function RNA_def_property_translation_context.
If property doesn't have context, regular BLF_gettext function is used to get
translation of property name, otherwise BLF_pgettext is used for this.

Hence, for correct translation, messages in .po files should be marked
by "msgctxt" context, otherwise property with context declared wouldn't
be translated at all. Toolchain scripts from bf-translation project
would be updated soon.

If context for some values of enumerator property, property itself should
be moved to other context and all items from this enum would be moved to
this context automatically (it's impossible to move one few items to
another context).

P.S. Think context like "BRUSH" or "MODIFIER" are preferable than "NOUN" and "VERB"
     because in some cases the same english noun used in different areas better be
 translated differently to make translation more native.

9 years agoFix/workaround for russian ui crash on exit
Sergey Sharybin [Thu, 22 Dec 2011 16:00:34 +0000 (16:00 +0000)]
Fix/workaround for russian ui crash on exit

Crash was caused by data segment corruption near "string" in view3d_modeselect_pup().
Enlarged size of this static buffer, so it's now enough to store translated modeselect string.

It's not actually fixes because in some other language this modeline might be much longer
and it'll lead to corruptions again.

9 years agoSome small perf tweaks to weightvg proximity: do not use indices in case all vertices...
Bastien Montagne [Thu, 22 Dec 2011 14:04:25 +0000 (14:04 +0000)]
Some small perf tweaks to weightvg proximity: do not use indices in case all vertices are affected...

9 years agoupdate axis conversion for recent matrix changes
Campbell Barton [Thu, 22 Dec 2011 11:06:41 +0000 (11:06 +0000)]
update axis conversion for recent matrix changes

9 years agofix for matrix assignment with recent changes which broke for eg:
Campbell Barton [Thu, 22 Dec 2011 08:44:08 +0000 (08:44 +0000)]
fix for matrix assignment with recent changes which broke for eg:
  ob.matrix_world = matrix

9 years agoremove commented index drawing code (now its a debug option), and remove code in...
Campbell Barton [Thu, 22 Dec 2011 05:52:31 +0000 (05:52 +0000)]
remove commented index drawing code (now its a debug option), and remove code in editmesh stat drawing which was left over from when text drawing was immediate rather then cached.

9 years agopatch [#29673] Visualize Indices (developer aid)
Campbell Barton [Thu, 22 Dec 2011 05:39:23 +0000 (05:39 +0000)]
patch [#29673] Visualize Indices (developer aid)
by Howard Trickey (howardt)

9 years agopicky edits - use "" for non enum strings.
Campbell Barton [Thu, 22 Dec 2011 03:56:21 +0000 (03:56 +0000)]
picky edits - use "" for non enum strings.

9 years agopatch [#29534] Change Matrix Representation and Access in Python to Conform with...
Campbell Barton [Thu, 22 Dec 2011 01:05:03 +0000 (01:05 +0000)]
patch [#29534] Change Matrix Representation and Access in Python to Conform with Standard Notation
from Andrew Hale

Scripts which access matrix row/columns directly and scripts that create new matrices with elements defined will need updating.

For more info see...

* Guide for updating scripts

* Discussion thread

9 years agosplit >120 length lines (mostly if statements)
Campbell Barton [Thu, 22 Dec 2011 00:03:20 +0000 (00:03 +0000)]
split >120 length lines (mostly if statements)

9 years agopatch [#29676] ALPHA OVER: Fix associated alpha over situation to fix [#29675] patch...
Dalai Felinto [Wed, 21 Dec 2011 23:59:57 +0000 (23:59 +0000)]
patch [#29676] ALPHA OVER: Fix associated alpha over situation to fix [#29675] patch by Troy Sobotka
note: if alpha is negative the code will still produce non-optimal results.
This is a separate issue though, the patch fix the premul assumption that
alpha can be zero and rgb still be valid.

9 years agoMatrix.translation wrapper vector, continent accessing to matrix[3][0:3].
Campbell Barton [Wed, 21 Dec 2011 23:12:16 +0000 (23:12 +0000)]
Matrix.translation wrapper vector, continent accessing to matrix[3][0:3].

this is a part of patch 29534, being applied separately

from patch [#29534] Change Matrix Representation and Access in Python to Conform with Standard Notation
by Andrew Hale (trumanblending)

9 years agosplit some >120 lines, no functional changes
Campbell Barton [Wed, 21 Dec 2011 22:56:06 +0000 (22:56 +0000)]
split some >120 lines, no functional changes

9 years ago== Sculpt ==
Nicholas Bishop [Wed, 21 Dec 2011 22:23:39 +0000 (22:23 +0000)]
== Sculpt ==

Reformatted all lines longer than 120 characters in sculpt.c. Should
be no functional changes. Thanks to Campbell for pointing out the

I wouldn't normally do this, but just for reference, here is a
screenshot that hopefully makes clear why I think this is worth doing:

9 years agofix for use of uninitialized value for ipo conversion.
Campbell Barton [Wed, 21 Dec 2011 21:40:21 +0000 (21:40 +0000)]
fix for use of uninitialized value for ipo conversion.

9 years agocleanup and some fixes to mathutils by Andrew Hale
Campbell Barton [Wed, 21 Dec 2011 21:21:27 +0000 (21:21 +0000)]
cleanup and some fixes to mathutils by Andrew Hale
* 1. Resize 4x4, code was ridiculously complex (cleanup only)
* 2. matrix * matrix checking for compatibility wasn't working right (bug in last release)
* 3. fix for result size for matrix * vector if matrix is 4x4 and vector size 3 (bug in recent patch)
* 4. fix for result size vector * matrix if matrix is 4x4 and vector size 3 (bug in recent patch)

9 years agopatch [#29667] Fix for potential memory corruption in path_util.c
Campbell Barton [Wed, 21 Dec 2011 20:56:49 +0000 (20:56 +0000)]
patch [#29667] Fix for potential memory corruption in path_util.c
from Andrew Wiggin (ender79)

9 years agoCycles: support for multiple render layers. It currently renders each layer
Brecht Van Lommel [Wed, 21 Dec 2011 20:51:55 +0000 (20:51 +0000)]
Cycles: support for multiple render layers. It currently renders each layer
entirely before moving on to the next.

9 years agoCycles: code refactoring, to do render layer visibility test a bit different,
Brecht Van Lommel [Wed, 21 Dec 2011 20:51:43 +0000 (20:51 +0000)]
Cycles: code refactoring, to do render layer visibility test a bit different,
replacing the camera visibility flag with object layer flags.

9 years agoSVN maintenance.
Guillermo S. Romero [Wed, 21 Dec 2011 20:32:29 +0000 (20:32 +0000)]
SVN maintenance.

9 years agoA few small fixes to new UI messages...
Bastien Montagne [Wed, 21 Dec 2011 18:18:36 +0000 (18:18 +0000)]
A few small fixes to new UI messages...

9 years agoFix linux linking issue with md5 commit.
Brecht Van Lommel [Wed, 21 Dec 2011 14:35:48 +0000 (14:35 +0000)]
Fix linux linking issue with md5 commit.

9 years agoFix #29670: color picker draw issues with RGB values out of soft range.
Brecht Van Lommel [Wed, 21 Dec 2011 13:49:22 +0000 (13:49 +0000)]
Fix #29670: color picker draw issues with RGB values out of soft range.

9 years agoCode refactoring: move MD5 out of imbuf into blenlib.
Brecht Van Lommel [Wed, 21 Dec 2011 13:48:51 +0000 (13:48 +0000)]
Code refactoring: move MD5 out of imbuf into blenlib.

9 years agoCycles: some small code refactoring related to buffer parameters.
Brecht Van Lommel [Wed, 21 Dec 2011 13:48:35 +0000 (13:48 +0000)]
Cycles: some small code refactoring related to buffer parameters.

9 years agoDo not show "Modify" modifiers group for curve objects
Sergey Sharybin [Wed, 21 Dec 2011 13:31:28 +0000 (13:31 +0000)]
Do not show "Modify" modifiers group for curve objects

This commit prevents adding empty groups to Add Modifier menu making
this menu small and nice for objects which don't support all modifiers
from some group (like Curves don't support Modify modifiers).

9 years agoSmall i18n edits:
Bastien Montagne [Wed, 21 Dec 2011 11:56:42 +0000 (11:56 +0000)]
Small i18n edits:
* Added serbian_latin locale (sr@latin).
* Changed serbian UI to  "Serbian (Српски)" (as requested by Nikola Radovanovic, serbian translator).
* Reordered languages in menu in alphabetical order!

9 years agofix for mathutils mat*vec for non sqyare matrices by Andrew Hale
Campbell Barton [Wed, 21 Dec 2011 11:36:28 +0000 (11:36 +0000)]
fix for mathutils mat*vec for non sqyare matrices by Andrew Hale

9 years agoAdded Record run no gaps timecode for movie clips.
Sergey Sharybin [Wed, 21 Dec 2011 11:01:08 +0000 (11:01 +0000)]
Added Record run no gaps timecode for movie clips.
Also get rid of hardcoded constants in readfile and use constants from ImBuf headers.

9 years agoPatch [#29654] New menu option under Object > Game with "Copy All Physics Attributes...
Dalai Felinto [Wed, 21 Dec 2011 02:41:27 +0000 (02:41 +0000)]
Patch [#29654] New menu option under Object > Game with "Copy All Physics Attributes" by Daniel Macedo
"This is a patch that adds an option under the menu Object > Game to copy all the physics attributes from Game Engine."

9 years agotopo mirror and sync with minor edits made to bmesh, no functional changes
Campbell Barton [Tue, 20 Dec 2011 23:14:29 +0000 (23:14 +0000)]
topo mirror and sync with minor edits made to bmesh, no functional changes

9 years agoCycles/CUDA:
Thomas Dinges [Tue, 20 Dec 2011 18:59:10 +0000 (18:59 +0000)]
* Rename shader model to compute capability in error messages.

9 years agoCycles: some tweaks for apple opencl with ATI cards, to get it working up to
Brecht Van Lommel [Tue, 20 Dec 2011 17:36:56 +0000 (17:36 +0000)]
Cycles: some tweaks for apple opencl with ATI cards, to get it working up to
the level of ambient occlusion render, shaders still fail. Fixes found with
much help from Jens and Dalai.

9 years agoNew modifier type: eModifierTypeType_NonGeometrical, for modifiers affecting CustomDa...
Bastien Montagne [Tue, 20 Dec 2011 14:15:59 +0000 (14:15 +0000)]
New modifier type: eModifierTypeType_NonGeometrical, for modifiers affecting CustomData layers only (e.g. UVProject and  WeightVG ones).

Also, allow applying to obdata those modifiers, even with shapekeys, but do not allow applying them *as* shapekey (as shapekeys do not have CD layers).

Fix [#29636] Vertex Weight Mix modifier "apply" button don't work.

Note: applying whit shape keys currently always uses base shape, not current one (for apply to obdata as well as apply to shapekey), but this is another topic...

9 years agoCycles: avoid using float3 in kernel constant memory, just so we're sure alignment
Brecht Van Lommel [Tue, 20 Dec 2011 12:25:45 +0000 (12:25 +0000)]
Cycles: avoid using float3 in kernel constant memory, just so we're sure alignment
is working compatible between cpu and gpu.

9 years agoCycles: border rendering support, includes some refactoring in how pixels are
Brecht Van Lommel [Tue, 20 Dec 2011 12:25:37 +0000 (12:25 +0000)]
Cycles: border rendering support, includes some refactoring in how pixels are
accessed on devices.

9 years agoFix #25775: crash using border render from external render engines, merging
Brecht Van Lommel [Tue, 20 Dec 2011 12:25:18 +0000 (12:25 +0000)]
Fix #25775: crash using border render from external render engines, merging
back the tile used wrong offsets.

9 years agorecent commit missed swapping args for MATRIX_ITEM in mathutils_Vector.c, breaking...
Campbell Barton [Tue, 20 Dec 2011 11:37:55 +0000 (11:37 +0000)]
recent commit missed swapping args for MATRIX_ITEM in mathutils_Vector.c, breaking matrix*vector.

9 years agomove topology mirror out into its own functions - needed for bmesh branch so we can...
Campbell Barton [Tue, 20 Dec 2011 10:05:58 +0000 (10:05 +0000)]
move topology mirror out into its own functions - needed for bmesh branch so we can use then for bmeshes own internal mirror calculations.

9 years agoFix a small typo-bug in UVProject modifier (using v3 instead of v4 to detect tri...
Bastien Montagne [Tue, 20 Dec 2011 09:57:01 +0000 (09:57 +0000)]
Fix a small typo-bug in UVProject modifier (using v3 instead of v4 to detect tri/quad faces). Seems it was harmless, though...

9 years agoGet rid of hardcoded structure definition in DM drawing callbacks
Sergey Sharybin [Tue, 20 Dec 2011 08:47:36 +0000 (08:47 +0000)]
Get rid of hardcoded structure definition in DM drawing callbacks

Structures passing to DM callbacks as userData used to be defined in both callee
and callbacks itself which made it difficult and unsafe to add new properties
to user data.

Added typedefs for this structures and use them in callbacks and callee functions.

9 years agoCleaning up some issues that found their way into the python ui files with the first...
Daniel Stokes [Tue, 20 Dec 2011 07:39:30 +0000 (07:39 +0000)]
Cleaning up some issues that found their way into the python ui files with the first Cucumber merge.

9 years agoFirst fix after Cucumber merge starts.
Thomas Dinges [Tue, 20 Dec 2011 06:26:03 +0000 (06:26 +0000)]
First fix after Cucumber merge starts.
* Restore COMPAT_ENGINES for particle panel, caused error on startup. (Cycles needs it)

9 years agopatch [#29662] Modifications to Mathutils Vectors for Consistency with Commit 42752
Campbell Barton [Tue, 20 Dec 2011 05:48:35 +0000 (05:48 +0000)]
patch [#29662] Modifications to Mathutils Vectors for Consistency with Commit 42752
from Andrew Hale

9 years agorename internal matrix struct member vars to avoid confusion
Campbell Barton [Tue, 20 Dec 2011 04:11:23 +0000 (04:11 +0000)]
rename internal matrix struct member vars to avoid confusion

Matrix.contigPtr --> matrix
Matrix.row_size --> num_col
Matrix.col_size --> num_row

9 years ago__str__ functions for other mathutils types
Campbell Barton [Tue, 20 Dec 2011 03:37:55 +0000 (03:37 +0000)]
__str__ functions for other mathutils types

9 years agoCucumber, first batch of merge - UI changes and custom exit key
Dalai Felinto [Tue, 20 Dec 2011 03:11:56 +0000 (03:11 +0000)]
Cucumber, first batch of merge - UI changes and custom exit key
This was a test drive to see how painful the merge will be.
Next batches are:
- use desktop option for fullscreen
- multisampling option
- bullet collision mask
- python
- storage (vbo, dl, ...)
- lighting

[lighting still needs review]
[python could use review, although it should be straightforward]
[storage should be tested more I think]

Merged /branches/soc-2011-cucumber:r

* Made some options available in Blender Game that were only available in Blender Render (camera resolution, animation fps)
* Created a panel for the embedded player
* Renamed the FPS option for the standalone player to Refresh Rate
* Moved framing options to display
* Made a button to launch the blender player from within blender (only tested on windows for now)

* Added the option to change the exit key for the BGE. The UI currently just sets a number, and this feature most likely does not work for blenderplayer yet. More work on this to come.
* Removed the physics settings from the scene panel for the BGE.
* Added an Add menu in the logic brick header.

Making the bake options available in Blender Game

Making the exit key UI element accept key presses instead of numbers. It still does not work for the Blenderplayer, and it does not limit the input to key presses (other events don't work for exiting)

Some more work on getting the exit key to work in the Blenderplayer.
Input is now restricted to keyboard events only for the exit key UI.
Some clean up from the last commit.
The exit key setting affects the Blenderplayer now.
Cleaning up some duplicate code. Now the reverseTranslateTable for converting blender key codes to ketsji key codes is only defined in BL_BlenderDataConverter.
Centralizing the exit key methods to the keyboard devices. This should make it easier to get exit key control to the python API.

[37517: committed previously]

Moved control of the exit key away from the keyboard devices, and moved it to ketsjiengine.
Added setExitKey and getExitKey to the python API

A couple of the doversions were in the wrong spot. This should fix some issues with the exit key not being set.
[not committed entirely, see below]]

40552: (* fixed an error in *)

launch blenderplayer from ui not working in OSX fix - by Daniel Stokes and me

code left behind (to be included in next commit):
/* Initialize default values for collision masks */
Object *ob;
for(ob=main->object.first; ob; ob=ob->
ob->col_group = ob->col_mask = 1;

9 years agopatch [#29651] Add a __str__ Method to Matutils Matrices so print(matrix) Shows Colum...
Campbell Barton [Tue, 20 Dec 2011 02:54:25 +0000 (02:54 +0000)]
patch [#29651] Add a __str__ Method to Matutils Matrices so print(matrix) Shows Columns as Columns
from Andrew Hale

converted from python string formatting to using BLI_dynstr

9 years agominor edits to previous commit & set VKey to toggle vertex select in weight paint...
Campbell Barton [Tue, 20 Dec 2011 02:04:35 +0000 (02:04 +0000)]
minor edits to previous commit & set VKey to toggle vertex select in weight paint mode.

9 years agounit test for mathutils python module from Andrew Hale, runs in CTest too
Campbell Barton [Tue, 20 Dec 2011 01:49:24 +0000 (01:49 +0000)]
unit test for mathutils python module from Andrew Hale, runs in CTest too

9 years agoPatch #27085, Restore old 2.49 TAB behaviour for window splitting, by Andre Oliveira
Michael Fox [Tue, 20 Dec 2011 00:46:55 +0000 (00:46 +0000)]
Patch #27085, Restore old 2.49 TAB behaviour for window splitting, by Andre Oliveira

Now this patch only applies to RMB window splitting not the click and drag as that would cause confusion and big mess

9 years agopatch [#28094] New equirectangular world texture mapping option
Campbell Barton [Mon, 19 Dec 2011 23:52:17 +0000 (23:52 +0000)]
patch [#28094] New equirectangular world texture mapping option

9 years agocalculate weight paint colors once per vertex rather then on every face corner (was...
Campbell Barton [Mon, 19 Dec 2011 22:55:04 +0000 (22:55 +0000)]
calculate weight paint colors once per vertex rather then on every face corner (was doing the same deform vert lookup and color calculation multiple times per vertex),

Quick shows over 2x speedup in my tests, will give bigger speedup with more vertex groups.

If you happen to have vertices with no faces using them - vertex colors will be calculated unnecessarily, but this isnt a common use case for weight paint mode.

9 years ago* Changes for static win32 png libs.
Thomas Dinges [Mon, 19 Dec 2011 19:46:07 +0000 (19:46 +0000)]
* Changes for static win32 png libs.

9 years ago* Fix for moving mingw png libs.
Thomas Dinges [Mon, 19 Dec 2011 14:46:17 +0000 (14:46 +0000)]
* Fix for moving mingw png libs.

9 years agoFix #29653: fix wrong cycles depth of field distance when rendering with a
Brecht Van Lommel [Mon, 19 Dec 2011 14:23:24 +0000 (14:23 +0000)]
Fix #29653: fix wrong cycles depth of field distance when rendering with a
scaled camera.

9 years agoFix #29655: keyboard shortcuts missing from text editor text menu, and removed
Brecht Van Lommel [Mon, 19 Dec 2011 14:23:19 +0000 (14:23 +0000)]
Fix #29655: keyboard shortcuts missing from text editor text menu, and removed
confirmation popup for creating new text datablock.

9 years agoOS X: add BLENDER_SOFTWAREGL environment variable to force using software OpenGL
Brecht Van Lommel [Mon, 19 Dec 2011 14:23:08 +0000 (14:23 +0000)]
OS X: add BLENDER_SOFTWAREGL environment variable to force using software OpenGL
renderer, for debugging OpenGL issues.

9 years agoMuch cleaner and satisfying code in weightvg modifiers' "init": copy only the CD_DEFO...
Bastien Montagne [Mon, 19 Dec 2011 14:09:36 +0000 (14:09 +0000)]
Much cleaner and satisfying code in weightvg modifiers' "init": copy only the CD_DEFORMVERT data layer (if it's the org one), and not the whole DerivedMesh!

Quite oddly, for Proximity mod, this increases the performances of the apply func (about 20-25%, e.g. from 0.04 to 0.03 sec), but decreases the global framerate (e.g. in TEST_5 scene of testing file, I lose about 7%, from 4.6 to 4.3fps (open ATI driver)...).

9 years agoAutomatically hide unused (=unlinked) node sockets in collapsed ("hidden") nodes...
Lukas Toenne [Mon, 19 Dec 2011 12:04:05 +0000 (12:04 +0000)]
Automatically hide unused (=unlinked) node sockets in collapsed ("hidden") nodes. This is to make nodes with many sockets cleaner and simpler, which is the purpose of collapsing nodes in the first place.

The hiding code uses the SOCK_IN_USE flags already present. These were only temporarily set by the shader node code for determining needed texture coordinate types. Now they are used persistently and updated along with the sock->link pointers.

9 years agoDisplay button for hiding unused node sockets in the side bar, as an alternative...
Lukas Toenne [Mon, 19 Dec 2011 11:55:35 +0000 (11:55 +0000)]
Display button for hiding unused node sockets in the side bar, as an alternative to the removed node header button.