blender.git
7 years agoFix for customdata layer copying. Issue was caused by mixing up of destination and...
Andrew Hale [Tue, 22 May 2012 12:03:56 +0000 (12:03 +0000)]
Fix for customdata layer copying. Issue was caused by mixing up of destination and source in copy function. Also fixed an error in Py API, check to see if layers were different should be check to see if they're the same.

7 years agofix for error in last commit and minor speedup to looping over edges.
Campbell Barton [Tue, 22 May 2012 10:10:14 +0000 (10:10 +0000)]
fix for error in last commit and minor speedup to looping over edges.

7 years ago * Composite result is updated when editing (preview were already
Jeroen Bakker [Tue, 22 May 2012 09:54:08 +0000 (09:54 +0000)]
 * Composite result is updated when editing (preview were already
calculated, now the final result is also updated in the image space
 * default texture size when not connected to any resolution depended
operation defaults to render size

7 years agosolidify modifier - remove a loop on all edges.
Campbell Barton [Tue, 22 May 2012 09:53:33 +0000 (09:53 +0000)]
solidify modifier - remove a loop on all edges.

7 years agoFix imbuf users leak in MovieClip tiles node
Sergey Sharybin [Tue, 22 May 2012 09:15:05 +0000 (09:15 +0000)]
Fix imbuf users leak in MovieClip tiles node

Leak was caused by not calling IMB_freeImBuf for result of BKE_movieclip_get_ibuf

7 years agoFix for movie distoriton node in tiles
Sergey Sharybin [Tue, 22 May 2012 09:15:01 +0000 (09:15 +0000)]
Fix for movie distoriton node in tiles

Now it works in the same way as non-tiles node in cases when image's
resolution is not equal to resolution used for calibration.

Also add some additional checks for distortion cache, so now it should
be updating properly when camera intrinsics are changing.

Potentially added support of overscan, but currently all needed computation
is commented out.

7 years agofix for regression in curve modifier (own fault)
Campbell Barton [Tue, 22 May 2012 09:00:34 +0000 (09:00 +0000)]
fix for regression in curve modifier (own fault)

7 years agoI18n fixes, mainly for (cycles) nodes (i.e. node template in Buttons window).
Bastien Montagne [Tue, 22 May 2012 08:36:06 +0000 (08:36 +0000)]
I18n fixes, mainly for (cycles) nodes (i.e. node template in Buttons window).

Note: the problem of sockets translation remains (for all node types), currently they are unavailable from RNA, hence not detected by i18n tools, so only solution is to add N_() in all node sockets templates… yuck! Really have to fix this.

7 years agofix [#31530] Project paint with Clipping border gives opaque background
Campbell Barton [Tue, 22 May 2012 08:24:52 +0000 (08:24 +0000)]
fix [#31530] Project paint with Clipping border gives opaque background

draw clipping box alpha 0 so reprojection and rendering show the background as alpha 0.

7 years agoFix #31522: wrong ID user count on custom bone shape object after duplicate
Sergey Sharybin [Tue, 22 May 2012 07:46:14 +0000 (07:46 +0000)]
Fix #31522: wrong ID user count on custom bone shape object after duplicate

7 years agofix [#31489] EdgeSplit modifier prevents All Edge to be work correctly since 2.63
Campbell Barton [Tue, 22 May 2012 07:26:45 +0000 (07:26 +0000)]
fix [#31489] EdgeSplit modifier prevents All Edge to be work correctly since 2.63

bmesh regression where the edge-draw flag was cleared when bmesh modifiers were used.

7 years agoremove unused enums (these are defined and used elsewhere)
Campbell Barton [Tue, 22 May 2012 07:07:25 +0000 (07:07 +0000)]
remove unused enums (these are defined and used elsewhere)

7 years agoFix #31500: Displacement Baking from Multires doesn't work
Sergey Sharybin [Tue, 22 May 2012 07:06:48 +0000 (07:06 +0000)]
Fix #31500: Displacement Baking from Multires doesn't work

Issue was caused by wrong calculation of grid coordinates when switching
from low resolution mesh to high resolution mesh. Somehow was affected only
for face U or V equals to 1.0f.

Checked fix using all test files used during initial implementation of
multires baker and tested sample file from bug/ Seems everything is OK.

7 years agostyle cleanup: brace placement.
Campbell Barton [Tue, 22 May 2012 06:29:46 +0000 (06:29 +0000)]
style cleanup: brace placement.

7 years agoAdd input sample averaging to PaintStroke.
Nicholas Bishop [Mon, 21 May 2012 23:32:46 +0000 (23:32 +0000)]
Add input sample averaging to PaintStroke.

Averages input samples to make the brush stroke smoother. Only mouse
location is averaged right now, not pressure/tilt/etc.

The DNA is in struct Paint.num_input_samples, RNA is
Paint.input_samples. In combination with PaintStroke usage this change
applies to sculpt, vpaint, and wpaint.

The range of useful values varies quite a bit depending on input
device; mouse needs higher values to match tablet pen, so set max
samples pretty high (64).

Release note section:
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.64/Sculpting#Input_Stroke_Averaging

7 years agofix for
Monique Dewanchand [Mon, 21 May 2012 20:36:02 +0000 (20:36 +0000)]
fix for
[#31502] Defocus max radius help tekst

7 years agoMissing RNA_def_property_update functions for RenderSettings bake properties
Dan Eicher [Mon, 21 May 2012 20:28:54 +0000 (20:28 +0000)]
Missing RNA_def_property_update functions for RenderSettings bake properties

7 years agoFix for [#31413] Code review testing: Regarding chunksize, could the
Jeroen Bakker [Mon, 21 May 2012 20:21:32 +0000 (20:21 +0000)]
Fix for [#31413] Code review testing: Regarding chunksize, could the
tooltip be made more clear

7 years agoUI mafia fix thanks to venomgfx for reporting
Jeroen Bakker [Mon, 21 May 2012 20:10:21 +0000 (20:10 +0000)]
UI mafia fix thanks to venomgfx for reporting
 * Color correction node

7 years agoFix for
Monique Dewanchand [Mon, 21 May 2012 19:58:23 +0000 (19:58 +0000)]
Fix for
[#31408] Code review testing: Button labels are invisible in many nodes

7 years agoFix for [#31418] Code review: OpenCL initialization
Jeroen Bakker [Mon, 21 May 2012 19:31:29 +0000 (19:31 +0000)]
Fix for [#31418] Code review: OpenCL initialization
 * Moved OpenCL initialization to first use
 * cleaned up build files
 * display some debug lines only when debugging is enabled.

7 years ago[#31410] Code review testing: The color correction node in particular is
Jeroen Bakker [Mon, 21 May 2012 18:47:55 +0000 (18:47 +0000)]
[#31410] Code review testing: The color correction node in particular is
quite problematic in button layout
 * Added first column with labels
 * increased max size of node
 * moved the start/end midtones to the bottom of the node

7 years agoFix for [#31367] render.drawLine not 2D filter aware:
Mitchell Stokes [Mon, 21 May 2012 18:35:31 +0000 (18:35 +0000)]
Fix for [#31367] render.drawLine not 2D filter aware:

The lines from render.drawLine() are now drawn before motion blur and 2D Filters.

7 years agoA few minor UI message fixes...
Bastien Montagne [Mon, 21 May 2012 18:06:20 +0000 (18:06 +0000)]
A few minor UI message fixes...

7 years agochange name length from 32 to 64, perhaps we should have some constant here bpy.const...
Campbell Barton [Mon, 21 May 2012 16:52:04 +0000 (16:52 +0000)]
change name length from 32 to 64, perhaps we should have some constant here bpy.constants.NAME_MAX ? - but this hardly ever changes.

also hide allow overlap option for adding sequence strips, this was only intended for api use

7 years agofix for [#31543] Nodes use array past bounds
Jeroen Bakker [Mon, 21 May 2012 16:05:45 +0000 (16:05 +0000)]
fix for [#31543] Nodes use array past bounds

7 years ago * Bokeh Image angle now has rnge from -720 to +720 degrees
Jeroen Bakker [Mon, 21 May 2012 14:05:47 +0000 (14:05 +0000)]
 * Bokeh Image angle now has rnge from -720 to +720 degrees

7 years agoCycles: add Object Info node, with outputs object location, object/material
Brecht Van Lommel [Mon, 21 May 2012 12:52:28 +0000 (12:52 +0000)]
Cycles: add Object Info node, with outputs object location, object/material
pass index, and a random number unique to the instance of the object.

This can be useful to give some variation to a single material assigned to
multiple instances, either manually controlled through the object index, based
on the object location, or randomized for each instance.

http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/More#Object_Info

7 years agodebugging check for bmesh (commented since its very slow), but useful for debugging...
Campbell Barton [Mon, 21 May 2012 12:30:06 +0000 (12:30 +0000)]
debugging check for bmesh (commented since its very slow), but useful for debugging some scripts.

7 years agoAdded switch in dilate/erode between old (Step) and new (Distance)
Jeroen Bakker [Mon, 21 May 2012 10:20:30 +0000 (10:20 +0000)]
Added switch in dilate/erode between old (Step) and new (Distance)
algorithm

Connected the Glare Fog Flow to use Fast Gaussian in stead of Bokeh blur

7 years agofix for fix - possible on second loop to use freed memory still.
Campbell Barton [Mon, 21 May 2012 10:13:43 +0000 (10:13 +0000)]
fix for fix - possible on second loop to use freed memory still.

7 years agofix for unlikely but possible use of uninitialized pointers.
Campbell Barton [Mon, 21 May 2012 10:11:51 +0000 (10:11 +0000)]
fix for unlikely but possible use of uninitialized pointers.

7 years agocode cleanup: remove some old comments
Campbell Barton [Mon, 21 May 2012 09:00:35 +0000 (09:00 +0000)]
code cleanup: remove some old comments

7 years agofix for minor annoyance when an operator is called by another - dont add blend file...
Campbell Barton [Mon, 21 May 2012 08:24:03 +0000 (08:24 +0000)]
fix for minor annoyance when an operator is called by another - dont add blend file to recent history.

this way demo-mode addon doesnt clobber the recent history with demo files its operator loads.

7 years agoQuiet null pointer free warning/error.
Campbell Barton [Mon, 21 May 2012 08:10:37 +0000 (08:10 +0000)]
Quiet null pointer free warning/error.

7 years agopy api integration: __import__(... , level=0)
Campbell Barton [Mon, 21 May 2012 07:00:23 +0000 (07:00 +0000)]
py api integration: __import__(... , level=0)
  default changed to work with python3.3

7 years agofix for error pointed out by Nicholas Bishop, BM_edge_face_pair & BM_edge_loop_pair...
Campbell Barton [Mon, 21 May 2012 06:44:46 +0000 (06:44 +0000)]
fix for error pointed out by Nicholas Bishop, BM_edge_face_pair & BM_edge_loop_pair returned TRUE for single face user edges.

7 years agocode cleanup:
Campbell Barton [Mon, 21 May 2012 06:33:45 +0000 (06:33 +0000)]
code cleanup:
- remove duplicate includes
- blender builds with -Werror in C++ for fluids/smoke

7 years agoreadfile.c Style cleanups Part 2 - More whitespace + replaced most of the while
Joshua Leung [Mon, 21 May 2012 06:33:32 +0000 (06:33 +0000)]
readfile.c Style cleanups  Part 2 - More whitespace + replaced most of the while
loops

7 years ago== Compositor ==
Peter Schlaile [Sun, 20 May 2012 21:24:08 +0000 (21:24 +0000)]
== Compositor ==

This fixes occasional crashes on uninitialized memory, when we open a blend
file which has movie or image input nodes pointing to none existent
source files.

7 years agocode cleanup: spelling
Campbell Barton [Sun, 20 May 2012 21:23:26 +0000 (21:23 +0000)]
code cleanup: spelling

7 years agoFix #31511: GLSL preview is much darker than F12 results
Daniel Stokes [Sun, 20 May 2012 21:19:55 +0000 (21:19 +0000)]
Fix #31511: GLSL preview is much darker than F12 results

A problem caused by Harmony branch code. A value was being set improperly for the GLSL shader.

7 years agocode cleanup:
Campbell Barton [Sun, 20 May 2012 19:49:27 +0000 (19:49 +0000)]
code cleanup:
- style - multi-line ifs move braces onto new lines.
- iterators - convert some to macros, other split up and move brace.

7 years agouse utf8 functions for new modifier names
Campbell Barton [Sun, 20 May 2012 18:19:45 +0000 (18:19 +0000)]
use utf8 functions for new modifier names

7 years agoRenamed the COLLADA Import/export labels to 'Collada (Default)' to make it better...
Gaia Clary [Sun, 20 May 2012 17:40:57 +0000 (17:40 +0000)]
Renamed the COLLADA Import/export labels to 'Collada (Default)' to make it better separatable from target specific exporters

7 years agoSequencer UI:
Thomas Dinges [Sun, 20 May 2012 15:52:24 +0000 (15:52 +0000)]
Sequencer UI:
* Some consistency tweaks.

7 years agoFix bug #31529 Remesh remove Apply as Shape button
Nicholas Bishop [Sun, 20 May 2012 15:00:19 +0000 (15:00 +0000)]
Fix bug #31529 Remesh remove Apply as Shape button

Change modifier_sameTopology() to not not treat Nonconstructive
modifiers as having same topology. This function is only used to test
whether Apply as Shape is allowed.

The exact nature of "nonconstructive" modifiers is not documented, but
current list is remesh, fluidsim, decimate, mask, build, and
boolean. All of these modify topology, and should not be making making
shape keys.

7 years agoVarious small fixes:
Bastien Montagne [Sun, 20 May 2012 13:56:42 +0000 (13:56 +0000)]
Various small fixes:
*i18n: panel title of current tool in 3D view & File windows are now translated, as well a redo (F3) menu.
*MESH_OT_faces_select_linked_flat & MESH_OT_edges_select_sharp: use ANGLE RNA prop for sharpness, and fix tip of the later op.

7 years agoBMesh Py API Fix: hide attribute of BMesh elements was returning the select flag...
Andrew Hale [Sun, 20 May 2012 12:52:46 +0000 (12:52 +0000)]
BMesh Py API Fix: hide attribute of BMesh elements was returning the select flag. Fixed for all elements including loops, although this is commented out anyway. Reported by Crouch in IRC.

7 years agoFix memory leak when trying to apply transformations to shared meshes
Antony Riakiotakis [Sun, 20 May 2012 11:06:46 +0000 (11:06 +0000)]
Fix memory leak when trying to apply transformations to shared meshes

7 years agoSequencer UI:
Thomas Dinges [Sun, 20 May 2012 00:34:54 +0000 (00:34 +0000)]
Sequencer UI:
* Code cleanup
* Fixed wrong label for Inverse Select in the Select menu
* Some layout tweaks for space saving and avoid abbreviations in the UI.
* "Image Offset" and "Image Crop" buttons were there twice, once in the Strip Input panel and once in the Effect Strip panel, show it in the Strip Input panel only now.
* Commented the third input fields ("input_3"), only used by the deprecated plugin system according to an RNA comment.

7 years agoFix sculpt layer brush, broken by texture changes in r46651.
Nicholas Bishop [Sat, 19 May 2012 23:11:46 +0000 (23:11 +0000)]
Fix sculpt layer brush, broken by texture changes in r46651.

7 years agoAdded 'LIBRARY_EDITABLE' flag to bpy.props.*
Dan Eicher [Sat, 19 May 2012 21:22:01 +0000 (21:22 +0000)]
Added 'LIBRARY_EDITABLE' flag to bpy.props.*

Rationale: custom props on linked objects are editable through ops and the console but the UI code calls RNA_property_editable() which returns false if (id->lib && !(prop->flag & PROP_LIB_EXCEPTION))

Setting the 'LIBRARY_EDITABLE' flag allows UI templates to change these props (but the changes aren't saved!) for things like indices into CollectionProperties which live on the linked object

7 years agoFix [#31535] Radian Unit System Button Ignored for Face Angles display.
Bastien Montagne [Sat, 19 May 2012 20:16:29 +0000 (20:16 +0000)]
Fix [#31535] Radian Unit System Button Ignored for Face Angles display.

Also avoid multiplying each vertex three times with obmat...

7 years agostyle cleanup: whitespace/indentation
Campbell Barton [Sat, 19 May 2012 13:55:54 +0000 (13:55 +0000)]
style cleanup: whitespace/indentation

7 years agocode cleanup: use TRUE/FALSE rather then 1/0 for better readability, also replace...
Campbell Barton [Sat, 19 May 2012 13:28:19 +0000 (13:28 +0000)]
code cleanup: use TRUE/FALSE rather then 1/0 for better readability, also replace do prefix with do_ for bool vars.

7 years agodisable overwriting the PYTHONPATH for windows - reported as [#31506]
Campbell Barton [Sat, 19 May 2012 10:10:49 +0000 (10:10 +0000)]
disable overwriting the PYTHONPATH for windows - reported as [#31506]

7 years agostyle cleanup: ghost
Campbell Barton [Sat, 19 May 2012 09:57:55 +0000 (09:57 +0000)]
style cleanup: ghost

7 years agoAdd i18n to “button” and “Area Options” pop-up menus.
Bastien Montagne [Sat, 19 May 2012 09:46:41 +0000 (09:46 +0000)]
Add i18n to “button” and “Area Options” pop-up menus.

7 years agostyle cleanup: ghost headers
Campbell Barton [Sat, 19 May 2012 09:23:08 +0000 (09:23 +0000)]
style cleanup: ghost headers

7 years ago3D View UI:
Thomas Dinges [Fri, 18 May 2012 21:13:22 +0000 (21:13 +0000)]
3D View UI:
* Remove redundant "Delete" for Edge Loop in the Delete (X) menu.

7 years agostyle cleanup: ghost/x11
Campbell Barton [Fri, 18 May 2012 20:13:40 +0000 (20:13 +0000)]
style cleanup: ghost/x11

7 years agoFix #31504: uv unwrap incorrectly scaling pinned islands.
Brecht Van Lommel [Fri, 18 May 2012 15:20:45 +0000 (15:20 +0000)]
Fix #31504: uv unwrap incorrectly scaling pinned islands.

7 years agoFix #31395: setting mesh.uv_textures['uvmap'].active did not update correctly.
Brecht Van Lommel [Fri, 18 May 2012 15:06:26 +0000 (15:06 +0000)]
Fix #31395: setting mesh.uv_textures['uvmap'].active did not update correctly.

7 years agoFix #31430: itasc solver assertion failure with debug builds.
Brecht Van Lommel [Fri, 18 May 2012 15:06:23 +0000 (15:06 +0000)]
Fix #31430: itasc solver assertion failure with debug builds.

7 years agoadd missing include
Brecht Van Lommel [Fri, 18 May 2012 14:08:54 +0000 (14:08 +0000)]
add missing include

7 years agoFix #31518: changing cycles exposure did unnecessary rerender in viewport.
Brecht Van Lommel [Fri, 18 May 2012 14:06:53 +0000 (14:06 +0000)]
Fix #31518: changing cycles exposure did unnecessary rerender in viewport.

7 years agoFix #31400: opengl offscreen render not respecting theme settings.
Brecht Van Lommel [Fri, 18 May 2012 14:05:59 +0000 (14:05 +0000)]
Fix #31400: opengl offscreen render not respecting theme settings.

7 years agoFix related to #31446: cycles glsl error with empty image texture node.
Brecht Van Lommel [Fri, 18 May 2012 13:30:34 +0000 (13:30 +0000)]
Fix related to #31446: cycles glsl error with empty image texture node.

7 years agoFix bug in controller list scan (introduced in recent code cleanup)
Benoit Bolsee [Fri, 18 May 2012 13:27:33 +0000 (13:27 +0000)]
Fix bug in controller list scan (introduced in recent code cleanup)

7 years agoAdd "Install Theme" button in user preferences, patch #31505 by Julien Duroure.
Brecht Van Lommel [Fri, 18 May 2012 12:49:27 +0000 (12:49 +0000)]
Add "Install Theme" button in user preferences, patch #31505 by Julien Duroure.

7 years agoFile browser: list of system directories is now refreshed on pressing the refresh
Brecht Van Lommel [Fri, 18 May 2012 12:49:25 +0000 (12:49 +0000)]
File browser: list of system directories is now refreshed on pressing the refresh
button or opening the file browser, in case e.g. a USB stick was inserted.

Patch #31211 by Julien Duroure.

7 years agoFix #31486: cycles texture coordinate reflection output has wrong direction.
Brecht Van Lommel [Fri, 18 May 2012 12:49:22 +0000 (12:49 +0000)]
Fix #31486: cycles texture coordinate reflection output has wrong direction.

7 years agoadd option for screw modifier to smooth shade. (renamed smooth_shading to use_smooth_...
Campbell Barton [Fri, 18 May 2012 10:37:49 +0000 (10:37 +0000)]
add option for screw modifier to smooth shade. (renamed smooth_shading to use_smooth_shade for remesh modifier too)

7 years agopatch [#31507] site not automatically imported when using external python package
Campbell Barton [Fri, 18 May 2012 10:19:49 +0000 (10:19 +0000)]
patch [#31507] site not automatically imported when using external python package

made some modificatons to normal python startup also.

7 years agoFix for Tile image node. This was still using the path string for multilayer output...
Lukas Toenne [Fri, 18 May 2012 10:00:31 +0000 (10:00 +0000)]
Fix for Tile image node. This was still using the path string for multilayer output instead of the dedicated layer name string.

7 years agoWhen generating enums for the image node render layers, replace empty strings with...
Lukas Toenne [Fri, 18 May 2012 10:00:28 +0000 (10:00 +0000)]
When generating enums for the image node render layers, replace empty strings with a simple space character. This little hack allows the enum item to be selected from the dropdown list.

7 years agoPartial revert of r46542.
Lukas Toenne [Fri, 18 May 2012 09:26:55 +0000 (09:26 +0000)]
Partial revert of r46542.
Displaying image layers with flattened names (render_layer.render_pass) can lead to extremely long socket lists, especially with older files that were used with distinct render layers before. In general the flattening of names would be preferable, but it needs a sensible way of limiting the number of displayed outputs. For now the render layer dropdown selection is the best option to ensure usability.

7 years agoAdd smooth-shading option for remesh modifier.
Nicholas Bishop [Fri, 18 May 2012 06:10:47 +0000 (06:10 +0000)]
Add smooth-shading option for remesh modifier.

The remesh modifier doesn't currently get any data from original
faces, so even if the input mesh was entirely smooth none of the
output faces would be. Solved by adding a new
dna-flag/rna-bool/UI-checkbox to smooth shade the output.

Requested by Daniel Salazar.

7 years agostyle cleanup: function definitions
Campbell Barton [Thu, 17 May 2012 23:21:11 +0000 (23:21 +0000)]
style cleanup: function definitions

7 years agostyle cleanup: and add missing files to cmake
Campbell Barton [Thu, 17 May 2012 23:12:15 +0000 (23:12 +0000)]
style cleanup: and add missing files to cmake

7 years agostyle cleanup: compositor, pointer syntax, function brace placement, line length
Campbell Barton [Thu, 17 May 2012 22:55:28 +0000 (22:55 +0000)]
style cleanup: compositor, pointer syntax, function brace placement, line length

7 years agoCode cleanup: de-duplicate some transform constraint code.
Nicholas Bishop [Thu, 17 May 2012 22:52:42 +0000 (22:52 +0000)]
Code cleanup: de-duplicate some transform constraint code.

No functional changes.

7 years agoDon't link compositor with blender player.
Antony Riakiotakis [Thu, 17 May 2012 22:47:05 +0000 (22:47 +0000)]
Don't link compositor with blender player.

7 years agoEnable remesh modifier for curves.
Nicholas Bishop [Thu, 17 May 2012 17:16:51 +0000 (17:16 +0000)]
Enable remesh modifier for curves.

7 years agorna function Image.scale(w, h), useful for utility functions to open/scale/save images.
Campbell Barton [Thu, 17 May 2012 15:26:11 +0000 (15:26 +0000)]
rna function Image.scale(w, h), useful for utility functions to open/scale/save images.

7 years agoworkaround for python3.3 alpha with the console.
Campbell Barton [Thu, 17 May 2012 15:24:26 +0000 (15:24 +0000)]
workaround for python3.3 alpha with the console.

7 years agofix for building without AUD
Campbell Barton [Thu, 17 May 2012 14:59:11 +0000 (14:59 +0000)]
fix for building without AUD

7 years agoCompositor / Box and Ellipse Mask:
Thomas Dinges [Thu, 17 May 2012 14:55:01 +0000 (14:55 +0000)]
Compositor / Box and Ellipse Mask:
* "X/Y position" label -> "X/Y". The longer text was barely visible in the UI.

7 years agoMoved switch node to layout
Jeroen Bakker [Thu, 17 May 2012 14:02:01 +0000 (14:02 +0000)]
Moved switch node to layout

7 years agoattempt to fix osx build error
Campbell Barton [Thu, 17 May 2012 14:00:54 +0000 (14:00 +0000)]
attempt to fix osx build error

7 years agostyle cleanup: braces, compositor
Campbell Barton [Thu, 17 May 2012 13:44:15 +0000 (13:44 +0000)]
style cleanup: braces, compositor

7 years agoFix blenderplayr compilation
Antony Riakiotakis [Thu, 17 May 2012 13:30:20 +0000 (13:30 +0000)]
Fix blenderplayr compilation

7 years agoFix for MSVC float conversion
Jeroen Bakker [Thu, 17 May 2012 13:25:41 +0000 (13:25 +0000)]
Fix for MSVC float conversion

7 years agoFix [#31495] Modifiers in Text objects don't respect edit mode flag.
Bastien Montagne [Thu, 17 May 2012 13:22:19 +0000 (13:22 +0000)]
Fix [#31495] Modifiers in Text objects don't respect edit mode flag.

Need to also check for cu->editfont for text edit mode...

Also use modifier_isEnabled() to make general tests whether a modifier should be applied or skipped.

7 years agoMinGW64 and possibly gcc 4.7 doesn't like interface as identifier.
Antony Riakiotakis [Thu, 17 May 2012 13:15:58 +0000 (13:15 +0000)]
MinGW64 and possibly gcc 4.7 doesn't like interface as identifier.

7 years agocode cleanup: quiet warnings from compositor merge (builds with -Werror now in cmake)
Campbell Barton [Thu, 17 May 2012 13:10:34 +0000 (13:10 +0000)]
code cleanup: quiet warnings from compositor merge (builds with -Werror now in cmake)

7 years agoreadfile.c Style Cleanup: Whitespace, while -> for, etc.
Joshua Leung [Thu, 17 May 2012 12:59:34 +0000 (12:59 +0000)]
readfile.c Style Cleanup: Whitespace, while -> for, etc.

(3rd time lucky!)

7 years ago ____
Jeroen Bakker [Thu, 17 May 2012 12:49:33 +0000 (12:49 +0000)]
                    ____
`````|````` | |        |                        ..''''
     |      | |        |______               .''
     |      | |        |                  ..'
     |      | |_______ |___________ ....''
               merge to TRUNK!

 * The old compositor is still available (Debug Menu: 200)

This commit was brought to you by:

Developers:
 * Monique Dewanchand
 * Jeroen Bakker
 * Dalai Felinto
 * Lukas Tönne

Review:
 * Brecht van Lommel

Testers:
 * Nate Wiebe
 * Wolfgang Faehnle
 * Carlo Andreacchio
 * Daniel Salazar
 * Artur Mag
 * Christian Krupa
 * Francesco Siddi
 * Dan McGrath
 * Bassam Kurdali

But mostly by the community:
Gold:

    Joshua Faulkner
    Michael Tiemann
    Francesco Paglia
    Blender Guru
    Blender Developers Fund

Silver:

    Pablo Vazquez
    Joel Heethaar
    Amrein Olivier
    Ilias Karasavvidis
    Thomas Kumlehn
    Sebastian Koenig
    Hannu Hoffrén
    Benjamin Dansie
    Fred M'ule
    Michel Vilain
    Bradley Cathey
    Gianmichele Mariani
    Gottfried Hofmann
    Bjørnar Frøyse
    Valentijn Bruning
    Paul Holmes
    Clemens Rudolph
    Juris Graphix
    David Strebel
    Ronan Zeegers
    François Tarlier
    Felipe Andres Esquivel Reed
    Olaf Beckman
    Jesus Alberto Olmos Linares
    Kajimba
    Maria Figueiredo
    Alexandr Galperin
    Francesco Siddi
    Julio Iglesias Lopez
    Kjartan Tysdal
    Thomas Torfs
    Film Works
    Teruyuki Nakamura
    Roger Luethi
    Benoit Bolsee
    Stefan Abrahamsen
    Andreas Mattijat
    Xavier Bouchoux
    Blender 3D Graphics and Animation
    Henk Vostermans
    Daniel Blanco Delgado
    BlenderDay/2011
    Bradley Cathey
    Matthieu Dupont de Dinechin
    Gianmichele Mariani
    Jérôme Scaillet

Bronze (Ivo Grigull, Dylan Urquidi, Philippe Derungs, Phil Beauchamp, Bruce Parrott, Mathieu Quiblier, Daniel Martinez, Leandro Inocencio, Lluc Romaní Brasó,
Jonathan Williamson, Michael Ehlen, Karlis Stigis, Dreamsteep, Martin Lindelöf, Filippo Saracino, Douwe van der Veen, Olli Äkräs, Bruno D'Arcangeli,
Francisco Sedrez Warmling, Watchmike.ca, peter lener, Matteo Novellino, Martin Kirsch, Austars Schnore, KC Elliott, Massimiliano Puliero, Karl Stein,
Wood Design Studios, Omer Khan, Jyrki Kanto, Michał Krupa, Lars Brubaker, Neil Richmond, Adam Kalisz, Robert Garlington, Ian Wilson, Carlo Andreacchio,
Jeremias Boos, Robert Holcomb, Gabriel Zöller, Robert Cude, Natibel de Leon, Nathan Turnage, Nicolas Vergnes, Philipp Kleinhenz, Norman Hartig, Louis Kreusel,
Christopher Taylor, Giovanni Remondini, Daniel Rentzsch, Nico Partipilo, Thomas Ventresco, Johannes Schwarz, Александр Коротеев, Brendon Harvey,
Marcelo G. Malheiros, Marius Giurgi, Richard Burns, Perttu Iso-Metsälä, Steve Bazin, Radoslav Borisov, Yoshiyuki Shida, Julien Guigner, Andrew Hunter,
Philipp Oeser, Daniel Thul, Thobias Johansson, Mauro Bonecchi, Georg Piorczynski, Sebastian Michailidis, L M Weedy, Gen X, Stefan Hinze, Nicolò Zubbini,
Erik Pusch, Rob Scott, Florian Koch, Charles Razack, Adrian Baker, Oliver Villar Diz, David Revoy, Julio Iglesias Lopez, Coen Spoor, Carlos Folch,
Joseph Christie, Victor Hernández García, David Mcsween, James Finnerty, Cory Kruckenberg, Giacomo Graziosi, Olivier Saraja, Lars Brubaker, Eric Hudson,
Johannes Schwarz, David Elguea, Marcus Schulderinsky, Karel De Bruijn, Lucas van Wijngaarden, Stefano Ciarrocchi, Mehmet Eribol, Thomas Berglund, Zuofei Song,
Dylan Urquidi )

7 years agoFix select_similar_type_itemf() enum-item-generator func to return the whole prop_sim...
Bastien Montagne [Thu, 17 May 2012 10:42:24 +0000 (10:42 +0000)]
Fix select_similar_type_itemf() enum-item-generator func to return the whole prop_similar_types when context is NULL (needed at least by i18n tools!).