Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into blender2.8

Browse Source 
Conflicts:
	source/blender/editors/space_nla/nla_draw.c
	source/blender/editors/space_view3d/view3d_draw.c
This commit is contained in:
Julian Eisel
2017-03-06 13:00:46 +01:00
parent dc9a7f861f b498db06eb
commit a5cba9aab9
31 changed files with 235 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
release/scripts/startup/bl_operators/object_quick_effects.py
View File

@@ -319,7 +319,7 @@ class QuickSmoke(Operator):
def execute(self, context):
if not bpy.app.build_options.mod_smoke:
self.report({'ERROR'}, "Build without Smoke modifier support")
self.report({'ERROR'}, "Built without Smoke modifier support")
return {'CANCELLED'}
fake_context = context.copy()
@@ -568,7 +568,7 @@ class QuickFluid(Operator):
def execute(self, context):
if not bpy.app.build_options.mod_fluid:
self.report({'ERROR'}, "Build without Fluid modifier support")
self.report({'ERROR'}, "Built without Fluid modifier support")
return {'CANCELLED'}
fake_context = context.copy()